wip

app/admin/controller/AccountManagement.php

@@ -11,7 +11,7 @@ class AccountManagement extends BaseController
     public function getAllUsers(AccountService $accountService)
     {
         $result = $accountService->getAllUsers();
-        return json(['code' => 200, 'message' => '查询成功', 'data' => $result]);
+        return $this->success('查询成功', $result);
     }
 
     /* 注册用户 */
@@ -23,20 +23,15 @@ class AccountManagement extends BaseController
 
         # 参数校验
         if (empty($params['username'])) {
-            return json(['code' => 400, 'message' => '缺少必要参数']);
+            return $this->error('缺少必要参数');
         }
 
         # 业务逻辑
         try {
             $result = $accountService->createAccount($params);
-            return json(['code' => 200, 'message' => '账户创建成功', 'data' => $result]);
+            return $this->success('账户创建成功', $result);
         } catch (\Exception $e) {
-
-            return json([
-                'code' => 400,
-                'message' => $e->getMessage(),
-                'data' => null
-            ]);
+            return $this->error($e->getMessage());
         }
     }
 
@@ -45,9 +40,9 @@ class AccountManagement extends BaseController
     {
         try {
             $result = $accountService->updateAccountStatus($id, $status);
-            return json(['code' => 200, 'message' => '账户状态更新成功', 'data' => $result]);
+            return $this->success('账户状态更新成功', $result);
         } catch (\Exception $e) {
-            return json(['code' => 400, 'message' => $e->getMessage(), 'data' => null]);
+            return $this->error($e->getMessage());
         }
     }
 
@@ -56,9 +51,9 @@ class AccountManagement extends BaseController
     {
         try {
             $result = $accountService->deleteAccount($id);
-            return json(['code' => 200, 'message' => '账户删除成功', 'data' => $result]);
+            return $this->success('账户删除成功', $result);
         } catch (\Exception $e) {
-            return json(['code' => 400, 'message' => $e->getMessage(), 'data' => null]);
+            return $this->error($e->getMessage());
         }
     }
 }

app/admin/controller/CompanyAndOperators.php

@@ -14,7 +14,7 @@ class CompanyAndOperators extends BaseController
     public function getAllOperators(TicketService $ticketService)
     {
         $result = $ticketService->getAllOperators();
-        return json(['code' => 200, 'msg' => '查询成功', 'data' => $result]);
+        return $this->success('查询成功', $result);
     }
 
 
@@ -24,7 +24,7 @@ class CompanyAndOperators extends BaseController
 
         $result = $ticketService->TestgetAllOperators();
 
-        return json(['code' => 200, 'msg' => '查询成功', 'data' => $result]);
+        return $this->success('查询成功', $result);
     }
 
 
@@ -36,7 +36,7 @@ class CompanyAndOperators extends BaseController
     public function getStaffList(TicketService $ticketService)
     {
         $result = $ticketService->getStaffList();
-        return json(['code' => 200, 'msg' => '查询成功', 'data' => $result]);
+        return $this->success('查询成功', $result);
     }
 
 
@@ -46,7 +46,7 @@ class CompanyAndOperators extends BaseController
 
         $result = $CompanyOperatorService->deleteOperator($id);
 
-        return json(['code' => 200, 'msg' => '删除成功', 'data' => $result]);
+        return $this->success('删除成功', $result);
     }
 
     /* 删除客户单位 */
@@ -54,9 +54,9 @@ class CompanyAndOperators extends BaseController
     {
         $result = $CompanyOperatorService->deleteCompany($id);
         if (!$result) {
-            return json(['code' => 400, 'msg' => '删除失败', 'data' => null]);
+            return $this->error('删除失败');
         }
-        return json(['code' => 200, 'msg' => '删除成功']);
+        return $this->success('删除成功');
     }
 
 
@@ -66,9 +66,9 @@ class CompanyAndOperators extends BaseController
         $data = $this->request->post();
         try {
             $result = $CompanyOperatorService->addCompany($data);
-            return json(['code' => 200, 'msg' => '创建成功', 'data' => $result]);
+            return $this->success('创建成功', $result);
         } catch (\Exception $e) {
-            return json(['code' => 400, 'msg' => $e->getMessage(), 'data' => null]);
+            return $this->error($e->getMessage());
         }
     }
 
@@ -78,9 +78,9 @@ class CompanyAndOperators extends BaseController
         $data = $this->request->post();
         try {
             $result = $CompanyOperatorService->addOperator($data);
-            return json(['code' => 200, 'msg' => '创建成功', 'data' => $result]);
+            return $this->success('创建成功', $result);
         } catch (\Exception $e) {
-            return json(['code' => 400, 'msg' => $e->getMessage(), 'data' => null]);
+            return $this->error($e->getMessage());
         }
     }
 

app/admin/controller/Utill.php

@@ -19,12 +19,12 @@ class Utill extends BaseController
             # session中获取当前登录是否是管理员
             $isAdmin = Session::get('user_info.role') === 'admin' ? true : false; // 后续用来判断
             if (!$isAdmin) {
-                return json(['code' => 403, 'msg' => '权限不足', 'data' => []]);
+                return $this->error('权限不足', [], 403);
             }
             $data = $UtillService->getExportData($range);
-            return json(['code' => 200, 'msg' => '查询成功', 'data' => $data]);
+            return $this->success('查询成功', $data);
         } catch (\Exception $e) {
-            return json(['code' => 500, 'msg' => '查询失败', 'data' => []]);
+            return $this->error('查询失败', [], 500);
         }
     }
 }

app/admin/middleware/Auth.php

@@ -2,10 +2,13 @@
 
 namespace app\admin\middleware;
 
+use app\common\Trait\ApiResponse;
 use think\facade\Session;
 
 class Auth
 {
+    use ApiResponse;
+
     /**
      * 无需 admin 角色即可访问的路由名称（方法名小写）
      */
@@ -31,7 +34,7 @@ class Auth
     public function handle($request, \Closure $next)
     {
         if (!Session::has('user_info')) {
-            return json(['code' => 401, 'msg' => '未登录，请先登录']);
+            return $this->error('未登录，请先登录', [], 401);
         }
 
         $user = Session::get('user_info');
@@ -45,7 +48,7 @@ class Auth
 
         // admin 专用接口
         if (in_array($action, $this->adminActions) && $role !== 'admin') {
-            return json(['code' => 403, 'msg' => '权限不足，仅管理员可执行此操作']);
+            return $this->error('权限不足，仅管理员可执行此操作', [], 403);
         }
 
         return $next($request);