From 93268fc1c008c232b80df5cc80af370570a0d2fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 一月 2024 14:48:41 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java | 2
zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml | 2
zy-asrs-flow/src/config/setting.js | 3 +
zy-asrs-flow/.env | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java | 10 +++++
zy-asrs-flow/src/pages/Admin.jsx | 10 ++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/WebConfig.java | 37 ++++++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java | 6 +-
8 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-flow/.env b/zy-asrs-flow/.env
index 2aaff2b..c8ca956 100644
--- a/zy-asrs-flow/.env
+++ b/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
diff --git a/zy-asrs-flow/src/config/setting.js b/zy-asrs-flow/src/config/setting.js
index ff7d608..b9d586c 100644
--- a/zy-asrs-flow/src/config/setting.js
+++ b/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';
diff --git a/zy-asrs-flow/src/pages/Admin.jsx b/zy-asrs-flow/src/pages/Admin.jsx
index 65c9fa2..6564eac 100644
--- a/zy-asrs-flow/src/pages/Admin.jsx
+++ b/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
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/WebConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/WebConfig.java
new file mode 100644
index 0000000..a740afc
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/WebConfig.java
@@ -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;
+ }
+ };
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
index b2e6d2c..5b15f62 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
+++ b/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",
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java
index 9892fca..fafb7d5 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java
+++ b/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(
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
index 5c21a4f..0398a98 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
+++ b/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", "*");
+ }
+
}
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
index a2bd92c..76ac274 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
+++ b/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
--
Gitblit v1.9.1