Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

 <?php
 <?php
 
 
-namespace App\Http\Controllers\Bside\Blog;
+namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Http\Controllers\Bside\BaseController;
 
 
 class AiCommandController extends BaseController
 class AiCommandController extends BaseController
 {
 {
@@ -18,8 +17,6 @@ class AiCommandController extends BaseController
         $command = ['key'=>'user','scene'=>'system'];
         $command = ['key'=>'user','scene'=>'system'];
         $param = ['key'=>'user','scene'=>'请问你是谁？'];
         $param = ['key'=>'user','scene'=>'请问你是谁？'];
         $data = send_openai_msg($url,$command,$param);
         $data = send_openai_msg($url,$command,$param);
-        var_dump($data);
-        die();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 

@@ -23,8 +23,8 @@ class ComController extends BaseController
      */
      */
     public function login(Request $request){
     public function login(Request $request){
         $request->validate([
         $request->validate([
-            'mobile'=>['required|string|max:12'],
-            'password'=>['required|string'],
+            'mobile'=>['required'],
+            'password'=>['required'],
         ],[
         ],[
             'mobile.required'=>'标题必须填写',
             'mobile.required'=>'标题必须填写',
             'mobile.string'=>'标题中含有非法文字',
             'mobile.string'=>'标题中含有非法文字',
@@ -87,14 +87,11 @@ class ComController extends BaseController
      */
      */
     public function edit_info(Request $request){
     public function edit_info(Request $request){
         $request->validate([
         $request->validate([
-            'password'=>['required,string,min:5'],
-            'name'=>['required,max:20'],
+            'password'=>['required'],
+            'name'=>['required'],
         ],[
         ],[
             'password.required'=>'密码必须填写',
             'password.required'=>'密码必须填写',
-            'password.string'=>'密码中含有非法文字',
-            'password.min'   =>  '密码不小于5字符.',
             'name.required'=>'名称必须填写',
             'name.required'=>'名称必须填写',
-            'name.min'   =>  '名称不小于5字符.',
         ]);
         ]);
         $userModel = new UserModel();
         $userModel = new UserModel();
         $this->param['id'] = $this->uid;
         $this->param['id'] = $this->uid;
@@ -118,4 +115,5 @@ class ComController extends BaseController
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
+
 }
 }

@@ -31,8 +31,7 @@ class LoginAuthMiddleware
             return response(['code'=>Code::USER_ERROR,'msg'=>'当前用户未登录']);
             return response(['code'=>Code::USER_ERROR,'msg'=>'当前用户未登录']);
         }
         }
         // 设置数据信息
         // 设置数据信息
-        ProjectServer::useProject($info['project_id']);
-
+//        ProjectServer::useProject($info['project_id']);
         //操作权限设置
         //操作权限设置
         $projectRoleModel = new ProjectRoleModel();
         $projectRoleModel = new ProjectRoleModel();
         $role_info = $projectRoleModel->read(['id'=>$info['role_id']]);
         $role_info = $projectRoleModel->read(['id'=>$info['role_id']]);

@@ -2,7 +2,8 @@
 /**
 /**
  * B端用户路由文件
  * B端用户路由文件
  */
  */
-use \Illuminate\Support\Facades\Route;
+
+use Illuminate\Support\Facades\Route;
 
 
 //必须登录验证的路由组
 //必须登录验证的路由组
 Route::middleware(['bloginauth'])->group(function () {
 Route::middleware(['bloginauth'])->group(function () {
@@ -84,7 +85,7 @@ Route::middleware(['bloginauth'])->group(function () {
     });
     });
     //ai指令
     //ai指令
     Route::prefix('command')->group(function () {
     Route::prefix('command')->group(function () {
-        Route::any('/', [\App\Http\Controllers\Bside\Blog\AiCommandController::class, 'lists'])->name('command_lists');
+        Route::any('/', [\App\Http\Controllers\Bside\AiCommandController::class, 'lists'])->name('command_lists');
     });
     });
 
 
     //产品
     //产品