Merge branch 'develop' into dev

@@ -24,11 +24,6 @@ class ProjectGscController extends BaseController
      * @time   :2023/6/19 11:25
      * @time   :2023/6/19 11:25
      */
      */
     public function lists(GscLogic $gscLogic){
     public function lists(GscLogic $gscLogic){
-        $this->request->validate([
-            'project_id'=>'required'
-        ],[
-            'project_id.required' => '项目ID不能为空'
-        ]);
         $lists = $gscLogic->GscLists($this->map,$this->page,$this->row,$this->order);
         $lists = $gscLogic->GscLists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
@@ -59,9 +54,9 @@ class ProjectGscController extends BaseController
      */
      */
     public function read(GscLogic $gscLogic){
     public function read(GscLogic $gscLogic){
         $this->request->validate([
         $this->request->validate([
-            'gsc_id'=>'required'
+            'id'=>'required'
         ],[
         ],[
-            'gsc_id.required' => 'GSC账号ID不能为空'
+            'id.required' => 'GSC账号ID不能为空'
         ]);
         ]);
         $info = $gscLogic->GscRead();
         $info = $gscLogic->GscRead();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
@@ -76,7 +71,7 @@ class ProjectGscController extends BaseController
      */
      */
     public function save(GscRequest $gscRequest,GscLogic $gscLogic){
     public function save(GscRequest $gscRequest,GscLogic $gscLogic){
         if(isset($this->param['id'])){
         if(isset($this->param['id'])){
-            $this->request->validate([
+            $gscRequest->validate([
                 'id'=>'required'
                 'id'=>'required'
             ],[
             ],[
                 'id.required' => 'GSC账号ID不能为空'
                 'id.required' => 'GSC账号ID不能为空'

@@ -11,8 +11,8 @@ class Manage extends Base
 
 
     protected $hidden = ['password', 'token'];
     protected $hidden = ['password', 'token'];
 
 
-    const STATUS_ACTIVE = 1;
-    const STATUS_DISABLE = 0;
+    const STATUS_ACTIVE = 0;
+    const STATUS_DISABLE = 1;
 
 
     /**
     /**
      * 超级管理员ID, 当前ID拥有所有权限， 不能进行修改
      * 超级管理员ID, 当前ID拥有所有权限， 不能进行修改
@@ -21,8 +21,8 @@ class Manage extends Base
 
 
     public function statusMap(){
     public function statusMap(){
         return [
         return [
-            self::STATUS_ACTIVE => '正常',
-            self::STATUS_DISABLE => '禁用',
+            self::STATUS_ACTIVE => '禁用',
+            self::STATUS_DISABLE => '正常',
         ];
         ];
     }
     }
 }
 }

@@ -93,17 +93,16 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::post('/save', [Aside\Manage\DeptController::class, 'save'])->name('admin.dept_save');
             Route::post('/save', [Aside\Manage\DeptController::class, 'save'])->name('admin.dept_save');
             Route::any('/delete', [Aside\Manage\DeptController::class, 'delete'])->name('admin.dept_delete');
             Route::any('/delete', [Aside\Manage\DeptController::class, 'delete'])->name('admin.dept_delete');
         });
         });
-
-        //优化gsc账号记录表
-        Route::prefix('gsc')->group(function () {
-            Route::any('/', [Aside\Project\ProjectGscController::class, 'lists'])->name('admin.lists');
-            Route::any('/domainLists', [Aside\Project\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
-            Route::any('/read', [Aside\Project\ProjectGscController::class, 'read'])->name('admin.read');
-            Route::any('/save', [Aside\Project\ProjectGscController::class, 'save'])->name('admin.save');
-            Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
-        });
     });
     });
 
 
+    //优化gsc账号记录表
+    Route::prefix('gsc')->group(function () {
+        Route::any('/', [Aside\Project\ProjectGscController::class, 'lists'])->name('admin.lists');
+        Route::any('/domainLists', [Aside\Project\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
+        Route::any('/read', [Aside\Project\ProjectGscController::class, 'read'])->name('admin.read');
+        Route::any('/save', [Aside\Project\ProjectGscController::class, 'save'])->name('admin.save');
+        Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
+    });
     //项目管理
     //项目管理
     Route::prefix('project')->group(function () {
     Route::prefix('project')->group(function () {
         Route::get('/', [Aside\Project\ProjectController::class, 'list'])->name('admin.project');
         Route::get('/', [Aside\Project\ProjectController::class, 'list'])->name('admin.project');