Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/.env.production

 #生产环境
 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

base-manager-ui/admin/.env.test

 #测试环境
 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

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: {

base-manager-ui/admin/src/pages/basicset/site/website.vue

@@ -289,6 +289,8 @@ export default {
     async getSiteList(info = {}) {
       this.loading = true;
       let res = await getSiteList(info);
+      this.loading = false;
+      if (res.data.code === 1) {
         let { data, dict } = res.data.data;
         data.forEach((v) => {
           v.modelIds = v.modelIds.split(",");
@@ -300,12 +302,14 @@ export default {
           );
         });
         this.siteData = data;
-      this.loading = false;
+      }
     },
     // 获取站点信息
     async getSiteInfo() {
       this.loading = true;
       let res = await siteInfo({ id: this.siteId });
+      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(
@@ -315,7 +319,7 @@ export default {
           []
         );
         this.siteData = [data];
-      this.loading = false;
+      }
     },
 
     // 删除

portal-manager-ui/admin/.env.production

 # 生产环境配置
 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

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