gx

@@ -127,19 +127,9 @@ class BaseController extends Controller
      * @param bool $objectData
      * @param bool $objectData
      * @return JsonResponse
      * @return JsonResponse
      */
      */
-    function success(array $data = [], string $code = Code::SUCCESS, bool $objectData = false): JsonResponse
+    function success($data) :array
     {
     {
-        if ($objectData) {
-            $data = (object)$data;
-        }
-        $code = Code::fromValue($code);
-        $response = [
-            'code' => $code->value,
-            'data' => $data,
-            'message' => $code->description,
-        ];
-        $this->header['token'] = $this->token;
-        return response()->json($response,200,$this->header);
+        return $data;
     }
     }
 
 
     /**
     /**

@@ -59,7 +59,7 @@ class CustomModuleContentController extends BaseController
         foreach ($list as $v){
         foreach ($list as $v){
             $data[$v['id']] = $v['name'];
             $data[$v['id']] = $v['name'];
         }
         }
-        return $this->success($data);
+        return $data;
     }
     }
 
 
     /**
     /**

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bside\Inquiry;
 namespace App\Http\Controllers\Bside\Inquiry;
 
 
 
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Inquiry\InquiryLogic;
 use App\Http\Logic\Bside\Inquiry\InquiryLogic;
 use App\Models\Inquiry\InquiryForm;
 use App\Models\Inquiry\InquiryForm;
@@ -31,7 +32,7 @@ class InquiryController extends BaseController
             }
             }
             $item['field_text'] = $field_text;
             $item['field_text'] = $field_text;
         }
         }
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     public function index(InquiryLogic $logic)
     public function index(InquiryLogic $logic)
@@ -43,7 +44,7 @@ class InquiryController extends BaseController
         }else{
         }else{
             $data = $logic->getApiList();
             $data = $logic->getApiList();
         }
         }
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     public function info(Request $request, InquiryLogic $logic){
     public function info(Request $request, InquiryLogic $logic){
@@ -60,8 +61,7 @@ class InquiryController extends BaseController
         }else{
         }else{
             $data = $logic->getInfo($this->param['id']);
             $data = $logic->getInfo($this->param['id']);
         }
         }
-
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     public function delete(Request $request, InquiryLogic $logic)
     public function delete(Request $request, InquiryLogic $logic)
@@ -79,7 +79,7 @@ class InquiryController extends BaseController
             $logic->delete($this->param['ids']);
             $logic->delete($this->param['ids']);
         }
         }
 
 
-        return $this->success();
+        $this->response('success');
     }
     }
 
 
     /**
     /**
@@ -141,6 +141,6 @@ class InquiryController extends BaseController
         }
         }
         $fileurl = Storage::disk('runtime')->url($file);
         $fileurl = Storage::disk('runtime')->url($file);
 //        return Storage::disk('runtime')->download($file); //直接下载
 //        return Storage::disk('runtime')->download($file); //直接下载
-        return $this->success(['url' => $fileurl]);
+        $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
     }
 }
 }

@@ -2,6 +2,7 @@
 
 
 namespace App\Http\Controllers\Bside\Product;
 namespace App\Http\Controllers\Bside\Product;
 
 
+use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\AttrLogic;
 use App\Http\Logic\Bside\Product\AttrLogic;
@@ -26,7 +27,7 @@ class AttrController extends BaseController
         }
         }
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $data = $logic->getList($map, $sort, ['id', 'title', 'attrs'],$this->row);
         $data = $logic->getList($map, $sort, ['id', 'title', 'attrs'],$this->row);
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     public function info(Request $request, AttrLogic $logic){
     public function info(Request $request, AttrLogic $logic){
@@ -36,14 +37,14 @@ class AttrController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getInfo($this->param['id']);
         $data = $logic->getInfo($this->param['id']);
-        return $this->success(Arr::twoKeepKeys($data, ['id', 'title', 'attrs']));
+        $this->response('success',Code::SUCCESS,Arr::twoKeepKeys($data, ['id', 'title', 'attrs']));
     }
     }
 
 
     public function save(AttrRequest $request, AttrLogic $logic)
     public function save(AttrRequest $request, AttrLogic $logic)
     {
     {
         $request->validated();
         $request->validated();
         $data = $logic->attrSave();
         $data = $logic->attrSave();
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     public function delete(Request $request, AttrLogic $logic)
     public function delete(Request $request, AttrLogic $logic)
@@ -55,7 +56,7 @@ class AttrController extends BaseController
         ]);
         ]);
 
 
         $data = $logic->delete($this->param['ids']);
         $data = $logic->delete($this->param['ids']);
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
 }
 }

@@ -110,7 +110,7 @@ class CategoryController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getCateInfo($this->param['id']);
         $data = $logic->getCateInfo($this->param['id']);
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -159,6 +159,6 @@ class CategoryController extends BaseController
             'ids.required' => 'ID不能为空'
             'ids.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->categoryDelete();
         $data = $logic->categoryDelete();
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -37,7 +37,7 @@ class DescribeController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getInfo($this->param['id']);
         $data = $logic->getInfo($this->param['id']);
-        return $this->success(Arr::twoKeepKeys($data, ['id', 'title', 'text', 'created_at']));
+        $this->response('success',Code::SUCCESS,Arr::twoKeepKeys($data, ['id', 'title', 'text', 'created_at']));
     }
     }
 
 
     /**
     /**
@@ -51,7 +51,7 @@ class DescribeController extends BaseController
     {
     {
         $request->validated();
         $request->validated();
         $logic->describeSave();
         $logic->describeSave();
-        return $this->success();
+        $this->response('success');
     }
     }
 
 
     public function delete(Request $request, DescribeLogic $logic)
     public function delete(Request $request, DescribeLogic $logic)
@@ -61,9 +61,8 @@ class DescribeController extends BaseController
         ],[
         ],[
             'ids.required' => 'ID不能为空'
             'ids.required' => 'ID不能为空'
         ]);
         ]);
-
         $data = $logic->delete($this->param['ids']);
         $data = $logic->delete($this->param['ids']);
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
 }
 }

@@ -66,7 +66,7 @@ class KeywordController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getKeywordInfo();
         $data = $logic->getKeywordInfo();
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bside\RankData;
 namespace App\Http\Controllers\Bside\RankData;
 
 
 
 
+use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Helper\GoogleSpeedApi;
 use App\Helper\GoogleSpeedApi;
 use App\Helper\QuanqiusouApi;
 use App\Helper\QuanqiusouApi;
@@ -30,7 +31,7 @@ class RankDataController extends BaseController
     public function index(RankDataLogic $logic)
     public function index(RankDataLogic $logic)
     {
     {
         $data = $logic->index();
         $data = $logic->index();
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -42,7 +43,7 @@ class RankDataController extends BaseController
      */
      */
     public function keywords_rank_list(RankDataLogic $logic){
     public function keywords_rank_list(RankDataLogic $logic){
         $data = $logic->keywords_rank_list();
         $data = $logic->keywords_rank_list();
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
 
 
@@ -73,7 +74,7 @@ class RankDataController extends BaseController
         }else{
         }else{
             $data = [];
             $data = [];
         }
         }
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -121,7 +122,7 @@ class RankDataController extends BaseController
         }
         }
         $fileurl = Storage::disk('runtime')->url($file);
         $fileurl = Storage::disk('runtime')->url($file);
 //        return Storage::disk('runtime')->download($file); //直接下载
 //        return Storage::disk('runtime')->download($file); //直接下载
