From a3916c71e88bb3121638bd42deb7a59ba36fad36 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 25 Jun 2021 18:52:39 +0800 Subject: [PATCH] no message --- composer.json | 45 ++++++------ ...25_182631_create_project_columns_table.php | 36 ++++++++++ ...06_25_182631_create_project_logs_table.php | 36 ++++++++++ ...631_create_project_task_contents_table.php | 34 +++++++++ ...182631_create_project_task_files_table.php | 40 +++++++++++ ..._182631_create_project_task_tags_table.php | 35 ++++++++++ ...182631_create_project_task_users_table.php | 36 ++++++++++ ...6_25_182631_create_project_tasks_table.php | 49 +++++++++++++ ...6_25_182631_create_project_users_table.php | 34 +++++++++ ...021_06_25_182631_create_projects_table.php | 38 ++++++++++ ...021_06_25_182631_create_settings_table.php | 34 +++++++++ .../2021_06_25_182631_create_tmps_table.php | 34 +++++++++ .../2021_06_25_182631_create_users_table.php | 47 +++++++++++++ ...eate_web_socket_dialog_msg_reads_table.php | 36 ++++++++++ ...31_create_web_socket_dialog_msgs_table.php | 37 ++++++++++ ...1_create_web_socket_dialog_users_table.php | 33 +++++++++ ...182631_create_web_socket_dialogs_table.php | 36 ++++++++++ ...82631_create_web_socket_tmp_msgs_table.php | 35 ++++++++++ ..._06_25_182631_create_web_sockets_table.php | 34 +++++++++ database/seeders/DatabaseSeeder.php | 2 + database/seeders/SettingsTableSeeder.php | 47 +++++++++++++ database/seeders/UsersTableSeeder.php | 70 +++++++++++++++++++ docker/php/php.conf | 4 +- 23 files changed, 808 insertions(+), 24 deletions(-) create mode 100644 database/migrations/2021_06_25_182631_create_project_columns_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_logs_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_task_contents_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_task_files_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_task_tags_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_task_users_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_tasks_table.php create mode 100644 database/migrations/2021_06_25_182631_create_project_users_table.php create mode 100644 database/migrations/2021_06_25_182631_create_projects_table.php create mode 100644 database/migrations/2021_06_25_182631_create_settings_table.php create mode 100644 database/migrations/2021_06_25_182631_create_tmps_table.php create mode 100644 database/migrations/2021_06_25_182631_create_users_table.php create mode 100644 database/migrations/2021_06_25_182631_create_web_socket_dialog_msg_reads_table.php create mode 100644 database/migrations/2021_06_25_182631_create_web_socket_dialog_msgs_table.php create mode 100644 database/migrations/2021_06_25_182631_create_web_socket_dialog_users_table.php create mode 100644 database/migrations/2021_06_25_182631_create_web_socket_dialogs_table.php create mode 100644 database/migrations/2021_06_25_182631_create_web_socket_tmp_msgs_table.php create mode 100644 database/migrations/2021_06_25_182631_create_web_sockets_table.php create mode 100644 database/seeders/SettingsTableSeeder.php create mode 100644 database/seeders/UsersTableSeeder.php diff --git a/composer.json b/composer.json index 5398b9387..5f0f9b4cb 100644 --- a/composer.json +++ b/composer.json @@ -9,31 +9,32 @@ "license": "MIT", "require": { "php": "^7.3|^8.0", - "fideloper/proxy": "^4.4", - "fruitcake/laravel-cors": "^2.0", - "guzzlehttp/guzzle": "^7.0.1", - "laravel/framework": "^8.40", - "laravel/tinker": "^2.5", - "maatwebsite/excel": "^3.1.22", - "madnest/madzipper": "^v1.0.5", - "mews/captcha": "^3.2.0", - "predis/predis": "^1.1.6", - "ext-json": "*", - "ext-simplexml": "*", - "ext-libxml": "*", + "ext-curl": "*", "ext-gd": "*", - "ext-curl": "*" + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", + "fideloper/proxy": "^4.4.1", + "fruitcake/laravel-cors": "^2.0.4", + "guzzlehttp/guzzle": "^7.3.0", + "laravel/framework": "^v8.48.1", + "laravel/tinker": "^v2.6.1", + "maatwebsite/excel": "^3.1.31", + "madnest/madzipper": "^v1.1.0", + "mews/captcha": "^3.2.6", + "orangehill/iseed": "^3.0.1", + "predis/predis": "^1.1.7" }, "require-dev": { - "barryvdh/laravel-ide-helper": "^2.8.1", - "facade/ignition": "^2.5", - "fakerphp/faker": "^1.9.1", - "hhxsv5/laravel-s": "^v3.7.17", - "kitloong/laravel-migrations-generator": "^4.4.1", - "laravel/sail": "^1.0.1", - "mockery/mockery": "^1.4.2", - "nunomaduro/collision": "^5.0", - "phpunit/phpunit": "^9.3.3" + "barryvdh/laravel-ide-helper": "^v2.10.0", + "facade/ignition": "^2.10.2", + "fakerphp/faker": "^v1.14.1", + "hhxsv5/laravel-s": "^v3.7.19", + "kitloong/laravel-migrations-generator": "^4.4.2", + "laravel/sail": "^v1.8.1", + "mockery/mockery": "^1.4.3", + "nunomaduro/collision": "^v5.5.0", + "phpunit/phpunit": "^9.5.6" }, "autoload": { "psr-4": { diff --git a/database/migrations/2021_06_25_182631_create_project_columns_table.php b/database/migrations/2021_06_25_182631_create_project_columns_table.php new file mode 100644 index 000000000..f2cb361b0 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_columns_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->string('name', 100)->nullable()->default('')->comment('列表名称'); + $table->string('color', 20)->nullable()->default('')->comment('颜色'); + $table->integer('sort')->nullable()->default(0)->comment('排序(ASC)'); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_columns'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_logs_table.php b/database/migrations/2021_06_25_182631_create_project_logs_table.php new file mode 100644 index 000000000..d054183ed --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_logs_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('column_id')->nullable()->default(0)->comment('列表ID'); + $table->bigInteger('task_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID'); + $table->string('detail', 500)->nullable()->default('')->comment('详细信息'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_logs'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_task_contents_table.php b/database/migrations/2021_06_25_182631_create_project_task_contents_table.php new file mode 100644 index 000000000..eaa646235 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_task_contents_table.php @@ -0,0 +1,34 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID'); + $table->longText('content')->nullable()->comment('内容'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_task_contents'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_task_files_table.php b/database/migrations/2021_06_25_182631_create_project_task_files_table.php new file mode 100644 index 000000000..37ff5dfe2 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_task_files_table.php @@ -0,0 +1,40 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID'); + $table->string('name', 100)->nullable()->default('')->comment('文件名称'); + $table->bigInteger('size')->nullable()->default(0)->comment('文件大小(B)'); + $table->string('ext', 20)->nullable()->default('')->comment('文件格式'); + $table->string('path')->nullable()->default('')->comment('文件地址'); + $table->string('thumb')->nullable()->default('')->comment('缩略图'); + $table->bigInteger('userid')->nullable()->default(0)->comment('上传用户ID'); + $table->integer('download')->nullable()->default(0)->comment('下载次数'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_task_files'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_task_tags_table.php b/database/migrations/2021_06_25_182631_create_project_task_tags_table.php new file mode 100644 index 000000000..47ca2e2f9 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_task_tags_table.php @@ -0,0 +1,35 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID'); + $table->string('name', 50)->nullable()->default('')->comment('标题'); + $table->string('color', 10)->nullable()->default('')->comment('颜色'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_task_tags'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_task_users_table.php b/database/migrations/2021_06_25_182631_create_project_task_users_table.php new file mode 100644 index 000000000..a0d5e9744 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_task_users_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID'); + $table->bigInteger('task_pid')->nullable()->default(0)->comment('任务ID(如果是子任务则是父级任务ID)'); + $table->bigInteger('userid')->nullable()->default(0)->comment('成员ID'); + $table->tinyInteger('owner')->nullable()->default(0)->comment('是否任务负责人'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_task_users'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_tasks_table.php b/database/migrations/2021_06_25_182631_create_project_tasks_table.php new file mode 100644 index 000000000..7bf5b966b --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_tasks_table.php @@ -0,0 +1,49 @@ +bigIncrements('id'); + $table->bigInteger('parent_id')->nullable()->default(0)->comment('父级任务ID'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('column_id')->nullable()->default(0)->comment('列表ID'); + $table->bigInteger('dialog_id')->nullable()->default(0)->comment('聊天会话ID'); + $table->string('name')->nullable()->default('')->comment('标题'); + $table->string('color', 20)->nullable()->default('')->comment('颜色'); + $table->string('desc', 500)->nullable()->default('')->comment('描述'); + $table->timestamp('start_at')->nullable()->comment('计划开始时间'); + $table->timestamp('end_at')->nullable()->comment('计划结束时间'); + $table->timestamp('archived_at')->nullable()->comment('归档时间'); + $table->bigInteger('archived_userid')->nullable()->default(0)->comment('归档会员'); + $table->timestamp('complete_at')->nullable()->comment('完成时间'); + $table->bigInteger('userid')->nullable()->default(0)->comment('创建人'); + $table->tinyInteger('p_level')->nullable()->default(0)->comment('优先级'); + $table->string('p_name', 50)->nullable()->default('')->comment('优先级名称'); + $table->string('p_color', 20)->nullable()->default('')->comment('优先级颜色'); + $table->integer('sort')->nullable()->default(0)->comment('排序(ASC)'); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_tasks'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_project_users_table.php b/database/migrations/2021_06_25_182631_create_project_users_table.php new file mode 100644 index 000000000..0a488e22b --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_project_users_table.php @@ -0,0 +1,34 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->bigInteger('userid')->nullable()->default(0)->comment('成员ID'); + $table->tinyInteger('owner')->nullable()->default(0)->comment('是否负责人'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_users'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_projects_table.php b/database/migrations/2021_06_25_182631_create_projects_table.php new file mode 100644 index 000000000..b77a3bd80 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_projects_table.php @@ -0,0 +1,38 @@ +bigIncrements('id'); + $table->string('name')->nullable()->default('')->comment('名称'); + $table->string('desc', 500)->nullable()->default('')->comment('描述、备注'); + $table->bigInteger('userid')->nullable()->default(0)->comment('创建人'); + $table->bigInteger('dialog_id')->nullable()->default(0)->comment('聊天会话ID'); + $table->timestamp('archived_at')->nullable()->comment('归档时间'); + $table->bigInteger('archived_userid')->nullable()->default(0)->comment('归档会员'); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('projects'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_settings_table.php b/database/migrations/2021_06_25_182631_create_settings_table.php new file mode 100644 index 000000000..8179a0b35 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_settings_table.php @@ -0,0 +1,34 @@ +bigIncrements('id'); + $table->string('name', 100)->nullable()->default('')->index('pre_setting_title_index'); + $table->string('desc')->nullable()->default('')->comment('参数描述、备注'); + $table->longText('setting')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('settings'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_tmps_table.php b/database/migrations/2021_06_25_182631_create_tmps_table.php new file mode 100644 index 000000000..f23690d04 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_tmps_table.php @@ -0,0 +1,34 @@ +bigIncrements('id'); + $table->string('name', 500)->nullable()->index('pre_tmp_title_index'); + $table->string('value')->nullable(); + $table->longText('content')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tmps'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_users_table.php b/database/migrations/2021_06_25_182631_create_users_table.php new file mode 100644 index 000000000..c3447668d --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_users_table.php @@ -0,0 +1,47 @@ +bigIncrements('userid'); + $table->string('identity')->nullable()->default('')->comment('身份'); + $table->string('az', 10)->nullable()->default('')->comment('A-Z'); + $table->string('email', 100)->nullable()->default('')->unique()->comment('邮箱'); + $table->string('nickname')->nullable()->comment('昵称'); + $table->string('profession')->nullable()->default('')->comment('职位/职称'); + $table->string('userimg')->nullable()->default('')->comment('头像'); + $table->string('encrypt', 50)->nullable()->default(''); + $table->string('password', 50)->nullable()->default('')->comment('登录密码'); + $table->tinyInteger('changepass')->nullable()->default(0)->comment('登录需要修改密码'); + $table->integer('login_num')->nullable()->default(0)->comment('累计登录次数'); + $table->string('last_ip', 20)->nullable()->default('')->comment('最后登录IP'); + $table->timestamp('last_at')->nullable()->comment('最后登录时间'); + $table->string('line_ip', 20)->nullable()->default('')->comment('最后在线IP(接口)'); + $table->timestamp('line_at')->nullable()->comment('最后在线时间(接口)'); + $table->bigInteger('task_dialog_id')->nullable()->default(0)->comment('最后打开的任务会话ID'); + $table->string('created_ip', 20)->nullable()->default('')->comment('注册IP'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('users'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_web_socket_dialog_msg_reads_table.php b/database/migrations/2021_06_25_182631_create_web_socket_dialog_msg_reads_table.php new file mode 100644 index 000000000..715871c4a --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_web_socket_dialog_msg_reads_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->bigInteger('dialog_id')->nullable()->default(0)->comment('对话ID'); + $table->bigInteger('msg_id')->nullable()->default(0)->comment('消息ID'); + $table->bigInteger('userid')->nullable()->default(0)->comment('发送会员ID'); + $table->tinyInteger('after')->nullable()->default(0)->comment('在阅读之后才添加的记录'); + $table->timestamp('read_at')->nullable()->comment('阅读时间'); + $table->unique(['msg_id', 'userid'], 'IDEX_msg_id_userid'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('web_socket_dialog_msg_reads'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_web_socket_dialog_msgs_table.php b/database/migrations/2021_06_25_182631_create_web_socket_dialog_msgs_table.php new file mode 100644 index 000000000..2fcf24158 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_web_socket_dialog_msgs_table.php @@ -0,0 +1,37 @@ +bigIncrements('id'); + $table->bigInteger('dialog_id')->nullable()->default(0)->comment('对话ID'); + $table->bigInteger('userid')->nullable()->default(0)->comment('发送会员ID'); + $table->string('type', 50)->nullable()->default('')->comment('消息类型'); + $table->longText('msg')->nullable()->comment('详细消息'); + $table->integer('read')->nullable()->default(0)->comment('已阅数量'); + $table->integer('send')->nullable()->default(0)->comment('发送数量'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('web_socket_dialog_msgs'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_web_socket_dialog_users_table.php b/database/migrations/2021_06_25_182631_create_web_socket_dialog_users_table.php new file mode 100644 index 000000000..a47f1a1ee --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_web_socket_dialog_users_table.php @@ -0,0 +1,33 @@ +bigIncrements('id'); + $table->bigInteger('dialog_id')->nullable()->default(0)->comment('对话ID'); + $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('web_socket_dialog_users'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_web_socket_dialogs_table.php b/database/migrations/2021_06_25_182631_create_web_socket_dialogs_table.php new file mode 100644 index 000000000..9fe92eac5 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_web_socket_dialogs_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->string('type', 50)->nullable()->default('')->comment('对话类型'); + $table->string('group_type', 50)->nullable()->default('')->comment('聊天室类型'); + $table->string('name', 50)->nullable()->default('')->comment('对话名称'); + $table->timestamp('last_at')->nullable()->comment('最后消息时间'); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('web_socket_dialogs'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_web_socket_tmp_msgs_table.php b/database/migrations/2021_06_25_182631_create_web_socket_tmp_msgs_table.php new file mode 100644 index 000000000..8c0f5c74a --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_web_socket_tmp_msgs_table.php @@ -0,0 +1,35 @@ +bigIncrements('id'); + $table->string('md5', 50)->nullable()->default('')->unique('pre_ws_tmp_msgs_md5_unique')->comment('MD5(会员ID-消息)'); + $table->longText('msg')->nullable()->comment('详细消息'); + $table->tinyInteger('send')->nullable()->default(0)->index('pre_ws_tmp_msgs_send_index')->comment('是否已发送'); + $table->bigInteger('create_id')->nullable()->default(0)->index('pre_ws_tmp_msgs_create_id_index')->comment('所属会员ID'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('web_socket_tmp_msgs'); + } +} diff --git a/database/migrations/2021_06_25_182631_create_web_sockets_table.php b/database/migrations/2021_06_25_182631_create_web_sockets_table.php new file mode 100644 index 000000000..81b02f2b2 --- /dev/null +++ b/database/migrations/2021_06_25_182631_create_web_sockets_table.php @@ -0,0 +1,34 @@ +bigIncrements('id'); + $table->string('key', 50)->default('')->unique('pre_ws_key_unique'); + $table->string('fd', 50)->nullable()->default(''); + $table->bigInteger('userid')->nullable()->default(0)->index('pre_ws_userid_index'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('web_sockets'); + } +} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 38407d794..14fb6d3fe 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,5 +14,7 @@ class DatabaseSeeder extends Seeder public function run() { + $this->call(SettingsTableSeeder::class); + $this->call(UsersTableSeeder::class); } } diff --git a/database/seeders/SettingsTableSeeder.php b/database/seeders/SettingsTableSeeder.php new file mode 100644 index 000000000..5b8be08df --- /dev/null +++ b/database/seeders/SettingsTableSeeder.php @@ -0,0 +1,47 @@ + 0) { + return; + } + + \DB::table('settings')->insert(array ( + 0 => + array ( + 'id' => 1, + 'name' => 'system', + 'desc' => '', + 'setting' => '{"reg":"open","login_code":"auto"}', + 'created_at' => '2021-05-31 11:05:06', + 'updated_at' => '2021-06-03 07:27:12', + ), + 1 => + array ( + 'id' => 2, + 'name' => 'priority', + 'desc' => '', + 'setting' => '[{"name":"\\u91cd\\u8981\\u4e14\\u7d27\\u6025","color":"#ED4014","days":1,"priority":1},{"name":"\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#F16B62","days":3,"priority":2},{"name":"\\u7d27\\u6025\\u4e0d\\u91cd\\u8981","color":"#19C919","days":5,"priority":3},{"name":"\\u4e0d\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#2D8CF0","days":7,"priority":4}]', + 'created_at' => '2021-06-03 08:04:30', + 'updated_at' => '2021-06-24 09:20:26', + ), + )); + + + } +} diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php new file mode 100644 index 000000000..376502ecb --- /dev/null +++ b/database/seeders/UsersTableSeeder.php @@ -0,0 +1,70 @@ +delete(); + + \DB::table('users')->insert(array ( + 0 => + array ( + 'userid' => 1, + 'identity' => ',admin,', + 'az' => 'A', + 'email' => 'admin@dootask.com', + 'nickname' => '', + 'profession' => '管理员', + 'userimg' => '', + 'encrypt' => 'AJnoOb', + 'password' => '7d996ac317f1b9db564750ef3b8790fc', + 'changepass' => 0, + 'login_num' => 64, + 'last_ip' => '10.22.22.1', + 'last_at' => '2021-06-25 18:50:13', + 'line_ip' => '10.22.22.1', + 'line_at' => '2021-06-25 18:50:13', + 'task_dialog_id' => 28, + 'created_ip' => '', + 'created_at' => '2021-06-02 11:01:14', + 'updated_at' => '2021-06-25 18:50:28', + ), + 1 => + array ( + 'userid' => 2, + 'identity' => '', + 'az' => 'z', + 'email' => 'test@dootask.com', + 'nickname' => '', + 'profession' => '测试员', + 'userimg' => '', + 'encrypt' => '18cZzh', + 'password' => '7eedd4cbf70da996d21f641bcc6cb412', + 'changepass' => 0, + 'login_num' => 58, + 'last_ip' => '10.22.22.1', + 'last_at' => '2021-06-25 18:50:51', + 'line_ip' => '10.22.22.1', + 'line_at' => '2021-06-25 18:50:51', + 'task_dialog_id' => 28, + 'created_ip' => '', + 'created_at' => '2021-06-02 11:01:14', + 'updated_at' => '2021-06-25 18:51:06', + ), + )); + + + } +} \ No newline at end of file diff --git a/docker/php/php.conf b/docker/php/php.conf index b72399d42..74f52c2d1 100644 --- a/docker/php/php.conf +++ b/docker/php/php.conf @@ -2,10 +2,10 @@ directory=/var/www # 生产环境 -#command=php bin/laravels start -i +command=php bin/laravels start -i # 开发环境 -command=./bin/inotify ./app +#command=./bin/inotify ./app numprocs=1 autostart=true