周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 c9f69e2ed04fdffa49a0b8aaf9591cc02b34e811 2 个父辈 d5aeb316 5abd83f0

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 31 行增加 和 56 行删除
@@ -25,20 +25,20 @@ class AyrShare @@ -25,20 +25,20 @@ class AyrShare
25 ]; 25 ];
26 //私钥 26 //私钥
27 private $private_key = "-----BEGIN RSA PRIVATE KEY----- 27 private $private_key = "-----BEGIN RSA PRIVATE KEY-----
28 - MIICWgIBAAKBgGFatMeBeaw7QJrqmylMLZlwuuO0FA/EZg5/g7Rrqu+FgpwvFkJq  
29 - 9twEZJY+aIdDH8/RVrCZQGR/xUxKw9v4ows+sLwi4g41m8KRKDXUcJwQvSlwsHAi  
30 - h9hPGZxDsRK0Nv4pZ7XqGgh0Wb0VypX/+Q1dhX9BnXQmvEKayk8GQWQxAgMBAAEC  
31 - gYAFqOJNnudV7fPpja4LjpQwEW+sATIRYJeWTC9587ByUE6xicM/hTxouhCm82Xc  
32 - Rzi4OjFR/vbRYOQ1dTtBtIi18fdRrseQNyR/N2NZjw1X8n5aZcw5NVaa3d3YTQNa  
33 - uzjnYF5eYSOD4pNKKIDc35VHdmvGCV/JXwQKMTgu1+4AAQJBAL5jjN3kvMKFF8vG  
34 - DyYR8k+wPG9iXAdR0HjVNB3OzxKVW0MTwM32pJBXCmF1MOziL8WC48VHQL48hVRa  
35 - 52xRqAECQQCC53rrrOPhPCLIb6kBfgqnxCojqlUK9paFL7NYTPtLYcOajY6+NiKT  
36 - CG1gaOwZh4r34HF7I59l/Ds98Z4nQDwxAkAC4/oIiGeBQIoK8vfZ6R3XreJNAp5J  
37 - EinrG7mN1kz4iEH5c7xSpDL9agTjU+cpQYneIs2Yeit2d+7CSBsJXvgBAkBDFsfU  
38 - yYLxCJT7DN8dOK/VU6AVL1Luj3qNP+k2tB2GgNBzAWHK8ou9t2/3HU8DtofuikUe  
39 - yx8Cccca9B4OF8nBAkAgIUZKGmVNFcGnFFo55vSJInNXFo4HCJ2o4DunBORVtQ/j  
40 - zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K  
41 - -----END RSA PRIVATE KEY-----"; 28 +MIICWgIBAAKBgGFatMeBeaw7QJrqmylMLZlwuuO0FA/EZg5/g7Rrqu+FgpwvFkJq
  29 +9twEZJY+aIdDH8/RVrCZQGR/xUxKw9v4ows+sLwi4g41m8KRKDXUcJwQvSlwsHAi
  30 +h9hPGZxDsRK0Nv4pZ7XqGgh0Wb0VypX/+Q1dhX9BnXQmvEKayk8GQWQxAgMBAAEC
  31 +gYAFqOJNnudV7fPpja4LjpQwEW+sATIRYJeWTC9587ByUE6xicM/hTxouhCm82Xc
  32 +Rzi4OjFR/vbRYOQ1dTtBtIi18fdRrseQNyR/N2NZjw1X8n5aZcw5NVaa3d3YTQNa
  33 +uzjnYF5eYSOD4pNKKIDc35VHdmvGCV/JXwQKMTgu1+4AAQJBAL5jjN3kvMKFF8vG
  34 +DyYR8k+wPG9iXAdR0HjVNB3OzxKVW0MTwM32pJBXCmF1MOziL8WC48VHQL48hVRa
  35 +52xRqAECQQCC53rrrOPhPCLIb6kBfgqnxCojqlUK9paFL7NYTPtLYcOajY6+NiKT
  36 +CG1gaOwZh4r34HF7I59l/Ds98Z4nQDwxAkAC4/oIiGeBQIoK8vfZ6R3XreJNAp5J
  37 +EinrG7mN1kz4iEH5c7xSpDL9agTjU+cpQYneIs2Yeit2d+7CSBsJXvgBAkBDFsfU
  38 +yYLxCJT7DN8dOK/VU6AVL1Luj3qNP+k2tB2GgNBzAWHK8ou9t2/3HU8DtofuikUe
  39 +yx8Cccca9B4OF8nBAkAgIUZKGmVNFcGnFFo55vSJInNXFo4HCJ2o4DunBORVtQ/j
  40 +zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
  41 +-----END RSA PRIVATE KEY-----";
