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

@@ -77,6 +77,7 @@ class TranslateLogic extends BaseLogic
             if($val == ' ' || $val == ''){
             if($val == ' ' || $val == ''){
                 continue;
                 continue;
             }
             }
+            $val = str_replace('　','',urldecode($val));//处理特殊字符
             $val = trim(str_replace(' ','',$val));
             $val = trim(str_replace(' ','',$val));
             if (FALSE == in_array($val, $old_key)){
             if (FALSE == in_array($val, $old_key)){
                 $arr2[] = $val;
                 $arr2[] = $val;

@@ -36,7 +36,7 @@ class NavRequest extends FormRequest
             'pid'   =>  ['required','integer'],
             'pid'   =>  ['required','integer'],
             'name'   =>  ['required','max:100'],
             'name'   =>  ['required','max:100'],
             'url'   =>  ['required'],
             'url'   =>  ['required'],
-            'remark'=> ['max:500']
+            'remark'=> ['max:1500']
         ];
         ];
         return $rule;
         return $rule;
     }
     }
@@ -52,7 +52,7 @@ class NavRequest extends FormRequest
             'name.required'  =>  '名称必须',
             'name.required'  =>  '名称必须',
             'name.max'  =>  '名称不能超过100个字符',
             'name.max'  =>  '名称不能超过100个字符',
             'url.required'  =>  '链接不能为空',
             'url.required'  =>  '链接不能为空',
-            'remark.max'  =>  '描述超过最长500字符',
+            'remark.max'  =>  '描述超过最长1500字符',
         ];
         ];
     }
     }
 }
 }

@@ -25,7 +25,7 @@ class NewsRequest extends FormRequest
     {
     {
         return [
         return [
             'name'=>'required|max:200',
             'name'=>'required|max:200',
-            'remark'=>'max:1000',
+            'remark'=>'max:2000',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
     }
     }
@@ -36,7 +36,7 @@ class NewsRequest extends FormRequest
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
             'name.max'=>'名称超过最长长度200',
             'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
-            'remark.max'=>'描述超过最长长度1000'
+            'remark.max'=>'描述超过最长长度2000'
         ];
         ];
     }
     }
 }
 }