。。

.gitignore

@@ -17,7 +17,7 @@ data/
 target/
 
 ### IntelliJ IDEA ###
-.idea
+.idea/*
 *.iws
 *.iml
 *.ipr

.idea/misc.xml

@@ -16,7 +16,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

lxq-admin/src/main/java/com/lxq/admin/biz/config/SysLogConfiguration.java

@@ -0,0 +1,27 @@
+package com.lxq.admin.biz.config;
+
+import com.lxq.admin.biz.event.SysLogListener;
+import com.lxq.common.log.config.LxqLogProperties;
+import com.lxq.system.biz.service.SysLogService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 验证码路由器 webflux响应式编程
+ *
+ * @author 没秃顶的码农
+ * @date 2023/11/04
+ */
+@Slf4j
+@Configuration(proxyBeanMethods = false)
+@RequiredArgsConstructor
+public class SysLogConfiguration {
+
+	@Bean
+	public SysLogListener sysLogListener(SysLogService sysLogService, LxqLogProperties logProperties) {
+		return new SysLogListener(sysLogService, logProperties);
+	}
+
+}

lxq-admin/src/main/java/com/lxq/admin/biz/event/SysLogListener.java

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ser.FilterProvider;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 import com.lxq.common.core.jackson.SkyJavaTimeModule;
-import com.lxq.common.log.config.SkyLogProperties;
+import com.lxq.common.log.config.LxqLogProperties;
 import com.lxq.common.log.event.SysLogEvent;
 import com.lxq.common.log.event.SysLogEventSource;
 import com.lxq.system.biz.model.SysLog;
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
 
 import java.util.Objects;
 