42 /** 42 /**
43 * @name :参数构建 43 * @name :参数构建
44 */ 44 */
@@ -173,22 +173,6 @@ class AyrShare @@ -173,22 +173,6 @@ class AyrShare
173 } 173 }
174 174
175 /** 175 /**
176 - * @remark :支持 Instagram, Facebook, Twitter, YouTube.  
177 - * @name :(修改子账户)put_update_profiles  
178 - * @author :lyh  
179 - * @method :post  
180 - * @time :2023/5/5 17:00  
181 - */  
182 - public function put_update_profiles($data){  
183 - $param = [  
184 - 'title'=>$data['title'],  
185 - 'profileKey'=>$this->profile_key,  
186 - ];  
187 - $url = $this->path.'/api/profiles/profile';  
188 - return $this->http_click('put',$url,$param);  
189 - }  
190 -  
191 - /**  
192 * @name :(通过用户名获取社交账号)get_brand_user 176 * @name :(通过用户名获取社交账号)get_brand_user
193 * @author :lyh https://app.ayrshare.com/api/brand/byUser 177 * @author :lyh https://app.ayrshare.com/api/brand/byUser
194 * @method :post 178 * @method :post
@@ -210,25 +194,17 @@ class AyrShare @@ -210,25 +194,17 @@ class AyrShare
210 * @method :post 194 * @method :post
211 * @time :2023/5/5 18:07 https://app.ayrshare.com/api/profiles/generateJWT 195 * @time :2023/5/5 18:07 https://app.ayrshare.com/api/profiles/generateJWT
212 */ 196 */
213 - public function post_generate_jwt($data){ 197 + public function post_generate_jwt($data,$domain = 'globalso'){
214 $param = [ 198 $param = [
215 - 'title'=>$data['domain'],  
216 - 'refId'=>$this->private_key,  
217 - 'profileKey'=>$this->profile_key, 199 + 'domain'=>$domain,
  200 + 'privateKey'=>$this->private_key,
  201 + 'profileKey'=>$data['profileKey'],
  202 + 'logout'=>true
218 ]; 203 ];
219 $url = $this->path.'/api/profiles/generateJWT'; 204 $url = $this->path.'/api/profiles/generateJWT';
220 return $this->http_click('post',$url,$param); 205 return $this->http_click('post',$url,$param);
221 } 206 }
222 207
223 - public function api_user(){  
224 - $post_data = [  
225 - 'platforms' => ['facebook', 'instagram', 'twitter', 'linkedin', 'pinterest', 'youtube', 'tiktok'],  
226 - ];  
227 - $url = $this->path.'/api/user';  
228 - return $this->http_click('post',$url,$post_data);  
229 - }  
230 -  
231 -  
232 /** 208 /**
233 * 发送http post,get,put,delete请求 209 * 发送http post,get,put,delete请求
234 * @param type $url 210 * @param type $url
@@ -32,7 +32,7 @@ class AyrShareController extends BaseController @@ -32,7 +32,7 @@ class AyrShareController extends BaseController
32 */ 32 */
33 public function create_account(AyrShareLogic $ayrShareLogic){ 33 public function create_account(AyrShareLogic $ayrShareLogic){
34 $param = [ 34 $param = [
35 - 'title'=>md5(uniqid().time()) 35 + 'title'=>md5(uniqid().time()),
36 ]; 36 ];
37 //发送请求注册社交用户 37 //发送请求注册社交用户
38 $ayrShareHelper = new AyrShareHelper(); 38 $ayrShareHelper = new AyrShareHelper();
@@ -88,13 +88,13 @@ class AyrShareController extends BaseController @@ -88,13 +88,13 @@ class AyrShareController extends BaseController
88 //发送请求注册社交用户 88 //发送请求注册社交用户
89 $ayrShareHelper = new AyrShareHelper(); 89 $ayrShareHelper = new AyrShareHelper();
90 $data = [ 90 $data = [
91 - 'domain'=>$this->request->getHost(), 91 + 'domain'=>'develop.globalso.com',
92 'profileKey'=>$info['profile_key'] 92 'profileKey'=>$info['profile_key']
93 ]; 93 ];
94 $res = $ayrShareHelper->post_generate_jwt($data); 94 $res = $ayrShareHelper->post_generate_jwt($data);
95 if($res['status'] == 'fail'){ 95 if($res['status'] == 'fail'){
96 $this->response($res['message'],Code::USER_ERROR); 96 $this->response($res['message'],Code::USER_ERROR);
97 } 97 }
98 - $this->response('success'); 98 + $this->response('success',Code::SUCCESS,$res);
99 } 99 }
100 } 100 }
@@ -24,15 +24,14 @@ class AyrShareLogic extends BaseLogic @@ -24,15 +24,14 @@ class AyrShareLogic extends BaseLogic
24 */ 24 */
25 public function ayr_share_add($res){ 25 public function ayr_share_add($res){
26 //插入数据库 26 //插入数据库
27 - $data = [ 27 + $this->param = [
28 'title'=>$res['title'], 28 'title'=>$res['title'],
29 'ref_id'=>$res['refId'], 29 'ref_id'=>$res['refId'],
30 'profile_key'=>$res['profileKey'], 30 'profile_key'=>$res['profileKey'],
31 'user_id'=>$this->user['id'], 31 'user_id'=>$this->user['id'],
32 'project_id'=>$this->user['project_id'], 32 'project_id'=>$this->user['project_id'],
33 -  
34 ]; 33 ];
35 - $rs = $this->model->add($data); 34 + $rs = $this->model->add($this->param);
36 if($rs === false){ 35 if($rs === false){
37 $this->fail('error'); 36 $this->fail('error');
38 } 37 }
@@ -60,19 +60,19 @@ class NewsLogic extends BaseLogic @@ -60,19 +60,19 @@ class NewsLogic extends BaseLogic
60 $this->param['project_id'] = $this->user['project_id']; 60 $this->param['project_id'] = $this->user['project_id'];
61 $this->param['created_at'] = date('Y-m-d H:i:s',time()); 61 $this->param['created_at'] = date('Y-m-d H:i:s',time());
62 $this->param['updated_at'] = date('Y-m-d H:i:s',time()); 62 $this->param['updated_at'] = date('Y-m-d H:i:s',time());
63 -// DB::beginTransaction();  
64 -// try { 63 + DB::beginTransaction();
  64 + try {
65 if(isset($this->param['image'])){ 65 if(isset($this->param['image'])){
66 $data = $this->upload(); 66 $data = $this->upload();
67 $this->param['image'] = $data; 67 $this->param['image'] = $data;
68 } 68 }
69 $rs = $this->model->insertGetId($this->param); 69 $rs = $this->model->insertGetId($this->param);
70 RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $rs, $this->user['project_id']); 70 RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $rs, $this->user['project_id']);
71 -// DB::commit();  
72 -// }catch (\Exception $e){  
73 -// DB::rollBack();  
74 -// $this->fail('添加失败');  
75 -// } 71 + DB::commit();
  72 + }catch (\Exception $e){
  73 + DB::rollBack();
  74 + $this->fail('添加失败');
  75 + }
76 return $this->success(); 76 return $this->success();
77 } 77 }
78 78