From 2a79c502bae7356fed8c38b5207a101e607c1203 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 17 四月 2024 10:11:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
/dev/null | 47 ---------------
hangzhoumesParent/gateway/src/main/resources/application.yml | 8 +-
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 1
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 13 +++-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 13 +++-
hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java | 26 ++------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 13 +++-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 2
8 files changed, 38 insertions(+), 85 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java
deleted file mode 100644
index a5ad9af..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mes.common.config;
-
-import com.mes.common.interceptor.JwtInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
- @Resource
- private JwtInterceptor jwtInterceptor;
-
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(jwtInterceptor)
- .addPathPatterns("/**")
- .excludePathPatterns("/user/login",
- "/user/register",
- "/swagger-resources/**"
- , "/webjars/**"
- , "/v2/**"
- , "/swagger-ui.html/**"
- , "/swagger-ui.html#/**");
- }
-
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- // 璁剧疆鍏佽璺ㄥ煙鐨勮矾寰�
- registry.addMapping("/**")
- // 璁剧疆鍏佽璺ㄥ煙璇锋眰鐨勫煙鍚�
-// .allowedOriginPatterns("*")
- // 鏄惁鍏佽cookie
- .allowCredentials(true)
- // 璁剧疆鍏佽鐨勮姹傛柟寮�
- .allowedMethods("GET", "POST", "DELETE", "PUT")
- // 璁剧疆鍏佽鐨刪eader灞炴��
- .allowedHeaders("*")
- // 璺ㄥ煙鍏佽鏃堕棿
- .maxAge(3600);
- }
-
-}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java
deleted file mode 100644
index 7b3acd4..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mes.common.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @Author : zhoush
- * @Date: 2024/3/25 14:13
- * @Description:
- */
-@Configuration
-public class MyCorsConfig {
-
- @Bean
- public WebMvcConfigurer corsConfigurer() {
- return new WebMvcConfigurer() {
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**");
- }
- };
- }
-}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
deleted file mode 100644
index b95b9e1..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mes.common.interceptor;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Component
-public class JwtInterceptor implements HandlerInterceptor {
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- //return HandlerInterceptor.super.preHandle(request, response, handler);
- /*String token=request.getHeader("token");
- if(!(handler instanceof HandlerMethod)){
- return true;
- }
-
- if(StrUtil.isBlank(token)){
- throw new ServiceException(Constants.Code_401,"鏃爐oken,閲嶆柊鐧婚檰");
- }
- String userId;
- try{
- userId = JWT.decode(token).getAudience().get(0);
- }catch (Exception e){
- throw new ServiceException(Constants.Code_500,"token鏍煎紡閿欒");
- }
-
- UserDTO getUserDTO = cacheUtil.getCacheData(userId);
-
- if(getUserDTO != null && !getUserDTO.getToken().equals(token)){
- throw new ServiceException(Constants.Code_600,"鐢ㄦ埛鍦ㄥ叾浠栦綅缃櫥闄�");
- }
-
-
- String password=userService.getUserByID(userId).toLowerCase();
- //鐢ㄦ埛瀵嗙爜鍔犵楠岃瘉
- JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(password)).build();
- try {
- jwtVerifier.verify(token);
- } catch (JWTVerificationException e) {
- throw new ServiceException(Constants.Code_401,"token楠岃瘉澶辫触,璇烽噸鏂扮櫥闄�");
- }*/
- return true;
- }
-
-}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index aa99f77..326e4d0 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -16,7 +16,6 @@
* @since 2024-04-11
*/
@RestController
-@CrossOrigin
@RequestMapping("/userinfo")
public class SysUserController {
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/MyCorsConfig.java b/hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
similarity index 63%
rename from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/MyCorsConfig.java
rename to hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
index 521c147..f7f9f8d 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/MyCorsConfig.java
+++ b/hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
@@ -1,12 +1,10 @@
-package com.mes.common.config;
+package com.mes.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.reactive.CorsWebFilter;
import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @Author : zhoush
@@ -15,32 +13,22 @@
*/
@Configuration
public class MyCorsConfig {
-
@Bean
- public WebMvcConfigurer corsConfigurer() {
- return new WebMvcConfigurer() {
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**");
- }
- };
- }
+ public CorsWebFilter corsFilter() {
- @Bean
- public CorsWebFilter corsWebFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-
CorsConfiguration corsConfiguration = new CorsConfiguration();
-
- //1銆侀厤缃法鍩�
+ //鍏佽鍝簺澶磋法鍩�
corsConfiguration.addAllowedHeader("*");
+ // 鍏佽鍝簺鏂瑰紡璺ㄥ煙 get post delete 绛夋柟寮�
corsConfiguration.addAllowedMethod("*");
+ //鍏佽鍝簺璇锋眰鏉ユ簮璺ㄥ煙 * 浠绘剰鏉ユ簮
corsConfiguration.addAllowedOrigin("*");
+ // 鏄惁鍏佽鎼哄甫cooker璺ㄥ煙
corsConfiguration.setAllowCredentials(true);
-
+ //娉ㄥ唽璺ㄨ秺閰嶇疆 /**閰嶇疆璇锋眰璺緞
source.registerCorsConfiguration("/**", corsConfiguration);
return new CorsWebFilter(source);
}
-
}
diff --git a/hangzhoumesParent/gateway/src/main/resources/application.yml b/hangzhoumesParent/gateway/src/main/resources/application.yml
index 8776a14..1452d31 100644
--- a/hangzhoumesParent/gateway/src/main/resources/application.yml
+++ b/hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -20,28 +20,28 @@
- StripPrefix=2
- id: cacheVerticalGlass
- uri: http://127.0.0.1:8082
+ uri: lb://cacheVerticalGlass
predicates:
- Path=/api/cacheVerticalGlass/**
filters:
- StripPrefix=2
- id: loadGlass
- uri: http://127.0.0.1:8083
+ uri: lb://loadGlass
predicates:
- Path=/api/loadGlass/**
filters:
- StripPrefix=2
- id: temperingGlass
- uri: http://127.0.0.1:8084
+ uri: lb://temperingGlass
predicates:
- Path=/api/temperingGlass/**
filters:
- StripPrefix=2
- id: unLoadGlass
- uri: http://127.0.0.1:8085
+ uri: lb://unLoadGlass
predicates:
- Path=/api/unLoadGlass/**
filters:
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index ab287dc..5e0bd43 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -2,10 +2,15 @@
port: 8081
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
+ dynamic:
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
+ datasource:
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 29a0efb..f1da52d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,10 +3,15 @@
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
+ dynamic:
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
+ datasource:
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index bf3f011..a84c58e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,10 +2,15 @@
port: 8084
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
+ dynamic:
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
+ datasource:
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index a11fc50..bea69f9 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -12,8 +12,6 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
-
-
cloud:
nacos:
discovery:
--
Gitblit v1.8.0