企业黑名单同步

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/job/BlacklistSyncJobHandler.java

@@ -5,9 +5,12 @@ import com.tzld.piaoquan.risk.control.service.sync.config.ApolloConfigService;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.UUID;
+
 /**
  * 黑名单同步XXL-JOB任务处理器
  * 
@@ -34,9 +37,13 @@ public class BlacklistSyncJobHandler {
      */
     @XxlJob("blacklistSyncJob")
     public void execute() throws Exception {
-        log.info("开始执行黑名单同步任务检查");
-        
+        // 为XXL-JOB任务设置traceId
+        String traceId = "JOB-" + UUID.randomUUID().toString().replace("-", "").substring(0, 12);
+        MDC.put("logTraceId", traceId);
+
         try {
+            log.info("开始执行黑名单同步任务检查，traceId: {}", traceId);
+
             // 记录任务开始时间
             long startTime = System.currentTimeMillis();
             
@@ -64,9 +71,12 @@ public class BlacklistSyncJobHandler {
             String errorMsg = "黑名单同步任务执行失败: " + e.getMessage();
             log.info(errorMsg);
             log.error("XXL-JOB任务执行异常", e);
-            
+
             // 重新抛出异常，让XXL-JOB记录任务失败
             throw e;
+        } finally {
+            // 清理MDC
+            MDC.remove("logTraceId");
         }
     }
     

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/RiskUserHandleService.java

@@ -43,6 +43,7 @@ public class RiskUserHandleService {
         log.info("handleRiskUser, riskUserInfo: {}", riskUserInfo);
         //根据名称找到人
         List<UserBase> staffList = findStaffByName(riskUserInfo);
+        log.info( "handleRiskUser, staffList: {}", staffList);
         if (staffList.isEmpty()) return 0;
         //根据群名匹配到：人-群:哪个员工哪个群
         Map<String, List<RoomListResponse.RoomInfo>> toBeOperate = matchUserAndRoom(staffList, riskUserInfo);

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/sync/impl/BlacklistSyncServiceImpl.java

@@ -64,7 +64,6 @@ public class BlacklistSyncServiceImpl implements BlacklistSyncService {
                 if (decision.isShouldSync()) {
                     // 4. 尝试获取企业级分布式锁
                     String lockKey = "corp_sync_" + corpId;
-                    
                     if (lockService.tryLock(lockKey, 300)) { // 锁定5分钟
                         try {
                             log.info("企业{}获取分布式锁成功，开始执行同步", corpId);

risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/ReceiveRiskInfoController.java

@@ -4,20 +4,16 @@ import com.alibaba.fastjson.JSON;
 import com.tzld.piaoquan.risk.control.common.annotation.UnAuth;
 import com.tzld.piaoquan.risk.control.common.base.CommonResponse;
 import com.tzld.piaoquan.risk.control.config.QywxConfig;
-import com.tzld.piaoquan.risk.control.model.qywx.QwLoginCheckCode;
 import com.tzld.piaoquan.risk.control.model.qywx.RiskUserDelResult;
 import com.tzld.piaoquan.risk.control.model.qywx.RiskUserInfo;
 import com.tzld.piaoquan.risk.control.service.impl.RiskUserHandleService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.shaded.org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.UUID;
-
 @RestController
 @RequestMapping("/qw")
 @Slf4j

risk-control-server/src/main/resources/logback-spring.xml

@@ -48,7 +48,7 @@
         <file>${LOG_PATH}/debug.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] [%X{requestMethod:-} %X{requestUri:-}] [%X{clientIp:-}] [%X{businessType:-}] [%X{markParam:-}] %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset> <!-- 设置字符集 -->
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -88,7 +88,7 @@
         <!-- 可选参数 -->
 <!--        <topic>your-topic</topic>  &lt;!&ndash; 如需按Topic分类日志 &ndash;&gt;-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] [%X{requestMethod:-} %X{requestUri:-}] [%X{clientIp:-}] [%X{businessType:-}] [%X{markParam:-}] %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
         <!-- 只上传INFO级别日志 -->
@@ -117,7 +117,7 @@
         <file>${LOG_PATH}/info.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] [%X{requestMethod:-} %X{requestUri:-}] [%X{clientIp:-}] [%X{businessType:-}] [%X{markParam:-}] %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -144,7 +144,7 @@
         <file>${LOG_PATH}/warn.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] [%X{requestMethod:-} %X{requestUri:-}] [%X{clientIp:-}] [%X{businessType:-}] [%X{markParam:-}] %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -171,7 +171,7 @@
         <file>${LOG_PATH}/error.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] [%X{requestMethod:-} %X{requestUri:-}] [%X{clientIp:-}] [%X{businessType:-}] [%X{markParam:-}] %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->