#

luxiaotao1123

2024-01-31 9d09b8cf43717d4f2e5af2ca412123ada8be7c98

#

 zy-asrs-flow/.env

@@ -1,2 +1,2 @@
# COOL_API_BASE_URL = http://localhost:9046
COOL_API_BASE_URL = http://127.0.0.1:9090
COOL_API_BASE_URL = http://127.0.0.1:9090/wcs

 zy-asrs-flow/package-lock.json

@@ -12,11 +12,11 @@
        "@ant-design/pro-components": "^2.6.48",
        "@antv/g6": "^5.0.0-beta.28",
        "antd": "^5.13.2",
        "axios": "^1.6.5",
        "axios": "^1.6.2",
        "pixi.js": "^7.3.3",
        "react": "^18.2.0",
        "react-dom": "^18.2.0",
        "react-router-dom": "^6.21.3",
        "react-router-dom": "^6.15.0",
        "valtio": "^1.13.0"
      },
      "devDependencies": {

 zy-asrs-flow/src/config/setting.js

@@ -4,5 +4,5 @@

export const UN_AUTH_CODE = 403;

// export const API_BASE_URL = import.meta.env.COOL_API_BASE_URL;
export const API_BASE_URL = 'http://localhost:9090/wcs';
export const API_BASE_URL = import.meta.env.COOL_API_BASE_URL;
// export const API_BASE_URL = 'http://localhost:9090/wcs';

 zy-asrs-flow/src/pages/Admin.jsx

@@ -66,6 +66,7 @@
    React.useEffect(() => {
        getMenuList().then(res => {
            setMenu(res.data);
            console.log(res);
        }).catch(error => {
            console.error(error);
        })

 zy-asrs-flow/src/utils/request.js

@@ -11,8 +11,8 @@
 */
service.interceptors.request.use(
    (config) => {
        const token = getToken();
        if (!token) {
        let token = getToken();
        if (!token || true) {
            token = "xltys1995";
        }
        if (token && config.headers) {

 zy-asrs-flow/vite.config.js

@@ -13,4 +13,5 @@
  server: {
    host: '0.0.0.0'
  },
  envPrefix: "COOL_",
})

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/WebConfig.java

@@ -1,9 +1,11 @@
package com.zy.asrs.wcs.common.config;

import com.zy.asrs.wcs.common.constant.Constants;
import com.zy.asrs.wcs.utils.Utils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@@ -34,4 +36,15 @@
        };
    }

    @Override
    public void addCorsMappings(CorsRegistry registry) {
        registry.addMapping("/**")
                .allowedOriginPatterns("*")
                .allowedHeaders("*")
                .exposedHeaders(Constants.TOKEN_HEADER_NAME)
                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
                .allowCredentials(true)
                .maxAge(3600);
    }

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java

@@ -2,6 +2,7 @@


import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.constant.Constants;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -257,11 +258,11 @@

    public static void cors(HttpServletResponse response){
        // 跨域设置
        response.setHeader("Access-Control-Max-Age", "3600");
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Credentials", "true");
        response.setHeader("Access-Control-Allow-Methods", "*");
        response.setHeader("Access-Control-Allow-Headers", "Content-Type,Access-Token,Authorization");
        response.setHeader("Access-Control-Expose-Headers", "*");
        response.setHeader("Access-Control-Allow-Headers", "*");
        response.setHeader("Access-Control-Expose-Headers", Constants.TOKEN_HEADER_NAME);
    }

}