Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -66,7 +66,7 @@ class Notice extends Command
         }
         }
         foreach ($domainList as $v1){
         foreach ($domainList as $v1){
             //TODO::通知C端
             //TODO::通知C端
-            @file_put_contents(storage_path('logs/notice_c_'.date('Y-m-d').'.log'), var_export($v1['domain'], true) . PHP_EOL, FILE_APPEND);
+            @file_put_contents(storage_path('logs/notice_c'.'.log'), var_export($v1['domain'], true) . PHP_EOL, FILE_APPEND);
             $this->curlDelRoute($v1['domain'],$v1['project_id']);
             $this->curlDelRoute($v1['domain'],$v1['project_id']);
         }
         }
         return true;
         return true;

@@ -139,9 +139,12 @@ class CategoryController extends BaseController
      */
      */
     public function sort(CategoryLogic $logic){
     public function sort(CategoryLogic $logic){
         $this->request->validate([
         $this->request->validate([
-            'id'=>['required'],
+            'id'=>'required',
+            'sort'=>'numeric|min:0',
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
+            'sort.numeric' => 'sort位数字',
+            'sort.min' => 'sort最小值为0',
         ]);
         ]);
         $logic->categorySort();
         $logic->categorySort();
         $this->response('success');
         $this->response('success');

@@ -97,7 +97,6 @@ class CopyProjectJob implements ShouldQueue
                 unset($optimizeData['id'],$optimizeData['domain']);
                 unset($optimizeData['id'],$optimizeData['domain']);
                 $optimizeData['project_id'] = $project_id;
                 $optimizeData['project_id'] = $project_id;
                 $optimizeData['api_no'] = 0;
                 $optimizeData['api_no'] = 0;
-                $optimizeData['minor_languages'] = json_encode([]);
                 $optimizeModel->insert($optimizeData);
                 $optimizeModel->insert($optimizeData);
             }
             }
             //复制付费表
             //复制付费表
@@ -174,7 +173,7 @@ class CopyProjectJob implements ShouldQueue
             if($table == 'gl_customer_visit' ||  $table == 'gl_customer_visit_item' || $table == 'gl_inquiry_other' || $table == 'gl_inquiry_form_data' || $table == 'gl_inquiry_form'){
             if($table == 'gl_customer_visit' ||  $table == 'gl_customer_visit_item' || $table == 'gl_inquiry_other' || $table == 'gl_inquiry_form_data' || $table == 'gl_inquiry_form'){
                 continue;
                 continue;
             }
             }
-//            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
+            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
             DB::connection('custom_mysql')->table($table)->insertUsing(
             DB::connection('custom_mysql')->table($table)->insertUsing(
                 [], // 列名数组，留空表示插入所有列
                 [], // 列名数组，留空表示插入所有列
                 function ($query) use ($table,$project_id) {
                 function ($query) use ($table,$project_id) {

@@ -79,6 +79,12 @@ return [
             'prefix' => 'test',
             'prefix' => 'test',
         ],
         ],
         //日记录日志
         //日记录日志
+        'copy_project' => [
+            'driver' => 'custom',
+            'via' => \App\Factory\LogFormatterFactory::class,
+            'prefix' => 'copy_project',
+        ],
+        //日记录日志
         'day_count' => [
         'day_count' => [
             'driver' => 'custom',
             'driver' => 'custom',
             'via' => \App\Factory\LogFormatterFactory::class,
             'via' => \App\Factory\LogFormatterFactory::class,