@@ -38,7 +39,7 @@ public class SysLogListener implements InitializingBean {
 
 	private final SysLogService sysLogService;
 
-	private final SkyLogProperties logProperties;
+	private final LxqLogProperties logProperties;
 
 	@SneakyThrows
 	@Async

lxq-admin/src/main/java/com/lxq/admin/biz/security/LxqUserDetailsServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 

lxq-admin/src/main/resources/application.yml

@@ -0,0 +1,8 @@
+server:
+  port: 8080
+
+spring:
+  application:
+    name: @artifactId@
+
+

lxq-common/lxq-common-core/pom.xml

@@ -15,8 +15,8 @@
     <description>lxq 公共工具类核心包</description>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

lxq-common/lxq-common-core/src/main/java/com/lxq/common/core/config/RedisTemplateConfiguration.java

@@ -4,7 +4,7 @@ package com.lxq.common.core.config;
 import cn.hutool.core.util.StrUtil;
 import lombok.AllArgsConstructor;
 import org.redisson.Redisson;
-import org.redisson.biz.RedissonClient;
+import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;

lxq-common/lxq-common-core/src/main/resources/logback-spring.xml

@@ -106,9 +106,6 @@
 			<level>INFO</level>
 		</filter>
 
-		<!-- 屏蔽transfer模块 -->
-		<logger name="com.lxq.transfer.biz" level="OFF"/>
-
 	</appender>
 	<!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
 	<shutdownHook class="ch.qos.logback.core.hook.DefaultShutdownHook"/>

lxq-common/lxq-common-excel/pom.xml

@@ -18,8 +18,8 @@
         </developer>
     </developers>
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <easyexcel.version>3.3.2</easyexcel.version>
         <mica.version>3.0.0</mica.version>

lxq-common/lxq-common-excel/src/main/java/com/lxq/common/excel/ResponseExcelAutoConfiguration.java

@@ -5,7 +5,6 @@ import com.lxq.common.excel.aop.RequestExcelArgumentResolver;
 import com.lxq.common.excel.aop.ResponseExcelReturnValueHandler;
 import com.lxq.common.excel.config.ExcelConfigProperties;
 import com.lxq.common.excel.config.FileProperties;
-import com.lxq.common.excel.config.ExcelSystemFeignClientConfiguration;
 import com.lxq.common.excel.processor.NameProcessor;
 import com.lxq.common.excel.processor.NameSpelExpressionProcessor;
 import jakarta.annotation.PostConstruct;
@@ -30,7 +29,7 @@ import java.util.List;
  */
 @AutoConfiguration
 @RequiredArgsConstructor
-@Import({ExcelHandlerConfiguration.class, ExcelSystemFeignClientConfiguration.class})
+@Import({ExcelHandlerConfiguration.class})
 @EnableConfigurationProperties({ExcelConfigProperties.class, FileProperties.class})
 public class ResponseExcelAutoConfiguration {
 

lxq-common/lxq-common-excel/src/main/java/com/lxq/common/excel/config/ExcelSystemFeignClientConfiguration.java

@@ -1,69 +0,0 @@
-package com.lxq.common.excel.config;
-
-import cn.hutool.core.text.CharSequenceUtil;
-import com.lxq.common.excel.http.RemoteSysService;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cloud.client.loadbalancer.reactive.ReactorLoadBalancerExchangeFilterFunction;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.reactive.function.client.ClientRequest;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.support.WebClientAdapter;
-import org.springframework.web.service.invoker.HttpServiceProxyFactory;
-
-
-/**
- * 系统假装客户端配置
- *
- * @author 没秃顶的码农
- * @date 2024-07-26
- */
-@Configuration
-@RequiredArgsConstructor
-public class ExcelSystemFeignClientConfiguration {
-
-	/**
-	 * 负载均衡器
-	 */
-	private final ReactorLoadBalancerExchangeFilterFunction reactorLoadBalancerExchangeFilterFunction;
-
-	private static final String SERVICE_NAME = ServiceNameConstants.CLIENT_NAME + ServiceNameConstants.SYSTEM_SERVICE;
-
-	@Bean("ExcelSystemFeignClient")
-	public WebClient oauthRequestInterceptor() {
-
-		return WebClient.builder()
-			// 给请求添加过滤器，添加自定义的认证头
-			.filter((request, next) -> {
-				ClientRequest.Builder filtered = ClientRequest.from(request);
-
-				ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder
-					.getRequestAttributes();
-				// 不是web请求不传递token
-				if (requestAttributes != null) {
-					HttpServletRequest httpServletRequest = requestAttributes.getRequest();
-					String token = httpServletRequest.getHeader(HttpHeaders.AUTHORIZATION);
-					if (!CharSequenceUtil.isBlank(token)) {
-						// 传递token
-						filtered.header(HttpHeaders.AUTHORIZATION, token);
-					}
-				}
-				return next.exchange(filtered.build());
-			}).filter(reactorLoadBalancerExchangeFilterFunction)
-			.baseUrl(SERVICE_NAME)
-			.build();
-	}
-
-
-	@Bean("ExcelRemoteSysService")
-	RemoteSysService remoteSysService(@Qualifier("ExcelSystemFeignClient") WebClient client) {
-		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).blockTimeout(ServiceNameConstants.REQ_TIMEOUT).build();
-		return factory.createClient(RemoteSysService.class);
-	}
-
-}

lxq-common/lxq-common-idempotent/pom.xml

@@ -12,8 +12,8 @@
     <artifactId>lxq-common-idempotent</artifactId>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mica.version>3.0.0</mica.version>
         <redisson.version>3.16.2</redisson.version>

lxq-common/lxq-common-idempotent/src/main/java/com/lxq/common/idempotent/IdempotentAutoConfiguration.java

@@ -7,7 +7,7 @@ import com.lxq.common.idempotent.expression.ExpressionResolver;
 import com.lxq.common.idempotent.expression.KeyResolver;
 import lombok.AllArgsConstructor;
 import org.redisson.Redisson;
-import org.redisson.biz.RedissonClient;
+import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

lxq-common/lxq-common-idempotent/src/main/java/com/lxq/common/idempotent/aspect/IdempotentAspect.java

@@ -11,8 +11,8 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.redisson.biz.RMapCache;
-import org.redisson.biz.RedissonClient;
+import org.redisson.api.RMapCache;
+import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

lxq-common/lxq-common-log/pom.xml

@@ -15,8 +15,8 @@
     <description>lxq 日志服务</description>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/LogAutoConfiguration.java

@@ -1,9 +1,7 @@
 package com.lxq.common.log;
 
 import com.lxq.common.log.aspect.SysLogAspect;
-import com.lxq.common.log.config.SkyLogProperties;
-import com.lxq.common.log.event.SysLogListener;
-import com.lxq.system.biz.feign.RemoteLogService;
+import com.lxq.common.log.config.LxqLogProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -18,14 +16,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @EnableAsync
 @Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(SkyLogProperties.class)
+@EnableConfigurationProperties(LxqLogProperties.class)
 @ConditionalOnProperty(value = "security.log.enabled", matchIfMissing = true)
 public class LogAutoConfiguration {
 
-	@Bean
-	public SysLogListener sysLogListener(SkyLogProperties logProperties, RemoteLogService remoteLogService) {
-		return new SysLogListener(remoteLogService, logProperties);
-	}
 
 	@Bean
 	public SysLogAspect sysLogAspect() {

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/config/SkyLogProperties.java → lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/config/LxqLogProperties.java

@@ -15,8 +15,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ConfigurationProperties(SkyLogProperties.PREFIX)
-public class SkyLogProperties {
+@ConfigurationProperties(LxqLogProperties.PREFIX)
+public class LxqLogProperties {
 
 	public static final String PREFIX = "security.log";
 

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/util/SysLogUtils.java

@@ -7,7 +7,7 @@ import cn.hutool.extra.servlet.JakartaServletUtil;
 import cn.hutool.http.HttpUtil;
 import com.lxq.common.core.constant.SecurityConstants;
 import com.lxq.common.core.util.SpringContextHolder;
-import com.lxq.common.log.config.SkyLogProperties;
+import com.lxq.common.log.config.LxqLogProperties;
 import com.lxq.common.log.event.SysLogEventSource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.experimental.UtilityClass;
@@ -50,7 +50,7 @@ public class SysLogUtils {
 		sysLog.setServiceId(getClientId());
 
 		// get 参数脱敏
-		SkyLogProperties logProperties = SpringContextHolder.getBean(SkyLogProperties.class);
+		LxqLogProperties logProperties = SpringContextHolder.getBean(LxqLogProperties.class);
 		HashMap<String, String[]> requestMap = new HashMap<>(request.getParameterMap());
 		Map<String, String[]> paramsMap = MapUtil.removeAny(requestMap,
 				ArrayUtil.toArray(logProperties.getExcludeFields(), String.class));

lxq-common/lxq-common-log/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -2,8 +2,8 @@
   "groups": [
     {
       "name": "security.log",
-      "type": "com.lxq.common.log.config.SkyLogProperties",
-      "sourceType": "com.lxq.common.log.config.SkyLogProperties"
+      "type": "com.lxq.common.log.config.LxqLogProperties",
+      "sourceType": "com.lxq.common.log.config.LxqLogProperties"
     }
   ],
   "properties": [
@@ -11,19 +11,19 @@
       "name": "security.log.enabled",
       "type": "java.lang.Boolean",
       "description": "开启日志记录",
-      "sourceType": "com.lxq.common.log.config.SkyLogProperties"
+      "sourceType": "com.lxq.common.log.config.LxqLogProperties"
     },
     {
       "name": "security.log.exclude-fields",
       "type": "java.util.List<java.lang.String>",
       "description": "放行字段，password,mobile,idcard,phone",
-      "sourceType": "com.lxq.common.log.config.SkyLogProperties"
+      "sourceType": "com.lxq.common.log.config.LxqLogProperties"
     },
     {
       "name": "security.log.max-length",
       "type": "java.lang.Integer",
       "description": "请求报文最大存储长度",
-      "sourceType": "com.lxq.common.log.config.SkyLogProperties"
+      "sourceType": "com.lxq.common.log.config.LxqLogProperties"
     }
   ],
   "hints": []

lxq-common/lxq-common-mq/pom.xml

@@ -13,8 +13,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>

lxq-common/lxq-common-mybatis/pom.xml

@@ -13,8 +13,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

lxq-common/lxq-common-oss/pom.xml

@@ -13,8 +13,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

lxq-common/lxq-common-pay/pom.xml

@@ -13,8 +13,8 @@
     <description>三方支付插件</description>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>

lxq-common/lxq-common-security/pom.xml

@@ -16,8 +16,8 @@
 
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

lxq-common/lxq-common-swagger/pom.xml

@@ -14,8 +14,8 @@
     <description>lxq 接口文档</description>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

lxq-common/lxq-common-swagger/src/main/java/com/lxq/common/swagger/config/OpenAPIMetadataRegister.java

@@ -3,7 +3,6 @@ package com.lxq.common.swagger.config;
 import lombok.Setter;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
@@ -33,10 +32,10 @@ public class OpenAPIMetadataRegister implements InitializingBean, ApplicationCon
 	 */
 	@Override
 	public void afterPropertiesSet() {
-		// 获取ServiceInstance实例
-		ServiceInstance serviceInstance = applicationContext.getBean(ServiceInstance.class);
-		// 设置元数据
-		serviceInstance.getMetadata().put("spring-doc", path);
+//		// 获取ServiceInstance实例
+//		ServiceInstance serviceInstance = applicationContext.getBean(ServiceInstance.class);
+//		// 设置元数据
+//		serviceInstance.getMetadata().put("spring-doc", path);
 	}
 
 }

lxq-common/lxq-common-swagger/src/main/resources/openapi-config.yaml

@@ -0,0 +1,7 @@
+# swagger 配置
+swagger:
+  enabled: true
+  title: lxq Swagger API
+  gateway: http://${GATEWAY-HOST:127.0.0.1}:${GATEWAY-PORT:9999}
+  token-url: ${swagger.gateway}/auth/oauth2/token
+  scope: server

pom.xml

@@ -12,8 +12,8 @@
     <properties>
         <spring-boot.version>3.5.9</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <captcha.version>2.2.3</captcha.version>
         <jasypt.version>3.0.5</jasypt.version>
         <jaxb.version>2.3.5</jaxb.version>