作者 邓超

Merge branch 'develop' into dc

@@ -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($project){  
35 - return response(['code'=>Code::USER_ERROR,'msg'=>'数据库未配置']);  
36 - } 33 +// $project = ProjectServer::useProject($info['project_id']);
  34 +// if($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']]);
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 2
3 namespace App\Models; 3 namespace App\Models;
4 4
5 -use App\Helper\Common;  
6 use Illuminate\Database\Eloquent\Model; 5 use Illuminate\Database\Eloquent\Model;
7 class Base extends Model 6 class Base extends Model
8 { 7 {