Merge branch 'fix/gulpfile' into 'wrdp'

configMapping配置问题修复 See merge request o2oa/o2oa!2176

Merge branch 'fix/gulpfile' into 'wrdp'
configMapping配置问题修复 See merge request o2oa/o2oa!2176
9787a7ab · NoSubject · 9eea76f4 · 4819761f · 9787a7ab
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

o2web/source/x_desktop/js/base.js o2web/source/x_desktop/js/base.js +2 -2

未找到文件。
--- a/o2web/source/x_desktop/js/base.js
+++ b/o2web/source/x_desktop/js/base.js
@@ -432,8 +432,8 @@ o2.addReady(function () {
            layout.config.app_protocol = window.location.protocol;
        }

-        if (layout.config.configMapping && layout.config.configMapping[window.location.host]){
-            var mapping = layout.config.configMapping[window.location.host];
+        if (layout.config.configMapping && (layout.config.configMapping[window.location.host] || layout.config.configMapping[window.location.hostname])){
+            var mapping = layout.config.configMapping[window.location.host] || layout.config.configMapping[window.location.hostname];
            if (mapping.servers){
                layout.serviceAddressList = mapping.servers;
                layout.desktop.serviceAddressList = mapping.servers;