diff --git a/o2server/configSample/person.json b/o2server/configSample/person.json index 850eb1541969fd02d519f055543128f0495dea9b..353462ae508200f82e9b6c0e78ff62f6f3824839 100644 --- a/o2server/configSample/person.json +++ b/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 +} diff --git a/o2web/source/o2_core/o2/xAction/RestActions.js b/o2web/source/o2_core/o2/xAction/RestActions.js index 3fe0f32022ae4b92517e45782290211e0de8f16f..60c2015a5a4d9700d164315b2542b3f4ffe53b71 100644 --- a/o2web/source/o2_core/o2/xAction/RestActions.js +++ b/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; diff --git a/o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js b/o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js index fa24de19faac20d82b2f04014e90f23b69a85dcb..c89ef9ff12b92db4c593cb3feeb6076a23f0672d 100644 --- a/o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js +++ b/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;