Commit 31d06eef79bc91b1cf63bca80463563adae4117b

Authored by 王彪总
1 parent 1d418ca8

fix(config): 更新配置文件和修复分页计算问题

- 在.gitignore中添加.mcp.json文件忽略
- 更新application-dev.yml中的Redis和数据库连接配置,并禁用Eureka客户端
- 修复CosUploadTemplate、FtpUploadTemplate和OssUploadTemplate中的空文件上传验证
- 更新java110.properties中的映射路径配置以支持通配符
- 修复社区服务中分页计算逻辑,添加默认行数和零值检查
- 移除系统用户查询中的管理员权限验证
- 在logback配置文件中添加请求响应日志和API异常日志输出
- 修复Maven打包阶段配置,将解包阶段从generate-resources改为package
- 添加hibernate-validator依赖并排除javafx.base冲突
- 扩展文件上传组件以支持multipart文件上传和IP地址获取功能
java110-core/src/main/java/com/java110/core/annotation/Java110CmdDiscoveryRegistrar.java
... ... @@ -2,6 +2,8 @@ package com.java110.core.annotation;
2 2  
3 3 import com.java110.dto.CmdListenerDto;
4 4 import com.java110.utils.util.Assert;
  5 +import org.slf4j.Logger;
  6 +import com.java110.core.log.LoggerFactory;
5 7 import org.springframework.beans.factory.BeanClassLoaderAware;
6 8 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
7 9 import org.springframework.beans.factory.config.BeanDefinition;
... ... @@ -29,6 +31,8 @@ import java.util.Set;
29 31 */
30 32 public class Java110CmdDiscoveryRegistrar implements ImportBeanDefinitionRegistrar,ResourceLoaderAware, BeanClassLoaderAware {
31 33  
  34 + private static Logger logger = LoggerFactory.getLogger(Java110CmdDiscoveryRegistrar.class);
  35 +
32 36 private ResourceLoader resourceLoader;
33 37  
34 38 private ClassLoader classLoader;
... ... @@ -42,11 +46,13 @@ public class Java110CmdDiscoveryRegistrar implements ImportBeanDefinitionRegistr
42 46 try {
43 47 registerListener(importingClassMetadata,registry);
44 48 } catch (NoSuchMethodException e) {
45   - e.printStackTrace();
  49 + logger.error("Java110CmdDiscovery 注册失败: NoSuchMethodException", e);
46 50 } catch (InvocationTargetException e) {
47   - e.printStackTrace();
  51 + logger.error("Java110CmdDiscovery 注册失败: InvocationTargetException", e);
48 52 } catch (IllegalAccessException e) {
49   - e.printStackTrace();
  53 + logger.error("Java110CmdDiscovery 注册失败: IllegalAccessException", e);
  54 + } catch (Exception e) {
  55 + logger.error("Java110CmdDiscovery 注册失败: {}", e.getMessage(), e);
50 56 }
51 57 }
52 58  
... ... @@ -85,9 +91,13 @@ public class Java110CmdDiscoveryRegistrar implements ImportBeanDefinitionRegistr
85 91 scanner.addIncludeFilter(annotationTypeFilter);
86 92 basePackages = getBasePackages(metadata);
87 93  
  94 + Method method = cmdPublishClass.getMethod("addListener", CmdListenerDto.class);
  95 + int totalCount = 0;
  96 +
