zyx 2 rokov pred
rodič
commit
4eb55deb55

+ 17 - 0
src/main/java/com/sxtvs/open/api/user/service/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sxtvs.open.api.user.service.impl;
 
 import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.user.dto.LoginDto;
 import com.sxtvs.open.api.user.dto.TokenDto;
@@ -9,10 +10,13 @@ import com.sxtvs.open.api.user.mapper.UserMapper;
 import com.sxtvs.open.api.user.service.IUserService;
 import com.sxtvs.open.core.advice.BizException;
 import com.sxtvs.open.core.auth.AESUtil;
+import com.sxtvs.open.core.auth.HttpContextUtil;
 import com.sxtvs.open.core.sls.AliyunLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 /**
  * <p>
  * 服务实现类
@@ -48,6 +52,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     }
 
+    public User getLoginUser() {
+        var token = HttpContextUtil.getToken();
+        if (token.isEmpty()) {
+            throw new RuntimeException("获取token异常");
+        }
+        var userId = AESUtil.decryptStr(token.get());
+        var user = this.lambdaQuery().eq(User::getId, Long.parseLong(userId)).one();
+        if (user == null) {
+            throw new RuntimeException("用户不存在");
+        }
+        return user;
+    }
+
     public void createUser(String userName, String pwd) {
         var user = new User();
         user.setLoginName(userName);

+ 7 - 1
src/main/java/com/sxtvs/open/api/youmei/controller/YoumeiController.java

@@ -1,5 +1,7 @@
 package com.sxtvs.open.api.youmei.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.sxtvs.open.api.user.service.impl.UserServiceImpl;
 import com.sxtvs.open.api.youmei.dto.CheckWordParam;
 import com.sxtvs.open.api.youmei.service.YoumeiAccountServiceImpl;
 import com.sxtvs.open.core.auth.LoginRequired;
@@ -16,6 +18,8 @@ public class YoumeiController {
     @Autowired
     private YoumeiAccountServiceImpl youmeiAccountService;
 
+    @Autowired
+    private UserServiceImpl userService;
 
     @Autowired
     private AliyunLogger logger;
@@ -24,7 +28,9 @@ public class YoumeiController {
     @RequestMapping("check")
     @LoginRequired
     public Object checkWord(@RequestBody CheckWordParam checkWordParam) {
-        logger.info("api", "check", "data", checkWordParam);
+        logger.info("key", "checkWord",
+                "data", JSON.toJSONString(checkWordParam),
+                "user", JSON.toJSONString(userService.getLoginUser()));
         return youmeiAccountService.wordCheckCache(checkWordParam.getText());
     }
 

+ 9 - 4
src/main/java/com/sxtvs/open/api/youmei/service/YoumeiAccountServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sxtvs.open.api.youmei.service;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.benmanes.caffeine.cache.Cache;
@@ -7,10 +8,12 @@ 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 com.sxtvs.open.core.sls.AliyunLogger;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -23,11 +26,11 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class YoumeiAccountServiceImpl extends ServiceImpl<YoumeiAccountMapper, YoumeiAccount> implements IYoumeiAccountService {
 
-    private final ObjectMapper objectMapper;
+    @Autowired
+    private ObjectMapper objectMapper;
 
-    public YoumeiAccountServiceImpl(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
+    @Autowired
+    private AliyunLogger logger;
 
 
     private final HashMap<Integer, String> belongMap = new HashMap<>() {{
@@ -97,6 +100,8 @@ public class YoumeiAccountServiceImpl extends ServiceImpl<YoumeiAccountMapper, Y
                 .returnContent()
                 .asString();
 
+        logger.info("key", "checkWordResponse", "data", body);
+
         CheckWordResponse checkWordDto = objectMapper.readValue(body, CheckWordResponse.class);
         CheckWordResponse.DataDTO data = checkWordDto.getData();