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

@@ -89,7 +89,7 @@ class AyrReleaseController extends BaseController
         //发送请求发布社交文章
         //发送请求发布社交文章
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         if($res){
         if($res){
-            $ayrReleaseLogic->release_add($res);
+            $res = $ayrReleaseLogic->release_add($res);
         }
         }
         //保存返回的内容
         //保存返回的内容
         $this->response('success',Code::SUCCESS,json_decode($res));
         $this->response('success',Code::SUCCESS,json_decode($res));

@@ -52,9 +52,18 @@ class AyrReleaseLogic extends BaseLogic
             $result_data = json_decode($this->param['result_data']);
             $result_data = json_decode($this->param['result_data']);
             if(isset($result_data->status) && $result_data->status == 'success'){
             if(isset($result_data->status) && $result_data->status == 'success'){
                 $this->model->edit($this->param,['id'=>$info['id']]);
                 $this->model->edit($this->param,['id'=>$info['id']]);
+            }else{
+                foreach ($result_data->errors as $v){
+                    if($v->code == 137){
+                        $result_data->status == 'success';
+                        break;
+                    }
+                }
+                $this->param['result_data'] = json_encode($result_data);
+                $this->model->edit($this->param,['id'=>$info['id']]);
             }
             }
         }
         }
-        return $this->success();
+        return $this->success(['data'=>$this->param['result_data']]);
     }
     }
     /**
     /**
      * @name   :（上传第三方图片参数处理）get_param
      * @name   :（上传第三方图片参数处理）get_param