-        return $this->success(['url' => $fileurl]);
+        $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
     }
 
 
     /**
     /**
@@ -169,7 +170,8 @@ class RankDataController extends BaseController
         }
         }
         $fileurl = Storage::disk('runtime')->url($file);
         $fileurl = Storage::disk('runtime')->url($file);
 //        return Storage::disk('runtime')->download($file); //直接下载
 //        return Storage::disk('runtime')->download($file); //直接下载
-        return $this->success(['url' => $fileurl]);
+
+        $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
     }
 
 
     /**
     /**
@@ -221,6 +223,6 @@ class RankDataController extends BaseController
                 $data['position'] = $res['position'];
                 $data['position'] = $res['position'];
             }
             }
         }
         }
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -4,6 +4,7 @@
 namespace App\Http\Controllers\Bside\Route;
 namespace App\Http\Controllers\Bside\Route;
 
 
 
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
@@ -23,8 +24,7 @@ class RouteController extends BaseController
         $source = $request->input('source');
         $source = $request->input('source');
         $source_id = $request->input('source_id');
         $source_id = $request->input('source_id');
         $project_id = $this->user['project_id'];
         $project_id = $this->user['project_id'];
-
         $route = RouteMap::generateRoute($title, $source, $source_id, $project_id);
         $route = RouteMap::generateRoute($title, $source, $source_id, $project_id);
-        return $this->success(['route' => $route]);
+        $this->response('success',Code::SUCCESS,['route' => $route]);
     }
     }
 }
 }

@@ -2,6 +2,7 @@
 
 
 namespace App\Http\Controllers\Bside\User;
 namespace App\Http\Controllers\Bside\User;
 
 
+use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\DeptLogic;
 use App\Http\Logic\Bside\User\DeptLogic;
@@ -26,7 +27,7 @@ class DeptController extends BaseController
         }
         }
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0);
         $data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0);
-        return $this->success(Arr::listToTree($data));
+        $this->response('success',Code::SUCCESS,Arr::listToTree($data));
     }
     }
 
 
     public function info(Request $request, DeptLogic $logic){
     public function info(Request $request, DeptLogic $logic){
@@ -36,13 +37,13 @@ class DeptController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getInfo($this->param['id']);
         $data = $logic->getInfo($this->param['id']);
-        return $this->success(Arr::twoKeepKeys($data, ['id', 'pid', 'title', 'manager_uids', 'remark']));
+        $this->response('success',Code::SUCCESS,Arr::twoKeepKeys($data, ['id', 'pid', 'title', 'manager_uids', 'remark']));
     }
     }
 
 
     public function save(DeptRequest $request, DeptLogic $logic)
     public function save(DeptRequest $request, DeptLogic $logic)
     {
     {
         $data = $logic->save($this->param);
         $data = $logic->save($this->param);
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     public function delete(DeptLogic $logic)
     public function delete(DeptLogic $logic)
@@ -54,6 +55,6 @@ class DeptController extends BaseController
         ]);
         ]);
 
 
         $data = $logic->delete($this->param['ids']);
         $data = $logic->delete($this->param['ids']);
-        return $this->success($data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }