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

@@ -25,20 +25,20 @@ class AyrShare
     ];
     //私钥
     private $private_key = "-----BEGIN RSA PRIVATE KEY-----
-            MIICWgIBAAKBgGFatMeBeaw7QJrqmylMLZlwuuO0FA/EZg5/g7Rrqu+FgpwvFkJq
-            9twEZJY+aIdDH8/RVrCZQGR/xUxKw9v4ows+sLwi4g41m8KRKDXUcJwQvSlwsHAi
-            h9hPGZxDsRK0Nv4pZ7XqGgh0Wb0VypX/+Q1dhX9BnXQmvEKayk8GQWQxAgMBAAEC
-            gYAFqOJNnudV7fPpja4LjpQwEW+sATIRYJeWTC9587ByUE6xicM/hTxouhCm82Xc
-            Rzi4OjFR/vbRYOQ1dTtBtIi18fdRrseQNyR/N2NZjw1X8n5aZcw5NVaa3d3YTQNa
-            uzjnYF5eYSOD4pNKKIDc35VHdmvGCV/JXwQKMTgu1+4AAQJBAL5jjN3kvMKFF8vG
-            DyYR8k+wPG9iXAdR0HjVNB3OzxKVW0MTwM32pJBXCmF1MOziL8WC48VHQL48hVRa
-            52xRqAECQQCC53rrrOPhPCLIb6kBfgqnxCojqlUK9paFL7NYTPtLYcOajY6+NiKT
-            CG1gaOwZh4r34HF7I59l/Ds98Z4nQDwxAkAC4/oIiGeBQIoK8vfZ6R3XreJNAp5J
-            EinrG7mN1kz4iEH5c7xSpDL9agTjU+cpQYneIs2Yeit2d+7CSBsJXvgBAkBDFsfU
-            yYLxCJT7DN8dOK/VU6AVL1Luj3qNP+k2tB2GgNBzAWHK8ou9t2/3HU8DtofuikUe
-            yx8Cccca9B4OF8nBAkAgIUZKGmVNFcGnFFo55vSJInNXFo4HCJ2o4DunBORVtQ/j
-            zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
-            -----END RSA PRIVATE KEY-----";
+MIICWgIBAAKBgGFatMeBeaw7QJrqmylMLZlwuuO0FA/EZg5/g7Rrqu+FgpwvFkJq
+9twEZJY+aIdDH8/RVrCZQGR/xUxKw9v4ows+sLwi4g41m8KRKDXUcJwQvSlwsHAi
+h9hPGZxDsRK0Nv4pZ7XqGgh0Wb0VypX/+Q1dhX9BnXQmvEKayk8GQWQxAgMBAAEC
+gYAFqOJNnudV7fPpja4LjpQwEW+sATIRYJeWTC9587ByUE6xicM/hTxouhCm82Xc
+Rzi4OjFR/vbRYOQ1dTtBtIi18fdRrseQNyR/N2NZjw1X8n5aZcw5NVaa3d3YTQNa
+uzjnYF5eYSOD4pNKKIDc35VHdmvGCV/JXwQKMTgu1+4AAQJBAL5jjN3kvMKFF8vG
+DyYR8k+wPG9iXAdR0HjVNB3OzxKVW0MTwM32pJBXCmF1MOziL8WC48VHQL48hVRa
+52xRqAECQQCC53rrrOPhPCLIb6kBfgqnxCojqlUK9paFL7NYTPtLYcOajY6+NiKT
+CG1gaOwZh4r34HF7I59l/Ds98Z4nQDwxAkAC4/oIiGeBQIoK8vfZ6R3XreJNAp5J
+EinrG7mN1kz4iEH5c7xSpDL9agTjU+cpQYneIs2Yeit2d+7CSBsJXvgBAkBDFsfU
+yYLxCJT7DN8dOK/VU6AVL1Luj3qNP+k2tB2GgNBzAWHK8ou9t2/3HU8DtofuikUe
+yx8Cccca9B4OF8nBAkAgIUZKGmVNFcGnFFo55vSJInNXFo4HCJ2o4DunBORVtQ/j
+zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
+-----END RSA PRIVATE KEY-----";
     /**
      * @name :参数构建
      */
@@ -173,22 +173,6 @@ class AyrShare
     }
 
     /**
-     * @remark :支持 Instagram, Facebook, Twitter, YouTube.
-     * @name   :(修改子账户)put_update_profiles
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/5 17:00
-     */
-    public function put_update_profiles($data){
-        $param = [
-            'title'=>$data['title'],
-            'profileKey'=>$this->profile_key,
-        ];
-        $url = $this->path.'/api/profiles/profile';
-        return $this->http_click('put',$url,$param);
-    }
-
-    /**
      * @name   :(通过用户名获取社交账号)get_brand_user
      * @author :lyh https://app.ayrshare.com/api/brand/byUser
      * @method :post
@@ -210,25 +194,17 @@ class AyrShare
      * @method :post
      * @time   :2023/5/5 18:07 https://app.ayrshare.com/api/profiles/generateJWT
      */
-    public function post_generate_jwt($data){
+    public function post_generate_jwt($data,$domain = 'globalso'){
         $param = [
-            'title'=>$data['domain'],
-            'refId'=>$this->private_key,
-            'profileKey'=>$this->profile_key,
+            'domain'=>$domain,
+            'privateKey'=>$this->private_key,
+            'profileKey'=>$data['profileKey'],
+            'logout'=>true
         ];
         $url = $this->path.'/api/profiles/generateJWT';
         return $this->http_click('post',$url,$param);
     }
 
-    public function api_user(){
-        $post_data = [
-            'platforms' => ['facebook', 'instagram', 'twitter', 'linkedin', 'pinterest', 'youtube', 'tiktok'],
-        ];
-        $url = $this->path.'/api/user';
-        return $this->http_click('post',$url,$post_data);
-    }
-
-
     /**
      * 发送http post,get,put,delete请求
      * @param type $url

@@ -32,7 +32,7 @@ class AyrShareController extends BaseController
      */
     public function create_account(AyrShareLogic $ayrShareLogic){
         $param = [
-            'title'=>md5(uniqid().time())
+            'title'=>md5(uniqid().time()),
         ];
         //发送请求注册社交用户
         $ayrShareHelper = new AyrShareHelper();
@@ -88,13 +88,13 @@ class AyrShareController extends BaseController
         //发送请求注册社交用户
         $ayrShareHelper = new AyrShareHelper();
         $data = [
-            'domain'=>$this->request->getHost(),
+            'domain'=>'develop.globalso.com',
             'profileKey'=>$info['profile_key']
         ];
         $res = $ayrShareHelper->post_generate_jwt($data);
         if($res['status'] == 'fail'){
             $this->response($res['message'],Code::USER_ERROR);
         }
-        $this->response('success');
+        $this->response('success',Code::SUCCESS,$res);
     }
 }

@@ -24,15 +24,14 @@ class AyrShareLogic extends BaseLogic
      */
     public function ayr_share_add($res){
         //插入数据库
-        $data = [
+        $this->param = [
             'title'=>$res['title'],
             'ref_id'=>$res['refId'],
             'profile_key'=>$res['profileKey'],
             'user_id'=>$this->user['id'],
             'project_id'=>$this->user['project_id'],
-
         ];
-        $rs = $this->model->add($data);
+        $rs = $this->model->add($this->param);
         if($rs === false){
             $this->fail('error');
         }

@@ -60,19 +60,19 @@ class NewsLogic extends BaseLogic
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['created_at'] = date('Y-m-d H:i:s',time());
         $this->param['updated_at'] = date('Y-m-d H:i:s',time());
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             if(isset($this->param['image'])){
                 $data = $this->upload();
                 $this->param['image'] = $data;
             }
             $rs = $this->model->insertGetId($this->param);
             RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $rs, $this->user['project_id']);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('添加失败');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('添加失败');
+        }
         return $this->success();
     }