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

@@ -116,29 +116,22 @@ zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
         //平台参数处理
         //平台参数处理
         $param['idempotencyKey'] = uniqid().time();
         $param['idempotencyKey'] = uniqid().time();
         $url = $this->path.'/api/post';
         $url = $this->path.'/api/post';
-        return $this->http_post_ayr($url,$param,$api_key);
-    }
-    public function http_post_ayr($url,$param,$api_key){
         $curl = curl_init();
         $curl = curl_init();
-        curl_setopt_array($curl, array(
+        curl_setopt_array($curl, [
             CURLOPT_URL => $url,
             CURLOPT_URL => $url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING => '',
-            CURLOPT_MAXREDIRS => 10,
-            CURLOPT_TIMEOUT => 0,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST => 'POST',
-            CURLOPT_POSTFIELDS => http_build_query($param),
-            CURLOPT_HTTPHEADER => array(
+            CURLOPT_POST => true,
+            CURLOPT_POSTFIELDS => json_encode($param),
+            CURLOPT_HTTPHEADER => [
                 'Authorization: Bearer '.$api_key,
                 'Authorization: Bearer '.$api_key,
-                'Accept-Encoding: gzip'
-            ),
-        ));
+                'Content-Type: application/json'
+            ],
+        ]);
         $response = curl_exec($curl);
         $response = curl_exec($curl);
         curl_close($curl);
         curl_close($curl);
         return $response;
         return $response;
     }
     }
+
     /**
     /**
      * @name   :(上传图片或视频到ayr_share)post_media_upload
      * @name   :(上传图片或视频到ayr_share)post_media_upload
      * @author :lyh
      * @author :lyh

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

@@ -453,30 +453,23 @@ class BTemplateLogic extends BaseLogic
                 if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
                 if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
                     $data['html'] = $html;
                     $data['html'] = $html;
                     $data['type'] = BTemplate::ALL_HTML;
                     $data['type'] = BTemplate::ALL_HTML;
-                }else{
-                    $mainInfo = $this->handleTemplateHtml($html);
-                    $data['main_html'] = $mainInfo['main_html'];
-                    $data['main_css'] = $mainInfo['main_css'];
+                    return $this->success($data);
                 }
                 }
-                return $this->success($data);
-            }
-            $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
-            //查看当前页面是否定制，是否开启可视化
-            $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
-            if (in_array($type, $page_array)) {//当前页面是定制界面
-                $data['html'] = $html;
-                $data['type'] = BTemplate::ALL_HTML;
             }else{
             }else{
-                $mainInfo = $this->handleTemplateHtml($html);
-                $data['main_html'] = $mainInfo['main_html'];
-                $data['main_css'] = $mainInfo['main_css'];
+                $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
+                //查看当前页面是否定制，是否开启可视化
+                $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
+                if (in_array($type, $page_array)) {//当前页面是定制界面
+                    $data['html'] = $html;
+                    $data['type'] = BTemplate::ALL_HTML;
+                    return $this->success($data);
+                }
             }
             }
-        }else{
-            $mainInfo = $this->handleTemplateHtml($html);
-            $data['main_html'] = $mainInfo['main_html'];
-            $data['main_css'] = $mainInfo['main_css'];
         }
         }
-        return $data;
+        $mainInfo = $this->handleTemplateHtml($html);
+        $data['main_html'] = $mainInfo['main_html'];
+        $data['main_css'] = $mainInfo['main_css'];
+        return $this->success($data);
     }
     }
 
 
     /**
     /**

@@ -34,7 +34,7 @@ class RatingLogic extends BaseLogic
      */
      */
     public function getRatingRead(){
     public function getRatingRead(){
         $data = [
         $data = [
-            'company'=>$this->project['company'],
+            'company'=>$this->project['company'] ?? '',
             'mobile'=>$this->user['mobile'],
             'mobile'=>$this->user['mobile'],
             'uptime'=>$this->project['uptime'],
             'uptime'=>$this->project['uptime'],
             'domain'=>$this->user['domain'],
             'domain'=>$this->user['domain'],