Merge branch 'fix/application_host_empty' into 'develop'

Merge of fix/application_host_empty to develop 返回应用host为空时，使用当前web host

See merge request o2oa/o2oa!751

o2server/configSample/person.json

@@ -3,7 +3,7 @@
   "captchaLogin": true,
   "codeLogin": true,
   "bindLogin": true,
-  "faceLogin": true,
+  "faceLogin": false,
   "password": "(var v \\u003d person.getMobile();\\u000a return v.substring(v.length - 6))",
   "passwordPeriod": 0.0,
   "passwordRegex": "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,}$",
@@ -35,4 +35,4 @@
   "###failureCount": "尝试登录次数###",
   "###tokenExpiredMinutes": "token时长,分钟###",
   "###personUnitOrderByAsc": "人员组织排序是否为升序，true为升序(默认)，false为降序###"
-}
\ No newline at end of file
+}

o2web/source/o2_core/o2/xAction/RestActions.js

@@ -148,7 +148,7 @@ MWF.xAction.RestActions = MWF.Actions = {
         var address = "";
         if (addressObj){
             //var mapping = layout.getAppUrlMapping();
-            address = layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port);
+            address = layout.config.app_protocol+"//"+(addressObj.host || window.location.hostname)+(addressObj.port==80 ? "" : ":"+addressObj.port);
         }else{
             var host = layout.desktop.centerServer.host || window.location.hostname;
             var port = layout.desktop.centerServer.port;

o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -29,7 +29,7 @@ MWF.xDesktop.Actions.RestActions = new Class({
         var addressObj = layout.serviceAddressList[this.serviceName];
         if (addressObj){
             //var mapping = layout.getAppUrlMapping(layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context);
-            this.address = layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context;
+            this.address = layout.config.app_protocol+"//"+(addressObj.host || window.location.hostname)+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context;
         }else{
             var host = layout.desktop.centerServer.host || window.location.hostname;
             var port = layout.desktop.centerServer.port;