作者 lyh

gx

@@ -104,21 +104,12 @@ class BaseController extends Controller @@ -104,21 +104,12 @@ class BaseController extends Controller
104 */ 104 */
105 public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse 105 public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse
106 { 106 {
107 - try {  
108 - $code = Code::fromValue($code);  
109 - $result = [  
110 - 'msg' => $msg == ' ' ? $code->description : $msg,  
111 - 'code' => $code->value,  
112 - 'data' => $this->_extents($data),  
113 - ];  
114 - }catch (\Throwable $e){  
115 - $result = [  
116 - 'msg' => $msg,  
117 - 'code' => $code,  
118 - 'data' => $this->_extents($data),  
119 - ];  
120 - }  
121 - 107 + $code = Code::fromValue($code);
  108 + $result = [
  109 + 'msg' => $msg == ' ' ? $code->description : $msg,
  110 + 'code' => $code->value,
  111 + 'data' => $this->_extents($data),
  112 + ];
122 $this->header['Content-Type'] = $type; 113 $this->header['Content-Type'] = $type;
123 $this->header['token'] = $this->token; 114 $this->header['token'] = $this->token;
124 $response = response($result,$result_code,$this->header);; 115 $response = response($result,$result_code,$this->header);;
@@ -30,10 +30,10 @@ class LoginAuthMiddleware @@ -30,10 +30,10 @@ class LoginAuthMiddleware
30 return response(['code'=>Code::USER_ERROR,'msg'=>'当前用户未登录']); 30 return response(['code'=>Code::USER_ERROR,'msg'=>'当前用户未登录']);
31 } 31 }
32 // 设置数据信息 32 // 设置数据信息
33 - $project = ProjectServer::useProject($info['project_id']);  
34 - if(empty($project)){  
35 - return response(['code'=>Code::USER_ERROR,'msg'=>'数据库未配置']);  
36 - } 33 +// $project = ProjectServer::useProject($info['project_id']);
  34 +// if(empty($project)){
  35 +// return response(['code'=>Code::USER_ERROR,'msg'=>'数据库未配置']);
  36 +// }
37 //操作权限设置 37 //操作权限设置
38 $projectRoleModel = new ProjectRoleModel(); 38 $projectRoleModel = new ProjectRoleModel();
39 $role_info = $projectRoleModel->read(['id'=>$info['role_id']]); 39 $role_info = $projectRoleModel->read(['id'=>$info['role_id']]);