Merge remote-tracking branch 'origin/master' into akun

@@ -54,7 +54,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[221]],'is_upgrade'=>0]);
+        $list = $projectModel->list(['id'=>['in',[68]],'is_upgrade'=>0]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);

@@ -32,7 +32,7 @@ class CustomModuleCategoryController extends BaseController
         ]);
         ]);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['status'] = 0;
         $this->map['status'] = 0;
-        $list = $customModuleCategory->list($this->map);
+        $list = $customModuleCategory->list($this->map,'sort');
         if(!empty($list)){
         if(!empty($list)){
             foreach ($list as $k => $v){
             foreach ($list as $k => $v){
                 $v['url'] = $this->user['domain'].$v['route'];
                 $v['url'] = $this->user['domain'].$v['route'];
@@ -130,4 +130,23 @@ class CustomModuleCategoryController extends BaseController
         $logic->categoryDel();
         $logic->categoryDel();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/3 14:18
+     */
+    public function sort(CustomModuleCategoryLogic $logic){
+        $this->request->validate([
+            'id'=>['required'],
+            'sort'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+            'sort.required' => '排序字段不能为空',
+        ]);
+        $logic->categorySort();
+        $this->response('success');
+    }
 }
 }

@@ -219,4 +219,19 @@ class CustomModuleCategoryLogic extends BaseLogic
         $this->curlDelRoute(['route'=>$info['route']]);
         $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :categorySort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:38
+     */
+    public function categorySort(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('系统错误，请联系管理员');
+        }
+        return $this->success();
+    }
 }
 }

@@ -65,8 +65,8 @@ class RankDataLogic extends BaseLogic
             'cert_info' => $domain_info['cert_info'] ?? '',
             'cert_info' => $domain_info['cert_info'] ?? '',
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'keyword_num' => $project['deploy_build']['keyword_num'],
-            'compliance_day' => $rank['compliance_day'] ?? 0,
-            'remain_day' => $project['deploy_build']['service_duration'] - ($rank['compliance_day'] ?? 0),
+            'compliance_day' => $project['compliance_day'] ?? 0,
+            'remain_day' => $project['deploy_build']['service_duration'] - ($project['compliance_day'] ?? 0),
         ];
         ];
 
 
         //小语种列表
         //小语种列表

@@ -446,6 +446,7 @@ Route::middleware(['bloginauth'])->group(function () {
             Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'info'])->name('custom_category_info');
             Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'info'])->name('custom_category_info');
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'save'])->name('custom_category_save');
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'save'])->name('custom_category_save');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'del'])->name('custom_category_del');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'del'])->name('custom_category_del');
+            Route::any('/sort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'sort'])->name('custom_category_sort');
         });
         });
 
 
         Route::prefix('content')->group(function () {
         Route::prefix('content')->group(function () {