修改 小程序足迹

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FootPrintServiceImpl.java

@@ -117,7 +117,7 @@ public class FootPrintServiceImpl implements FootPrintService {
             }
             result.setList(resultList);
             logger.info("【请求结束】用户足迹分页查询成功");
-            return Result.success(resultList);
+            return Result.success(result);
         } catch (Exception e) {
             logger.error("用户足迹分页查询", e);
             return Result.failed("查询失败");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -428,15 +428,26 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public Result userInfo(UserRequestDto dto) {
+    public Result userInfo(HttpServletRequest request) {
         try {
+            String token = request.getHeader("Authorization");
+            if (StringUtils.isBlank(token)) {
+                logger.info("获取登录用户的token失败");
+                return Result.failed("查询不到当前登录用户信息");
+            }
+            Long userId = userTokenManager.getUserId(token);
+            if (Objects.isNull(userId)) {
+                logger.info("获取登录用户的userId失败");
+                return Result.failed("查询不到当前登录用户信息");
+            }
             User user = null;
 //            String key = MessageFormat.format(CacheCodeConstants.USER_INFO_KEY, dto.getUserId().toString());
 //            if (redisUtil.hasKey(key)) {
 //                user = (User) redisUtil.get(key);
 //            } else {
-                user = userDao.queryById(dto.getUserId());
+                user = userDao.queryById(userId);
 //            }
+            logger.info("【请求结束】查询用户信息成功");
             return Result.success(user);
         } catch (Exception e) {
             logger.error("查询用户信息失败", e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

@@ -27,6 +27,9 @@ public class LoginInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         logger.info("进入拦截器");
         String token = request.getHeader("Authorization");
+        if (StringUtils.isBlank(token)) {
+            return true;
+        }
         if (StringUtils.isNotBlank(token)) {
             if (userTokenManager.checkLogin(token)) {
                 return true;

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserService.java

@@ -75,8 +75,7 @@ public interface UserService {
     /**
      * 查询用户信息
      *
-     * @param dto
      * @return
      */
-    Result userInfo(UserRequestDto dto);
+    Result userInfo(HttpServletRequest request);
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserController.java

@@ -158,11 +158,8 @@ public class WxUserController {
 
     @ApiOperation(value = "用户信息")
     @PostMapping("/userInfo")
-    public Result userInfo(@RequestBody UserRequestDto dto) {
-        logger.info("【请求开始】查询用户信息,请求参数:{}", JSON.toJSONString(dto));
-        if (Objects.isNull(dto.getUserId()) || dto.getUserId().equals(0L)) {
-            return Result.failed("用户id不能为空");
-        }
-        return userService.userInfo(dto);
+    public Result userInfo(HttpServletRequest request) {
+        logger.info("【请求开始】查询用户信息");
+        return userService.userInfo(request);
     }
 }