#

luxiaotao1123

2024-01-31 93268fc1c008c232b80df5cc80af370570a0d2fe

#

 zy-asrs-flow/.env

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

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

@@ -4,4 +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 = import.meta.env.COOL_API_BASE_URL;
export const API_BASE_URL = 'http://localhost:9090/wcs';

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

@@ -14,7 +14,7 @@
    Input,
    theme,
} from 'antd';
import React, { useState } from 'react';
import React from 'react';
import defaultProps from './_defaultProps';
import logo from '@/assets/logo.png';
import G6 from './G6';
@@ -61,9 +61,9 @@
        return <div />;
    }

    const [menu, setMenu] = useState([]);
    const [menu, setMenu] = React.useState([]);

    useEffect(() => {
    React.useEffect(() => {
        getMenuList().then(res => {
            setMenu(res.data);
        }).catch(error => {
@@ -72,12 +72,12 @@
    }, []);


    const [settings, setSetting] = useState({
    const [settings, setSetting] = React.useState({
        fixSiderbar: true,
        layout: 'side', // mix top
        splitMenus: true,
    });
    const [pathname, setPathname] = useState('/list/sub-page/sub-sub-page1');
    const [pathname, setPathname] = React.useState('/list/sub-page/sub-sub-page1');

    return (
        <div

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

New file
@@ -0,0 +1,37 @@
package com.zy.asrs.wcs.common.config;

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.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Created by vincent on 2019-06-13
 */
@Configuration
public class WebConfig implements WebMvcConfigurer {

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
        registry.addInterceptor(getAsyncHandlerInterceptor())
                .addPathPatterns("/**")
                ;
    }

    @Bean
    public AsyncHandlerInterceptor getAsyncHandlerInterceptor() {
        return new AsyncHandlerInterceptor(){
            @Override
            public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
                Utils.cors(response);
                return true;
            }
        };
    }

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java

@@ -32,8 +32,8 @@
public class SecurityConfig extends WebSecurityConfigurerAdapter {

    public static final String[] FILTER_PATH = new String[]{
            "/api/**",
            "/test/**",
            "/rpc/**",
            "/api/login",
            "/druid/**",
            "/swagger-ui.html",

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java

@@ -22,13 +22,13 @@
    private Long roleId;

    @ApiModelProperty(value= "")
    private Long meunId;
    private Long menuId;

    public RoleMenu() {}

    public RoleMenu(Long roleId,Long meunId) {
    public RoleMenu(Long roleId,Long menuId) {
        this.roleId = roleId;
        this.meunId = meunId;
        this.menuId = menuId;
    }

//    RoleMenu roleMenu = new RoleMenu(

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

@@ -3,6 +3,7 @@

import com.zy.asrs.framework.common.Cools;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -254,4 +255,13 @@
        }
    }

    public static void cors(HttpServletResponse response){
        // 跨域设置
        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", "*");
    }

}

 zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml

@@ -9,7 +9,7 @@
            select menu_id from sys_role_menu
            where role_id in (
                select sur.role_id from sys_user_role sur
                left join sys_role sr on sur.role_id = sr.role_id
                left join sys_role sr on sur.role_id = sr.id
                where 1=1
                and sur.user_id = #{userId}
                and sr.deleted = 0