diff --git a/base-manager-ui/admin/.env.production b/base-manager-ui/admin/.env.production index 21e32e0849cc577dbf5b19e52f2ed07d8f29bf8c..b6088cd44d35398007c008652880db71395c77a8 100644 --- a/base-manager-ui/admin/.env.production +++ b/base-manager-ui/admin/.env.production @@ -1,3 +1,3 @@ #鐢熶骇鐜 NODE_ENV = "production" -VUE_APP_API_BASE_URL=http://192.168.2.144:11078 \ No newline at end of file +VUE_APP_API_BASE_URL=/ \ No newline at end of file diff --git a/base-manager-ui/admin/.env.test b/base-manager-ui/admin/.env.test index a6734821fd73e4449fee472e25bd171c60c9d6ba..0e66a1665af123c820f7807f99321ee761fc083a 100644 --- a/base-manager-ui/admin/.env.test +++ b/base-manager-ui/admin/.env.test @@ -1,3 +1,3 @@ #娴嬭瘯鐜 NODE_ENV = "test" -VUE_APP_API_BASE_URL=http://192.168.0.98:11078 \ No newline at end of file +VUE_APP_API_BASE_URL=/ \ No newline at end of file diff --git a/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue b/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue index 06922ddd068eb65150d826dec89064e55e7343c8..b9e91c6d16ae4da98eea732e0f4274d1100df845 100644 --- a/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue +++ b/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue @@ -521,6 +521,7 @@ export default { }, created() { this.getModel(); + console.log(process.env.NODE_ENV); }, computed: { Visible: { diff --git a/base-manager-ui/admin/src/pages/basicset/site/website.vue b/base-manager-ui/admin/src/pages/basicset/site/website.vue index 2e9bec0a7901adaedc1de619151e90aabfeec889..4fd2a3cb9c0456fc9583f4fc1abab8cde819afc4 100644 --- a/base-manager-ui/admin/src/pages/basicset/site/website.vue +++ b/base-manager-ui/admin/src/pages/basicset/site/website.vue @@ -289,33 +289,37 @@ export default { async getSiteList(info = {}) { this.loading = true; let res = await getSiteList(info); - let { data, dict } = res.data.data; - data.forEach((v) => { - v.modelIds = v.modelIds.split(","); - v.modelData = Object.keys(dict.modelIds).reduce( - (pre, cur) => ( - v.modelIds.includes(cur) && pre.push(dict.modelIds[cur]), pre - ), - [] - ); - }); - this.siteData = data; this.loading = false; + if (res.data.code === 1) { + let { data, dict } = res.data.data; + data.forEach((v) => { + v.modelIds = v.modelIds.split(","); + v.modelData = Object.keys(dict.modelIds).reduce( + (pre, cur) => ( + v.modelIds.includes(cur) && pre.push(dict.modelIds[cur]), pre + ), + [] + ); + }); + this.siteData = data; + } }, // 鑾峰彇绔欑偣淇℃伅 async getSiteInfo() { this.loading = true; let res = await siteInfo({ id: this.siteId }); - let { data, dict } = res.data; - data.modelIds = data.modelIds.split(","); - data.modelData = Object.keys(dict.modelIds).reduce( - (pre, cur) => ( - data.modelIds.includes(cur) && pre.push(dict.modelIds[cur]), pre - ), - [] - ); - this.siteData = [data]; this.loading = false; + if (res.data.code === 1) { + let { data, dict } = res.data; + data.modelIds = data.modelIds.split(","); + data.modelData = Object.keys(dict.modelIds).reduce( + (pre, cur) => ( + data.modelIds.includes(cur) && pre.push(dict.modelIds[cur]), pre + ), + [] + ); + this.siteData = [data]; + } }, // 鍒犻櫎 diff --git a/portal-manager-ui/admin/.env.production b/portal-manager-ui/admin/.env.production index fff0ecb3adca2340cfd500be6d327c5d48280304..d637b237c6e3d068a54515aba6e5a81f1d31b86d 100644 --- a/portal-manager-ui/admin/.env.production +++ b/portal-manager-ui/admin/.env.production @@ -1,4 +1,4 @@ # 鐢熶骇鐜閰嶇疆 NODE_ENV = production -VUE_APP_API_BASE_URL=http://192.168.2.144:11078/zwfw +VUE_APP_API_BASE_URL=http://192.168.0.98:11078/zwfw diff --git a/smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/CrossInterceptor.java b/smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/CrossInterceptor.java index 038e575c7b81d75af05f6d595e30acf6ecc7fc9a..d2784d7287de70940ce556e6dbd97e1a13b9a1e7 100644 --- a/smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/CrossInterceptor.java +++ b/smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/CrossInterceptor.java @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse; * @date: 2022/6/6 15:05 * @description:娣诲姞璺ㄥ煙鍝嶅簲 **/ -@Component +//@Component public class CrossInterceptor extends HandlerInterceptorAdapter { @Override