Merge branch 'master' of http://git.caihongxingqiu.net/rainbow/cms-service

.editorconfig

@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.yml]
-indent_size = 2

bin/fswatch

@@ -9,7 +9,7 @@ echo "Restarting LaravelS..."
 
 echo "Starting fswatch..."
 LOCKING=0
-fswatch -r -e ".*" -i "\\.php$" ${WORK_DIR} | while read file
+fswatch -e ".*" -i "\\.php$" -m poll_monitor -r ${WORK_DIR} | while read file
 do
     if [[ ! ${file} =~ .php$ ]] ;then
         continue

config/laravels.php

@@ -1,79 +0,0 @@
-<?php
-/**
- * @see https://github.com/hhxsv5/laravel-s/blob/master/Settings-CN.md  Chinese
- * @see https://github.com/hhxsv5/laravel-s/blob/master/Settings.md  English
- */
-return [
-    'listen_ip'                => env('LARAVELS_LISTEN_IP', '0.0.0.0'),
-    'listen_port'              => env('LARAVELS_LISTEN_PORT', 18211),
-    'socket_type'              => defined('SWOOLE_SOCK_TCP') ? SWOOLE_SOCK_TCP : 1,
-    'enable_coroutine_runtime' => false,
-    'server'                   => env('LARAVELS_SERVER', 'cms-service'),
-    'handle_static'            => env('LARAVELS_HANDLE_STATIC', false),
-    'laravel_base_path'        => env('LARAVEL_BASE_PATH', base_path()),
-    'inotify_reload'           => [
-        'enable'        => env('LARAVELS_INOTIFY_RELOAD', false),
-        'watch_path'    => base_path(),
-        'file_types'    => ['.php'],
-        'excluded_dirs' => [],
-        'log'           => true,
-    ],
-    'event_handlers'           => [],
-    'websocket'                => [
-        'enable' => false,
-        //'handler' => XxxWebSocketHandler::class,
-    ],
-    'sockets'                  => [],
-    'processes'                => [],
-    'timer'                    => [
-        'enable'        => false,
-        'jobs'          => [
-            // Enable LaravelScheduleJob to run `php artisan schedule:run` every 1 minute, replace Linux Crontab
-            //\Hhxsv5\LaravelS\Illuminate\LaravelScheduleJob::class,
-            // Two ways to configure parameters:
-            // [\App\Jobs\XxxCronJob::class, [1000, true]], // Pass in parameters when registering
-            // \App\Jobs\XxxCronJob::class, // Override the corresponding method to return the configuration
-        ],
-        'pid_file'      => storage_path('laravels-timer.pid'),
-        'max_wait_time' => 5,
-    ],
-    'events'                   => [],
-    'swoole_tables'            => [],
-    'register_providers'       => [],
-    'cleaners'                 => [
-        //Hhxsv5\LaravelS\Illuminate\Cleaners\SessionCleaner::class, // If you use the session/authentication in your project, please uncomment this line
-        //Hhxsv5\LaravelS\Illuminate\Cleaners\AuthCleaner::class,    // If you use the authentication/passport in your project, please uncomment this line
-        Hhxsv5\LaravelS\Illuminate\Cleaners\JWTCleaner::class,     // If you use the package "tymon/jwt-auth" in your project, please uncomment this line
-        // ...
-    ],
-    'swoole'                   => [
-        'daemonize'          => env('LARAVELS_DAEMONIZE', false),
-        'dispatch_mode'      => 2,
-        'reactor_num'        => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 4,
-        'worker_num'         => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8,
-        //'task_worker_num'    => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8,
-        'task_ipc_mode'      => 1,
-        'task_max_request'   => 8000,
-        'task_tmpdir'        => @is_writable('/dev/shm/') ? '/dev/shm' : '/tmp',
-        'max_request'        => 8000,
-        'open_tcp_nodelay'   => true,
-        'pid_file'           => storage_path('laravels.pid'),
-        'log_file'           => storage_path(sprintf('logs/swoole-%s.log', date('Y-m'))),
-        'log_level'          => 4,
-        'document_root'      => base_path('public'),
-        'buffer_output_size' => 2 * 1024 * 1024,
-        'socket_buffer_size' => 128 * 1024 * 1024,
-        'package_max_length' => 4 * 1024 * 1024,
-        'reload_async'       => true,
-        'max_wait_time'      => 60,
-        'enable_reuse_port'  => true,
-        'enable_coroutine'   => false,
-        'http_compression'   => false,
-
-        /**
-         * More settings of Swoole
-         * @see https://wiki.swoole.com/wiki/page/274.html  Chinese
-         * @see https://www.swoole.co.uk/docs/modules/swoole-server/configuration  English
-         */
-    ],
-];

phpunit.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="bootstrap/app.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="QUEUE_CONNECTION" value="sync"/>
-    </php>
-</phpunit>

readme.md

@@ -1 +0,0 @@
-# 平台APP客户端接口

resources/lang/zh-CN/validation.php

@@ -1,155 +1,155 @@
-<?php
-
-return [
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages.
-    |
-    */
-
-    'accepted' => ':attribute 必须接受。',
-    'active_url' => ':attribute 不是一个有效的网址。',
-    'after' => ':attribute 必须要晚于 :date。',
-    'after_or_equal' => ':attribute 必须要等于 :date 或更晚。',
-    'alpha' => ':attribute 只能由字母组成。',
-    'alpha_dash' => ':attribute 只能由字母、数字和斜杠组成。',
-    'alpha_num' => ':attribute 只能由字母和数字组成。',
-    'array' => ':attribute 必须是一个数组。',
-    'before' => ':attribute 必须要早于 :date。',
-    'before_or_equal' => ':attribute 必须要等于 :date 或更早。',
-    'between' => [
-        'numeric' => ':attribute 必须介于 :min - :max 之间。',
-        'file' => ':attribute 必须介于 :min - :max kb 之间。',
-        'string' => ':attribute 必须介于 :min - :max 个字符之间。',
-        'array' => ':attribute 必须只有 :min - :max 个单元。',
-    ],
-    'boolean' => ':attribute 必须为布尔值。',
-    'confirmed' => ':attribute 两次输入不一致。',
-    'date' => ':attribute 不是一个有效的日期。',
-    'date_format' => ':attribute 的格式必须为 :format。',
-    'different' => ':attribute 和 :other 必须不同。',
-    'digits' => ':attribute 必须是 :digits 位的数字。',
-    'digits_between' => ':attribute 必须是介于 :min 和 :max 位的数字。',
-    'dimensions' => ':attribute 图片尺寸不正确。',
-    'distinct' => ':attribute 已经存在。',
-    'email' => ':attribute 不是一个合法的邮箱。',
-    'exists' => ':attribute 不存在。',
-    'file' => ':attribute 必须是文件。',
-    'filled' => ':attribute 不能为空。',
-    'image' => ':attribute 必须是图片。',
-    'in' => '已选的属性 :attribute 非法。',
-    'in_array' => ':attribute 没有在 :other 中。',
-    'integer' => ':attribute 必须是整数。',
-    'ip' => ':attribute 必须是有效的 IP 地址。',
-    'ipv4' => ':attribute 必须是有效的 IPv4 地址。',
-    'ipv6' => ':attribute 必须是有效的 IPv6 地址。',
-    'json' => ':attribute 必须是正确的 JSON 格式。',
-    'max' => [
-        'numeric' => ':attribute 不能大于 :max。',
-        'file' => ':attribute 不能大于 :max kb。',
-        'string' => ':attribute 不能大于 :max 个字符。',
-        'array' => ':attribute 最多只有 :max 个单元。',
-    ],
-    'mimes' => ':attribute 必须是一个 :values 类型的文件。',
-    'mimetypes' => ':attribute 必须是一个 :values 类型的文件。',
-    'min' => [
-        'numeric' => ':attribute 必须大于等于 :min。',
-        'file' => ':attribute 大小不能小于 :min kb。',
-        'string' => ':attribute 至少为 :min 个字符。',
-        'array' => ':attribute 至少有 :min 个单元。',
-    ],
-    'not_in' => '已选的属性 :attribute 非法。',
-    'numeric' => ':attribute 必须是一个数字。',
-    'present' => ':attribute 必须存在。',
-    'regex' => ':attribute 格式不正确。',
-    'required' => ':attribute 不能为空。',
-    'required_if' => '当 :other 为 :value 时 :attribute 不能为空。',
-    'required_unless' => '当 :other 不为 :value 时 :attribute 不能为空。',
-    'required_with' => '当 :values 存在时 :attribute 不能为空。',
-    'required_with_all' => '当 :values 存在时 :attribute 不能为空。',
-    'required_without' => '当 :values 不存在时 :attribute 不能为空。',
-    'required_without_all' => '当 :values 都不存在时 :attribute 不能为空。',
-    'same' => ':attribute 和 :other 必须相同。',
-    'size' => [
-        'numeric' => ':attribute 大小必须为 :size。',
-        'file' => ':attribute 大小必须为 :size kb。',
-        'string' => ':attribute 必须是 :size 个字符。',
-        'array' => ':attribute 必须为 :size 个单元。',
-    ],
-    'string' => ':attribute 必须是一个字符串。',
-    'timezone' => ':attribute 必须是一个合法的时区值。',
-    'unique' => ':attribute 已经存在。',
-    'uploaded' => ':attribute 上传失败。',
-    'url' => ':attribute 格式不正确。',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention 'attribute.rule' to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of 'email'. This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [
-        'name' => '名称',
-        'username' => '用户名',
-        'email' => '邮箱',
-        'first_name' => '名',
-        'last_name' => '姓',
-        'password' => '密码',
-        'password_confirmation' => '确认密码',
-        'city' => '城市',
-        'country' => '国家',
-        'address' => '地址',
-        'phone' => '电话',
-        'mobile' => '手机',
-        'age' => '年龄',
-        'sex' => '性别',
-        'gender' => '性别',
-        'day' => '天',
-        'month' => '月',
-        'year' => '年',
-        'hour' => '时',
-        'minute' => '分',
-        'second' => '秒',
-        'title' => '标题',
-        'content' => '内容',
-        'description' => '描述',
-        'excerpt' => '摘要',
-        'date' => '日期',
-        'time' => '时间',
-        'available' => '可用的',
-        'size' => '大小',
-        'sms_code' => '手机短信',
-        'vendor' => '手机厂商',
-        'client_name' => '客户端名称',
-
-    ],
-
-    'mobile'    => '手机号码格式不正确。',
-];
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => ':attribute 必须接受。',
+    'active_url' => ':attribute 不是一个有效的网址。',
+    'after' => ':attribute 必须要晚于 :date。',
+    'after_or_equal' => ':attribute 必须要等于 :date 或更晚。',
+    'alpha' => ':attribute 只能由字母组成。',
+    'alpha_dash' => ':attribute 只能由字母、数字和斜杠组成。',
+    'alpha_num' => ':attribute 只能由字母和数字组成。',
+    'array' => ':attribute 必须是一个数组。',
+    'before' => ':attribute 必须要早于 :date。',
+    'before_or_equal' => ':attribute 必须要等于 :date 或更早。',
+    'between' => [
+        'numeric' => ':attribute 必须介于 :min - :max 之间。',
+        'file' => ':attribute 必须介于 :min - :max kb 之间。',
+        'string' => ':attribute 必须介于 :min - :max 个字符之间。',
+        'array' => ':attribute 必须只有 :min - :max 个单元。',
+    ],
+    'boolean' => ':attribute 必须为布尔值。',
+    'confirmed' => ':attribute 两次输入不一致。',
+    'date' => ':attribute 不是一个有效的日期。',
+    'date_format' => ':attribute 的格式必须为 :format。',
+    'different' => ':attribute 和 :other 必须不同。',
+    'digits' => ':attribute 必须是 :digits 位的数字。',
+    'digits_between' => ':attribute 必须是介于 :min 和 :max 位的数字。',
+    'dimensions' => ':attribute 图片尺寸不正确。',
+    'distinct' => ':attribute 已经存在。',
+    'email' => ':attribute 不是一个合法的邮箱。',
+    'exists' => ':attribute 不存在。',
+    'file' => ':attribute 必须是文件。',
+    'filled' => ':attribute 不能为空。',
+    'image' => ':attribute 必须是图片。',
+    'in' => '已选的属性 :attribute 非法。',
+    'in_array' => ':attribute 没有在 :other 中。',
+    'integer' => ':attribute 必须是整数。',
+    'ip' => ':attribute 必须是有效的 IP 地址。',
+    'ipv4' => ':attribute 必须是有效的 IPv4 地址。',
+    'ipv6' => ':attribute 必须是有效的 IPv6 地址。',
+    'json' => ':attribute 必须是正确的 JSON 格式。',
+    'max' => [
+        'numeric' => ':attribute 不能大于 :max。',
+        'file' => ':attribute 不能大于 :max kb。',
+        'string' => ':attribute 不能大于 :max 个字符。',
+        'array' => ':attribute 最多只有 :max 个单元。',
+    ],
+    'mimes' => ':attribute 必须是一个 :values 类型的文件。',
+    'mimetypes' => ':attribute 必须是一个 :values 类型的文件。',
+    'min' => [
+        'numeric' => ':attribute 必须大于等于 :min。',
+        'file' => ':attribute 大小不能小于 :min kb。',
+        'string' => ':attribute 至少为 :min 个字符。',
+        'array' => ':attribute 至少有 :min 个单元。',
+    ],
+    'not_in' => '已选的属性 :attribute 非法。',
+    'numeric' => ':attribute 必须是一个数字。',
+    'present' => ':attribute 必须存在。',
+    'regex' => ':attribute 格式不正确。',
+    'required' => ':attribute 不能为空。',
+    'required_if' => '当 :other 为 :value 时 :attribute 不能为空。',
+    'required_unless' => '当 :other 不为 :value 时 :attribute 不能为空。',
+    'required_with' => '当 :values 存在时 :attribute 不能为空。',
+    'required_with_all' => '当 :values 存在时 :attribute 不能为空。',
+    'required_without' => '当 :values 不存在时 :attribute 不能为空。',
+    'required_without_all' => '当 :values 都不存在时 :attribute 不能为空。',
+    'same' => ':attribute 和 :other 必须相同。',
+    'size' => [
+        'numeric' => ':attribute 大小必须为 :size。',
+        'file' => ':attribute 大小必须为 :size kb。',
+        'string' => ':attribute 必须是 :size 个字符。',
+        'array' => ':attribute 必须为 :size 个单元。',
+    ],
+    'string' => ':attribute 必须是一个字符串。',
+    'timezone' => ':attribute 必须是一个合法的时区值。',
+    'unique' => ':attribute 已经存在。',
+    'uploaded' => ':attribute 上传失败。',
+    'url' => ':attribute 格式不正确。',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention 'attribute.rule' to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of 'email'. This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [
+        'name' => '名称',
+        'username' => '用户名',
+        'email' => '邮箱',
+        'first_name' => '名',
+        'last_name' => '姓',
+        'password' => '密码',
+        'password_confirmation' => '确认密码',
+        'city' => '城市',
+        'country' => '国家',
+        'address' => '地址',
+        'phone' => '电话',
+        'mobile' => '手机',
+        'age' => '年龄',
+        'sex' => '性别',
+        'gender' => '性别',
+        'day' => '天',
+        'month' => '月',
+        'year' => '年',
+        'hour' => '时',
+        'minute' => '分',
+        'second' => '秒',
+        'title' => '标题',
+        'content' => '内容',
+        'description' => '描述',
+        'excerpt' => '摘要',
+        'date' => '日期',
+        'time' => '时间',
+        'available' => '可用的',
+        'size' => '大小',
+        'sms_code' => '手机短信',
+        'vendor' => '手机厂商',
+        'client_name' => '客户端名称',
+
+    ],
+
+    'mobile'    => '手机号码格式不正确。',
+];