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

@@ -176,9 +176,12 @@ class BaseController extends Controller
         $url = HTTP_OPENAI_URL.$url;
         $url = HTTP_OPENAI_URL.$url;
         $aiCommandModel = New AiCommandModel();
         $aiCommandModel = New AiCommandModel();
         //指定库获取指令
         //指定库获取指令
+        var_dump($key);
         $info = $aiCommandModel->read(['key'=>$key]);
         $info = $aiCommandModel->read(['key'=>$key]);
+        var_dump($info);
+        die();
         if($info === false){
         if($info === false){
-            $this->response('error',Code::USER_ERROR);
+            $this->response('指令不存在',Code::USER_ERROR);
         }
         }
         //替换关键字
         //替换关键字
         $content = str_replace('$keyword$', $this->param['keywords'], $info['ai']);
         $content = str_replace('$keyword$', $this->param['keywords'], $info['ai']);

@@ -128,7 +128,7 @@ class NewsController extends BaseController
         ],[
         ],[
             'keywords.required' => '关键字不能为空',
             'keywords.required' => '关键字不能为空',
         ]);
         ]);
-        $key = 'new_title';
+        $key = 'news_title';
         #TODO 通过key获取到ai指令对象
         #TODO 通过key获取到ai指令对象
         $url = 'v2/openai_chat';
         $url = 'v2/openai_chat';
         $data = $this->send_openai_msg($url,$key);
         $data = $this->send_openai_msg($url,$key);

@@ -124,7 +124,7 @@ class RoleLogic extends BaseLogic
         //根据当前登录用户角色返回用户菜单列表
         //根据当前登录用户角色返回用户菜单列表
         $info = $this->model->read(['id'=>$this->user['role_id']]);
         $info = $this->model->read(['id'=>$this->user['role_id']]);
         $info['role_menu'] = trim($info['role_menu'],',');
         $info['role_menu'] = trim($info['role_menu'],',');
-        $menuModel = new ProjectMenu();
+        $menuModel = new ProjectMenuModel();
         $lists = $menuModel->where(['status'=>0])->whereIn('id',explode(',',$info['role_menu']))->get();
         $lists = $menuModel->where(['status'=>0])->whereIn('id',explode(',',$info['role_menu']))->get();
         $lists = $lists->toArray();
         $lists = $lists->toArray();
         $menu = array();
         $menu = array();

@@ -29,8 +29,7 @@
             "Database\\Seeders\\": "database/seeders/"
             "Database\\Seeders\\": "database/seeders/"
         },
         },
         "files": [
         "files": [
-            "app/Helper/helper.php",
-            "app/Helper/common.php"
+            "app/Helper/helper.php"
         ]
         ]
     },
     },
     "autoload-dev": {
     "autoload-dev": {