88 97 for (String basePackage : basePackages) {
89 98 Set<BeanDefinition> candidateComponents = scanner
90 99 .findCandidateComponents(basePackage);
  100 + int packageCount = 0;
91 101 for (BeanDefinition candidateComponent : candidateComponents) {
92 102 if (candidateComponent instanceof AnnotatedBeanDefinition) {
93 103 // verify annotated class is an interface
... ... @@ -105,11 +115,18 @@ public class Java110CmdDiscoveryRegistrar implements ImportBeanDefinitionRegistr
105 115  
106 116 /*BeanDefinitionHolder definitionHolder = new BeanDefinitionHolder(beanDefinition, beanName);
107 117 BeanDefinitionReaderUtils.registerBeanDefinition(definitionHolder, registry);*/
108   - Method method = cmdPublishClass.getMethod("addListener", CmdListenerDto.class);
109 118 method.invoke(null,new CmdListenerDto(beanName,serviceCode));
  119 + packageCount++;
110 120 }
111 121 }
  122 + if (packageCount > 0) {
  123 + logger.info("Java110CmdDiscovery 扫描包[{}]: 注册 {} 个Cmd服务", basePackage, packageCount);
  124 + } else {
  125 + logger.warn("Java110CmdDiscovery 扫描包[{}]: 未发现任何Cmd服务", basePackage);
  126 + }
  127 + totalCount += packageCount;
112 128 }
  129 + logger.info("Java110CmdDiscovery 启动完成: 共扫描 {} 个包, 注册 {} 个Cmd服务", basePackages.size(), totalCount);
