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

@@ -21,7 +21,7 @@ class BlogCategoryController extends BaseController
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $blogCategoryModel->lists($this->map,$this->page,$this->row,$this->order,
-            ['id','pid','name','num','status','sort','remark','created_at','updated_at']);
+            ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
         if(!empty($lists['list'])){
             $blogModel = new BlogModel();
             foreach ($lists['list'] as $k => $v){

@@ -21,7 +21,7 @@ class NewsCategoryController extends BaseController
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $newsCategory->lists($this->map,$this->page,$this->row,$this->order,
-            ['id','pid','name','num','status','sort','remark','created_at','updated_at']);
+            ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
         if(!empty($lists['list'])){
             $newsModel = new NewsModel();
             foreach ($lists['list'] as $k => $v){

@@ -26,15 +26,35 @@ class AyrShareLogic extends BaseLogic
         $param = [
             'title'=>md5(uniqid().time())
         ];
+        //发送请求注册社交用户
         $ayrShareHelper = new AyrShareHelper();
         $res = $ayrShareHelper->post_create_profiles($param);
         if($res['status'] == 'fail'){
             $this->response('绑定失败');
         }
+        //插入数据库
         $data = [
             'title'=>$res['title'],
-            ''
+            'ref_id'=>$res['refId'],
+            'profile_key'=>$res['profileKey'],
+            'user_id'=>$this->user['id'],
+            'project_id'=>$this->user['project_id'],
+
         ];
-        $this->model->add($data);
+        $rs = $this->model->add($data);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @name   :(zhuzhuang)sql_add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/6 10:04
+     */
+    public function sql_add(){
+
     }
 }