Merge branch 'fix/cllect_http' into 'wrdp'

修改proxyHost校验

See merge request o2oa/o2oa!2634

o2web/source/x_component_Setting/Document.js

@@ -729,6 +729,12 @@ MWF.xApplication.Setting.Document.List.ItemEditor = new Class({
                 }else{
                     values[k] = value;
                 }
+                if(k === "proxyHost"){
+                    if(value.indexOf("http")>-1){
+                        flag = false;
+                        this.app.notice(this.lp.list.infoProxyHost, "error");
+                    }
+                }
             }
         }.bind(this));
 

o2web/source/x_component_Setting/lp/zh-cn.js

@@ -267,7 +267,9 @@ MWF.xApplication.Setting.LP = {
         "infoParameter": "请求信息方法参数",
         "infoMethod": "请求信息方法（GET或POST）",
         "infoType": "info信息格式（json或form）",
-        "infoCredentialField": "info信息中用于标识个人的字段"
+        "infoCredentialField": "info信息中用于标识个人的字段",
+
+        "infoProxyHost" : "域名不需要包含http"
     },
 
     "module": {