BF-202308171519\Administrator 2 lat temu
rodzic
commit
6932b6418c

+ 3 - 7
kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/config/AdminFeignClientConfiguration.java

@@ -1,16 +1,12 @@
 package com.kxs.system.api.feign.config;
 package com.kxs.system.api.feign.config;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
-import com.kxs.common.core.constant.SecurityConstants;
-import com.kxs.common.core.constant.ServiceNameConstants;
-import com.kxs.common.core.util.WebUtils;
 import com.kxs.system.api.feign.*;
 import com.kxs.system.api.feign.*;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
-import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.reactive.function.client.ClientRequest;
 import org.springframework.web.reactive.function.client.ClientRequest;
@@ -18,8 +14,6 @@ import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.service.invoker.HttpServiceProxyFactory;
 import org.springframework.web.service.invoker.HttpServiceProxyFactory;
 
 
-import java.util.Optional;
-
 /**
 /**
  * <p>
  * <p>
  * 当前服务的webClient配置 服务下的远程调用统一在此配置
  * 当前服务的webClient配置 服务下的远程调用统一在此配置
@@ -32,6 +26,8 @@ import java.util.Optional;
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class AdminFeignClientConfiguration {
 public class AdminFeignClientConfiguration {
 
 
+	private static final String ADMIN_SERVICE = "http://localhost:8080";
+
 	@Bean
 	@Bean
 	public WebClient oauthRequestInterceptor() {
 	public WebClient oauthRequestInterceptor() {
 
 
@@ -53,7 +49,7 @@ public class AdminFeignClientConfiguration {
 				}
 				}
 				return next.exchange(filtered.build());
 				return next.exchange(filtered.build());
 			})
 			})
-			.baseUrl(ServiceNameConstants.ADMIN_SERVICE)
+			.baseUrl(ADMIN_SERVICE)
 			.build();
 			.build();
 	}
 	}
 
 

+ 3 - 0
kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysRoleMenu.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 
 
+import java.io.Serial;
+
 /**
 /**
  * <p>
  * <p>
  * 角色菜单表
  * 角色菜单表
@@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class SysRoleMenu extends Model<SysRoleMenu> {
 public class SysRoleMenu extends Model<SysRoleMenu> {
 
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 
 	/**
 	/**

+ 11 - 0
kxs-system/kxs-system-biz/src/main/resources/application-dev.yml

@@ -6,10 +6,21 @@ spring:
       repositories:
       repositories:
         enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度\
         enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度\
   datasource:
   datasource:
+#    query-ds-sql: 'select * from sys_datasource_conf where del_flag = 0' #动态数据源配置表
     type: com.zaxxer.hikari.HikariDataSource
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     username: root
     password: root
     password: root
     url: jdbc:mysql://localhost:3306/kxs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     url: jdbc:mysql://localhost:3306/kxs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #hikari数据源特性配置
+    hikari:
+      maximum-pool-size: 50 #最大连接数,默认值10.
+      minimum-idle: 20 #最小空闲连接,默认值10.
+      connection-timeout: 60000 #连接超时时间(毫秒),默认值30秒.
+      #空闲连接超时时间,默认值600000(10分钟),只有空闲连接数大于最大连接数且空闲时间超过该值,才会被释放
+      #如果大于等于 max-lifetime 且 max-lifetime>0,则会被重置为0.
+      idle-timeout: 600000
+      max-lifetime: 3000000 #连接最大存活时间,默认值30分钟.设置应该比mysql设置的超时时间短
+      connection-test-query: select 1 #连接测试查询