perf: websiteconfig接口替换

src/api/service/base.js

@@ -18,8 +18,7 @@ export const API = {
   GENERATE_IOT_TOKEN: 'cityinterface/rest/services.svc/generateGCKToken',
   GENERATE_QRCODE: 'cityinterface/rest/services.svc/generatetokenByqrcode',
   GENERATE_TOKEN_CHANGE: '/cityinterface/rest/services.svc/generatetokenquick',
-  GET_WEB_SITE_CONFIG: '/CityInterface/rest/services.svc/GetWebSiteConfig',
-  GET_WEB_SITE_CONFIG_GEWAY: '/PandaCore/GCK/Basis/GetWebSiteConfig',
+  GET_WEB_SITE_CONFIG: '/PandaOMS/OMS/WebSite/GetWebSiteConfig',
   GET_USER_INFO: '/CityInterface/rest/services.svc/getUserInfo',
   GET_GATEWAY_USER_INFO: '/PandaCore/GCK/Basis/GetUserInfo',
   GET_OA: '/CityInterface/rest/services/OA.svc/getLoginInfo',
@@ -78,12 +77,7 @@ const services = {
   },
 
   getWebSiteConfig: {
-    url: () =>
-      window.globalConfig &&
-      window.globalConfig &&
-      window.globalConfig.hasGateWay
-        ? API.GET_WEB_SITE_CONFIG_GEWAY
-        : API.GET_WEB_SITE_CONFIG,
+    url: API.GET_WEB_SITE_CONFIG,
     method: constants.REQUEST_METHOD_GET,
     type: constants.REQUEST_HTTP,
   },
@@ -235,10 +229,7 @@ export const getUserInfo = params => {
 };
 
 export const getWebSiteConfig = params => {
-  const url =
-    window.globalConfig && window.globalConfig && window.globalConfig.hasGateWay
-      ? API.GET_WEB_SITE_CONFIG_GEWAY
-      : API.GET_WEB_SITE_CONFIG;
+  const url = API.GET_WEB_SITE_CONFIG;
   return request({
     url,
     method: constants.REQUEST_METHOD_GET,

src/pages/user/login/login.js

@@ -321,15 +321,6 @@ class Login {
             // mapsettings: config.mapsettings
           });
 
-          // eslint-disable-next-line no-prototype-builtins
-          if (self.globalConfig.hasOwnProperty('webConfig')) {
-            self.globalConfig = Object.assign(self.globalConfig, {
-              // ...self.globalConfig,
-              ...self.globalConfig.webConfig.basicConfig,
-              ...self.globalConfig.webConfig.optionalConfig,
-            });
-          }
-
           self.updateConfig && self.updateConfig(self.globalConfig);
           self.getProjectItems().then(res => {
             window.subSysCfg = {};