113 130 }
114 131  
115 132 protected ClassPathScanningCandidateComponentProvider getScanner() {
... ...
java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java
... ... @@ -52,6 +52,30 @@ public class ServiceCmdEventPublishing {
52 52 }
53 53  
54 54 /**
  55 + * 从Spring容器中直接扫描@Java110Cmd注解的Bean并注册为Cmd监听器
  56 + * 作为Java110CmdDiscoveryRegistrar的备用方案
  57 + */
  58 + public static void registerFromSpringContext() {
  59 + try {
  60 + Map<String, Object> cmdBeans = ApplicationContextFactory.getApplicationContext()
  61 + .getBeansWithAnnotation(com.java110.core.annotation.Java110Cmd.class);
  62 + for (Map.Entry<String, Object> entry : cmdBeans.entrySet()) {
  63 + String beanName = entry.getKey();
  64 + Object bean = entry.getValue();
  65 + com.java110.core.annotation.Java110Cmd annotation = bean.getClass()
  66 + .getAnnotation(com.java110.core.annotation.Java110Cmd.class);
  67 + if (annotation != null) {
  68 + CmdListenerDto dto = new CmdListenerDto(beanName, annotation.serviceCode());
  69 + listeners.add(dto);
  70 + }
  71 + }
  72 + logger.info("ServiceCmdEventPublishing 从Spring容器注册: {} 个Cmd服务", cmdBeans.size());
  73 + } catch (Exception e) {
  74 + logger.error("ServiceCmdEventPublishing 从Spring容器注册失败", e);
  75 + }
  76 + }
  77 +
  78 + /**
55 79 * 获取侦听(全部侦听)
56 80 *
57 81 * @return
... ... @@ -71,17 +95,20 @@ public class ServiceCmdEventPublishing {
71 95  
72 96 Assert.hasLength(serviceCode, "获取需要发布的事件处理侦听时,传递事件为空,请检查");
73 97  
74   - String needCachedServiceCode = serviceCode;
  98 + // 去掉前导/,与@Java110Cmd注解中的serviceCode保持一致
  99 + String normalizedCode = serviceCode.startsWith("/") ? serviceCode.substring(1) : serviceCode;
75 100 //先从缓存中获取,为了提升效率
76   - if (cacheListenersMap.containsKey(needCachedServiceCode)) {
77   - return cacheListenersMap.get(needCachedServiceCode);
  101 + if (cacheListenersMap.containsKey(normalizedCode)) {
  102 + return cacheListenersMap.get(normalizedCode);
78 103 }
79 104  
80 105 List<ServiceCmdListener> cmdListeners = new ArrayList<ServiceCmdListener>();
81 106 for (CmdListenerDto listenerBean : getListeners()) {
82 107 //ServiceCmdListener listener = ApplicationContextFactory.getBean(listenerBean.getBeanName(), ServiceCmdListener.class);
83 108 ServiceCmdListener listener = ApplicationContextFactory.getBean(listenerBean.getBeanName(), ServiceCmdListener.class);
84   - if (listenerBean.getServiceCode().equals(serviceCode)) {
  109 + String listenerCode = listenerBean.getServiceCode().startsWith("/")
  110 + ? listenerBean.getServiceCode().substring(1) : listenerBean.getServiceCode();
  111 + if (listenerCode.equals(normalizedCode)) {
85 112 cmdListeners.add(listener);
86 113 }
87 114 }
... ... @@ -92,7 +119,7 @@ public class ServiceCmdEventPublishing {
92 119  
93 120 //将数据放入缓存中
94 121 if (cmdListeners.size() > 0) {
95   - cacheListenersMap.put(needCachedServiceCode, cmdListeners);
  122 + cacheListenersMap.put(normalizedCode, cmdListeners);
96 123 }
97 124 return cmdListeners;
98 125 }
... ...
java110-interface/src/main/resources/logback-prod.xml
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <configuration scan="true" scanPeriod="60 seconds">
3 3  
4   - <!-- 异步日志appender,大幅减少日志I/O对业务的阻塞 -->
5   - <appender name="ASYNC_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
6   - <queueSize>512</queueSize>
7   - <discardingThreshold>0</discardingThreshold>
8   - <neverBlock>true</neverBlock>
9   - <appender-ref ref="STDOUT_FILE"/>
10   - </appender>
  4 + <property name="LOG_PATH" value="./logs"/>
  5 +
  6 + <!-- ========== 实际 Appender(必须在 AsyncAppender 之前定义) ========== -->
11 7  
12 8 <!-- 控制台输出 -->
13 9 <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
... ... @@ -16,116 +12,125 @@
16 12 </encoder>
17 13 </appender>
18 14  
19   - <appender name="ASYNC_INFO" class="ch.qos.logback.classic.AsyncAppender">
20   - <queueSize>512</queueSize>
21   - <discardingThreshold>0</discardingThreshold>
22   - <neverBlock>true</neverBlock>
23   - <appender-ref ref="INFO_FILE"/>
24   - </appender>
25   -
  15 + <!-- INFO 级别文件日志 -->
26 16 <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
27 17 <immediateFlush>false</immediateFlush>
28 18 <File>./logs/info.log</File>
29   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  19 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
30 20 <fileNamePattern>./logs/info-%d{yyyyMMdd}.log.%i</fileNamePattern>
31   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
32   - <maxFileSize>500MB</maxFileSize>
33   - </timeBasedFileNamingAndTriggeringPolicy>
  21 + <maxFileSize>500MB</maxFileSize>
34 22 <maxHistory>2</maxHistory>
  23 + <totalSizeCap>20GB</totalSizeCap>
35 24 </rollingPolicy>
36   - <layout class="ch.qos.logback.classic.PatternLayout">
37   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
38   - </layout>
39   - </appender>
40   -
41   - <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
42   - <queueSize>256</queueSize>
43   - <discardingThreshold>0</discardingThreshold>
44   - <neverBlock>false</neverBlock>
45   - <appender-ref ref="ERROR_FILE"/>
  25 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  26 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  27 + </encoder>
46 28 </appender>
47 29  
  30 + <!-- ERROR 级别文件日志 -->
48 31 <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
49 32 <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
50 33 <level>ERROR</level>
51 34 </filter>
52 35 <File>./logs/error.log</File>
53   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
54   - <fileNamePattern>${LOG_PATH}/error-%d{yyyyMMdd}.log.%i</fileNamePattern>
55   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
56   - <maxFileSize>500MB</maxFileSize>
57   - </timeBasedFileNamingAndTriggeringPolicy>
  36 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
  37 + <fileNamePattern>./logs/error-%d{yyyyMMdd}.log.%i</fileNamePattern>
  38 + <maxFileSize>500MB</maxFileSize>
58 39 <maxHistory>2</maxHistory>
  40 + <totalSizeCap>20GB</totalSizeCap>
59 41 </rollingPolicy>
60   - <layout class="ch.qos.logback.classic.PatternLayout">
61   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
62   - </layout>
  42 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  43 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  44 + </encoder>
63 45 </appender>
64 46  
65 47 <!-- 请求响应日志 -->
66   - <appender name="ASYNC_REQUEST" class="ch.qos.logback.classic.AsyncAppender">
67   - <queueSize>512</queueSize>
68   - <discardingThreshold>0</discardingThreshold>
69   - <neverBlock>true</neverBlock>
70   - <appender-ref ref="REQUEST_FILE"/>
71   - </appender>
72   -
73 48 <appender name="REQUEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
74 49 <immediateFlush>false</immediateFlush>
75 50 <File>./logs/request.log</File>
76   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  51 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
77 52 <fileNamePattern>./logs/request-%d{yyyyMMdd}.log.%i</fileNamePattern>
78   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
79   - <maxFileSize>500MB</maxFileSize>
80   - </timeBasedFileNamingAndTriggeringPolicy>
  53 + <maxFileSize>500MB</maxFileSize>
81 54 <maxHistory>7</maxHistory>
  55 + <totalSizeCap>20GB</totalSizeCap>
82 56 </rollingPolicy>
83   - <layout class="ch.qos.logback.classic.PatternLayout">
84   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
85   - </layout>
86   - </appender>
87   -
88   - <!-- API异常日志单独输出 -->
89   - <appender name="ASYNC_API_ERROR" class="ch.qos.logback.classic.AsyncAppender">
90   - <queueSize>256</queueSize>
91   - <discardingThreshold>0</discardingThreshold>
92   - <neverBlock>false</neverBlock>
93   - <appender-ref ref="API_ERROR_FILE"/>
  57 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  58 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  59 + </encoder>
94 60 </appender>
95 61  
  62 + <!-- API 异常日志 -->
96 63 <appender name="API_ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
97 64 <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
98 65 <level>ERROR</level>
99 66 </filter>
100 67 <File>./logs/api-error.log</File>
101   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  68 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
102 69 <fileNamePattern>./logs/api-error-%d{yyyyMMdd}.log.%i</fileNamePattern>
103   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
104   - <maxFileSize>500MB</maxFileSize>
105   - </timeBasedFileNamingAndTriggeringPolicy>
  70 + <maxFileSize>500MB</maxFileSize>
106 71 <maxHistory>7</maxHistory>
  72 + <totalSizeCap>20GB</totalSizeCap>
107 73 </rollingPolicy>
108   - <layout class="ch.qos.logback.classic.PatternLayout">
109   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
110   - </layout>
  74 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  75 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  76 + </encoder>
111 77 </appender>
112 78  
  79 + <!-- ========== 异步包装 Appender(引用上面已定义的实际 Appender) ========== -->
  80 +
  81 + <appender name="ASYNC_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
  82 + <queueSize>512</queueSize>
  83 + <discardingThreshold>0</discardingThreshold>
  84 + <neverBlock>true</neverBlock>
  85 + <appender-ref ref="STDOUT_FILE"/>
  86 + </appender>
  87 +
  88 + <appender name="ASYNC_INFO" class="ch.qos.logback.classic.AsyncAppender">
  89 + <queueSize>512</queueSize>
  90 + <discardingThreshold>0</discardingThreshold>
  91 + <neverBlock>true</neverBlock>
  92 + <appender-ref ref="INFO_FILE"/>
  93 + </appender>
  94 +
  95 + <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
  96 + <queueSize>256</queueSize>
  97 + <discardingThreshold>0</discardingThreshold>
  98 + <neverBlock>false</neverBlock>
  99 + <appender-ref ref="ERROR_FILE"/>
  100 + </appender>
  101 +
  102 + <appender name="ASYNC_REQUEST" class="ch.qos.logback.classic.AsyncAppender">
  103 + <queueSize>512</queueSize>
  104 + <discardingThreshold>0</discardingThreshold>
  105 + <neverBlock>true</neverBlock>
  106 + <appender-ref ref="REQUEST_FILE"/>
  107 + </appender>
  108 +
  109 + <appender name="ASYNC_API_ERROR" class="ch.qos.logback.classic.AsyncAppender">
  110 + <queueSize>256</queueSize>
  111 + <discardingThreshold>0</discardingThreshold>
  112 + <neverBlock>false</neverBlock>
  113 + <appender-ref ref="API_ERROR_FILE"/>
  114 + </appender>
  115 +
  116 + <!-- Spring 框架日志 -->
113 117 <logger name="org.springframework" level="ERROR">
114 118 <appender-ref ref="ASYNC_STDOUT"/>
115 119 </logger>
116 120  
117   - <!-- MyBatis/Druid SQL日志在生产环境关闭 -->
  121 + <!-- MyBatis/Druid SQL 日志在生产环境关闭 -->
118 122 <logger name="com.apache.ibatis" level="ERROR"/>
119 123 <logger name="org.mybatis" level="ERROR"/>
120 124 <logger name="druid.sql.Statement" level="ERROR"/>
121 125 <logger name="druid.sql.ResultSet" level="ERROR"/>
122 126 <logger name="druid.sql.Connection" level="ERROR"/>
123 127  
124   - <logger name="com.java110" level="INFO">
  128 + <!-- 业务日志 INFO 级别 -->
  129 + <logger name="com.java110" level="INFO" additivity="false">
125 130 <appender-ref ref="ASYNC_STDOUT"/>
126 131 </logger>
127 132  
128   - <!-- API请求/响应/异常日志 -->
  133 + <!-- API 请求/响应/异常日志 -->
129 134 <logger name="com.java110.api.aop" level="INFO" additivity="false">
130 135 <appender-ref ref="ASYNC_STDOUT"/>
131 136 <appender-ref ref="ASYNC_REQUEST"/>
... ... @@ -134,11 +139,8 @@
134 139 </logger>
135 140  
136 141 <logger name="io.shardingsphere" level="ERROR"/>
137   -
138 142 <logger name="org.thymeleaf" level="ERROR"/>
139   -
140 143 <logger name="org.apache.kafka" level="ERROR"/>
141   -
142 144 <logger name="org.quartz" level="ERROR"/>
143 145  
144 146 <root level="INFO">
... ...
java110-interface/src/main/resources/logback.xml
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <configuration scan="true" scanPeriod="60 seconds">
3 3  
4   - <!-- 异步日志appender,减少日志I/O对业务的阻塞 -->
5   - <appender name="ASYNC_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
6   - <queueSize>512</queueSize>
7   - <discardingThreshold>0</discardingThreshold>
8   - <neverBlock>true</neverBlock>
9   - <appender-ref ref="STDOUT_FILE"/>
10   - </appender>
  4 + <property name="LOG_PATH" value="./logs"/>
  5 +
  6 + <!-- ========== 实际 Appender(必须在 AsyncAppender 之前定义) ========== -->
11 7  
12 8 <!-- 控制台输出 -->
13 9 <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
... ... @@ -16,116 +12,123 @@
16 12 </encoder>
17 13 </appender>
18 14  
19   - <appender name="ASYNC_INFO" class="ch.qos.logback.classic.AsyncAppender">
20   - <queueSize>512</queueSize>
21   - <discardingThreshold>0</discardingThreshold>
22   - <neverBlock>true</neverBlock>
23   - <appender-ref ref="INFO_FILE"/>
24   - </appender>
25   -
  15 + <!-- INFO 级别文件日志 -->
26 16 <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
27 17 <immediateFlush>false</immediateFlush>
28 18 <File>./logs/info.log</File>
29   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  19 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
30 20 <fileNamePattern>./logs/info-%d{yyyyMMdd}.log.%i</fileNamePattern>
31   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
32   - <maxFileSize>500MB</maxFileSize>
33   - </timeBasedFileNamingAndTriggeringPolicy>
  21 + <maxFileSize>500MB</maxFileSize>
34 22 <maxHistory>2</maxHistory>
  23 + <totalSizeCap>20GB</totalSizeCap>
35 24 </rollingPolicy>
36   - <layout class="ch.qos.logback.classic.PatternLayout">
37   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
38   - </layout>
39   - </appender>
40   -
41   - <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
42   - <queueSize>256</queueSize>
43   - <discardingThreshold>0</discardingThreshold>
44   - <neverBlock>false</neverBlock>
45   - <appender-ref ref="ERROR_FILE"/>
  25 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  26 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  27 + </encoder>
46 28 </appender>
47 29  
  30 + <!-- ERROR 级别文件日志 -->
48 31 <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
49 32 <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
50 33 <level>ERROR</level>
51 34 </filter>
52 35 <File>./logs/error.log</File>
53   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
54   - <fileNamePattern>${LOG_PATH}/error-%d{yyyyMMdd}.log.%i</fileNamePattern>
55   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
56   - <maxFileSize>500MB</maxFileSize>
57   - </timeBasedFileNamingAndTriggeringPolicy>
  36 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
  37 + <fileNamePattern>./logs/error-%d{yyyyMMdd}.log.%i</fileNamePattern>
  38 + <maxFileSize>500MB</maxFileSize>
58 39 <maxHistory>2</maxHistory>
  40 + <totalSizeCap>20GB</totalSizeCap>
59 41 </rollingPolicy>
60   - <layout class="ch.qos.logback.classic.PatternLayout">
61   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
62   - </layout>
  42 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  43 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  44 + </encoder>
63 45 </appender>
64 46  
65 47 <!-- 请求响应日志 -->
66   - <appender name="ASYNC_REQUEST" class="ch.qos.logback.classic.AsyncAppender">
67   - <queueSize>512</queueSize>
68   - <discardingThreshold>0</discardingThreshold>
69   - <neverBlock>true</neverBlock>
70   - <appender-ref ref="REQUEST_FILE"/>
71   - </appender>
72   -
73 48 <appender name="REQUEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
74 49 <immediateFlush>false</immediateFlush>
75 50 <File>./logs/request.log</File>
76   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  51 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
77 52 <fileNamePattern>./logs/request-%d{yyyyMMdd}.log.%i</fileNamePattern>
78   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
79   - <maxFileSize>500MB</maxFileSize>
80   - </timeBasedFileNamingAndTriggeringPolicy>
  53 + <maxFileSize>500MB</maxFileSize>
81 54 <maxHistory>7</maxHistory>
  55 + <totalSizeCap>20GB</totalSizeCap>
82 56 </rollingPolicy>
83   - <layout class="ch.qos.logback.classic.PatternLayout">
84   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
85   - </layout>
86   - </appender>
87   -
88   - <!-- API异常日志 -->
89   - <appender name="ASYNC_API_ERROR" class="ch.qos.logback.classic.AsyncAppender">
90   - <queueSize>256</queueSize>
91   - <discardingThreshold>0</discardingThreshold>
92   - <neverBlock>false</neverBlock>
93   - <appender-ref ref="API_ERROR_FILE"/>
  57 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  58 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  59 + </encoder>
94 60 </appender>
95 61  
  62 + <!-- API 异常日志 -->
96 63 <appender name="API_ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
97 64 <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
98 65 <level>ERROR</level>
99 66 </filter>
100 67 <File>./logs/api-error.log</File>
101   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  68 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
102 69 <fileNamePattern>./logs/api-error-%d{yyyyMMdd}.log.%i</fileNamePattern>
103   - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
104   - <maxFileSize>500MB</maxFileSize>
105   - </timeBasedFileNamingAndTriggeringPolicy>
  70 + <maxFileSize>500MB</maxFileSize>
106 71 <maxHistory>7</maxHistory>
  72 + <totalSizeCap>20GB</totalSizeCap>
107 73 </rollingPolicy>
108   - <layout class="ch.qos.logback.classic.PatternLayout">
109   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</Pattern>
110   - </layout>
  74 + <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
  75 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
  76 + </encoder>
  77 + </appender>
  78 +
  79 + <!-- ========== 异步包装 Appender(引用上面已定义的实际 Appender) ========== -->
  80 +
  81 + <appender name="ASYNC_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
  82 + <queueSize>512</queueSize>
  83 + <discardingThreshold>0</discardingThreshold>
  84 + <neverBlock>true</neverBlock>
  85 + <appender-ref ref="STDOUT_FILE"/>
  86 + </appender>
  87 +
  88 + <appender name="ASYNC_INFO" class="ch.qos.logback.classic.AsyncAppender">
  89 + <queueSize>512</queueSize>
  90 + <discardingThreshold>0</discardingThreshold>
  91 + <neverBlock>true</neverBlock>
  92 + <appender-ref ref="INFO_FILE"/>
  93 + </appender>
  94 +
  95 + <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
  96 + <queueSize>256</queueSize>
  97 + <discardingThreshold>0</discardingThreshold>
  98 + <neverBlock>false</neverBlock>
  99 + <appender-ref ref="ERROR_FILE"/>
  100 + </appender>
  101 +
  102 + <appender name="ASYNC_REQUEST" class="ch.qos.logback.classic.AsyncAppender">
  103 + <queueSize>512</queueSize>
  104 + <discardingThreshold>0</discardingThreshold>
  105 + <neverBlock>true</neverBlock>
  106 + <appender-ref ref="REQUEST_FILE"/>
  107 + </appender>
  108 +
  109 + <appender name="ASYNC_API_ERROR" class="ch.qos.logback.classic.AsyncAppender">
  110 + <queueSize>256</queueSize>
  111 + <discardingThreshold>0</discardingThreshold>
  112 + <neverBlock>false</neverBlock>
  113 + <appender-ref ref="API_ERROR_FILE"/>
111 114 </appender>
112 115  
113   - <!-- Spring框架日志 -->
  116 + <!-- Spring 框架日志 -->
114 117 <logger name="org.springframework" level="ERROR"/>
115 118  
116   - <!-- MyBatis/Druid SQL日志关闭,避免大量DEBUG日志 -->
  119 + <!-- MyBatis/Druid SQL 日志关闭 -->
117 120 <logger name="com.apache.ibatis" level="ERROR"/>
118 121 <logger name="org.mybatis" level="ERROR"/>
119 122 <logger name="druid.sql.Statement" level="ERROR"/>
120 123 <logger name="druid.sql.ResultSet" level="ERROR"/>
121 124 <logger name="druid.sql.Connection" level="ERROR"/>
122 125  
123   - <!-- 业务日志 INFO级别 -->
124   - <logger name="com.java110" level="INFO">
  126 + <!-- 业务日志 INFO 级别 -->
  127 + <logger name="com.java110" level="INFO" additivity="false">
125 128 <appender-ref ref="ASYNC_STDOUT"/>
126 129 </logger>
127 130  
128   - <!-- API请求/响应/异常日志 -->
  131 + <!-- API 请求/响应/异常日志 -->
129 132 <logger name="com.java110.api.aop" level="INFO" additivity="false">
130 133 <appender-ref ref="ASYNC_STDOUT"/>
131 134 <appender-ref ref="ASYNC_REQUEST"/>
... ...
java110-utils/src/main/java/com/java110/utils/factory/ApplicationContextFactory.java
... ... @@ -17,6 +17,10 @@ public class ApplicationContextFactory {
17 17 ApplicationContextFactory.applicationContext = applicationContext;
18 18 }
19 19  
  20 + public static ApplicationContext getApplicationContext() {
  21 + return applicationContext;
  22 + }
  23 +
20 24 public static Object getBean(Class<?> className){
21 25 return applicationContext.getBean(className);
22 26 }
... ...
... ... @@ -218,12 +218,6 @@
218 218 <artifactId>log4j-web</artifactId>
219 219 <version>${log4j.version}</version>
220 220 </dependency>
221   - <!-- 桥接:告诉Slf4j使用Log4j2 -->
222   - <dependency>
223   - <groupId>org.apache.logging.log4j</groupId>
224   - <artifactId>log4j-slf4j-impl</artifactId>
225   - <version>${log4j.version}</version>
226   - </dependency>
227 221 <!-- 桥接:告诉commons logging使用Log4j2 -->
228 222 <dependency>
229 223 <groupId>org.apache.logging.log4j</groupId>
... ...
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
... ... @@ -617,9 +617,8 @@ public class ApiServiceSMOImpl extends LoggerEngine implements IApiServiceSMO {
617 617 try {
618 618 // Boot模式下直接调用CmdServiceSMO,避免HTTP loopback开销(~400ms)
619 619 if (Environment.isStartBootWay()) {
620   - Map<String, String> headers = new HashMap<>();
  620 + Map<String, String> headers = new HashMap<>(reqHeader);
621 621 headers.put(CommonConstant.HTTP_SERVICE, serviceCode);
622   - headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
623 622 ICmdServiceSMO cmdServiceSMO = ApplicationContextFactory.getBean("cmdServiceSMOImpl", ICmdServiceSMO.class);
624 623 responseEntity = cmdServiceSMO.cmd(reqJson.toJSONString(), headers);
625 624 } else {
... ...
service-order/pom.xml
... ... @@ -30,6 +30,12 @@
30 30 <dependency>
31 31 <groupId>org.apache.zookeeper</groupId>
32 32 <artifactId>zookeeper</artifactId>
  33 + <exclusions>
  34 + <exclusion>
  35 + <groupId>org.slf4j</groupId>
  36 + <artifactId>slf4j-log4j12</artifactId>
  37 + </exclusion>
  38 + </exclusions>
33 39 </dependency>
34 40  
35 41 <dependency>
... ...
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
... ... @@ -157,8 +157,10 @@ public class PcUserLoginCmd extends Cmd {
157 157 @Override
158 158 public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
159 159  
  160 + logger.info("PcUserLoginCmd reqJson: {}", reqJson.toJSONString());
  161 +
160 162 ResponseEntity responseEntity = null;
161   -
  163 +
162 164 // 根据用户名和密码查询用户信息
163 165 UserDto userDto = new UserDto();
164 166 userDto.setName(reqJson.getString("username"));
... ...
springboot/src/main/java/com/java110/boot/BootApplicationStart.java
... ... @@ -207,6 +207,17 @@ public class BootApplicationStart {
207 207  
208 208 Environment.setSystemStartWay(Environment.SPRING_BOOT);
209 209  
  210 + // 备用方案: 从Spring容器直接扫描@Java110Cmd Bean并注册
  211 + ServiceCmdEventPublishing.registerFromSpringContext();
  212 +
  213 + // 验证 Cmd 服务发现是否成功
  214 + int cmdListenerCount = ServiceCmdEventPublishing.getListeners().size();
  215 + if (cmdListenerCount == 0) {
  216 + logger.error("!!! 严重: Cmd服务发现失败! 所有APP API将不可用 !!!");
  217 + } else {
  218 + logger.info("Cmd服务注册验证: {} 个服务已成功注册", cmdListenerCount);
  219 + }
  220 +
210 221 //刷新缓存
211 222 flushMainCache(args);
212 223  
... ...