commit

src/main/java/com/sxtvs/open/api/user/service/impl/UserServiceImpl.java

@@ -1,18 +1,18 @@
 package com.sxtvs.open.api.user.service.impl;
 
 import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.user.dto.LoginDto;
 import com.sxtvs.open.api.user.dto.TokenDto;
 import com.sxtvs.open.api.user.entity.User;
 import com.sxtvs.open.api.user.mapper.UserMapper;
 import com.sxtvs.open.api.user.service.IUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.core.advice.BizException;
 import com.sxtvs.open.core.auth.AESUtil;
+import com.sxtvs.open.core.sls.AliyunLogger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 /**
  * <p>
  * 服务实现类
@@ -24,9 +24,13 @@ import java.util.Optional;
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
 
+    @Autowired
+    private AliyunLogger logger;
 
     public TokenDto login(LoginDto dto) {
 
+        logger.info("key", "login", "dto", dto);
+
         var optionalUser = lambdaQuery().eq(User::getLoginName, dto.getLoginName())
                 .eq(User::getLoginPassword, dto.getLoginPassword())
                 .oneOpt();

src/main/java/com/sxtvs/open/api/youmei/service/YoumeiAccountServiceImpl.java

@@ -7,23 +7,14 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.sxtvs.open.api.youmei.dto.CheckWordResponse;
 import com.sxtvs.open.api.youmei.entity.YoumeiAccount;
 import com.sxtvs.open.api.youmei.mappser.YoumeiAccountMapper;
-import lombok.Cleanup;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
 import org.apache.hc.client5.http.fluent.Request;
-import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
-import org.apache.http.Consts;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -161,13 +152,7 @@ public class YoumeiAccountServiceImpl extends ServiceImpl<YoumeiAccountMapper, Y
     }
 
     public static void main(String[] args) throws IOException {
-        var s = Request.post("https://api-open-wx-www.yqt365.com/dataapp/api/umei/fw/open/wbjc/article_correct_external")
-                .bodyForm(List.of(new BasicNameValuePair("accessToken", "0378a08aac3b4ed69f68bb367ad22d4e"),
-                        new BasicNameValuePair("text", "傻逼")), StandardCharsets.UTF_8)
-                .execute()
-                .returnContent()
-                .asString();
-        System.out.println(s);
+
     }
 
 }

src/main/java/com/sxtvs/open/core/auth/LoginInterceptor.java

@@ -1,6 +1,7 @@
 package com.sxtvs.open.core.auth;
 
 
+import cn.hutool.core.util.IdUtil;
 import com.sxtvs.open.core.advice.BizException;
 import com.sxtvs.open.core.conf.Constant;
 import jakarta.servlet.http.HttpServletRequest;
@@ -16,7 +17,8 @@ public class LoginInterceptor implements AsyncHandlerInterceptor {
         if (!(handler instanceof HandlerMethod)) {
             return true;
         }
-
+        var requestId = IdUtil.nanoId();
+        request.setAttribute("requestId",requestId);
         HandlerMethod handlerMethod = (HandlerMethod) handler;
         Method method = handlerMethod.getMethod();
 

src/main/java/com/sxtvs/open/core/sls/AliyunLogger.java

@@ -8,9 +8,12 @@ import com.aliyun.openservices.aliyun.log.producer.errors.ProducerException;
 import com.aliyun.openservices.log.common.LogItem;
 import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Optional;
 
 @Component
 public class AliyunLogger {
@@ -71,6 +74,10 @@ public class AliyunLogger {
             item.PushBack("at", traceElement.getClassName() + "." + traceElement.getMethodName()
                     + "(" + traceElement.getFileName() + ":" + traceElement.getLineNumber() + ")");
         }
+        var requestIdOp = Optional.ofNullable(RequestContextHolder.getRequestAttributes())
+                .map(x -> x.getAttribute("requestId", RequestAttributes.SCOPE_REQUEST));
+        requestIdOp.ifPresent(x -> item.PushBack("requestId", x.toString()));
+
         int length = kv.length;
         if (length % 2 != 0) {
             return item;