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

@@ -52,8 +52,6 @@ class TranslateLogic extends BaseLogic
         $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
         $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
         //获取当前URl的所有文本内容
         //获取当前URl的所有文本内容
         $text_array = $this->getUrlRead($url);
         $text_array = $this->getUrlRead($url);
-        $json_text_arr = json_encode($text_array,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-        $text_array = json_decode($json_text_arr,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
         // 原始校对程序
         // 原始校对程序
         $old_key = [];//key值组成数据
         $old_key = [];//key值组成数据
         $data_read = json_decode($info ? $info['data'] : '',JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
         $data_read = json_decode($info ? $info['data'] : '',JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
@@ -66,7 +64,10 @@ class TranslateLogic extends BaseLogic
         }
         }
         $arr2 = [];
         $arr2 = [];
         foreach ($text_array as $val) {
         foreach ($text_array as $val) {
-            if (FALSE == in_array($val, $old_key)){
+            if($val == ' '){
+                continue;
+            }
+            if (FALSE == in_array(trim(urldecode($val),' '), $old_key)){
                 $arr2[] = $val;
                 $arr2[] = $val;
             }
             }
         }
         }