Merge remote-tracking branch 'origin/bugfix-20211015'

community-service/src/main/java/com/tanpu/community/controller/HomePageController.java

@@ -78,7 +78,7 @@ public class HomePageController {
     @ApiOperation("查询关注/粉丝列表")
     @ResponseBody
     public CommonResp<Page<FollowQo>> queryFollowList(@RequestBody QueryFollowReq req) {
-        String selfUserId = httpServletHelper.getCurrentUserId();
+        String selfUserId = userHolder.getUserId();
         // 为空查询当前用户自己的粉丝/关注列表
         if (StringUtils.isEmpty(req.getUserId()) && StringUtils.isNotEmpty(selfUserId)) {
             req.setUserId(selfUserId);

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -264,20 +264,21 @@ public class HomePageManager {
         List<UserInfoResp> userInfoNews = feignClientForFatools.queryUserListNew(userIdsPage.getContent());
         List<FollowQo> followQos = userInfoNews.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList());
         if (StringUtils.isNotEmpty(userId)) {
-            judgeFollowed(followQos, userId);
+            followQos = judgeFollowed(followQos, userId);
         }
         return PageUtils.page(userIdsPage, followQos);
     }
 
 
     //判断返回列表中的用户是否被当前用户关注
-    public void judgeFollowed(List<FollowQo> followQos, @NotEmpty String followerId) {
+    public List<FollowQo> judgeFollowed(List<FollowQo> followQos, @NotEmpty String followerId) {
         Set<String> idolSet = new HashSet<>(followRelService.queryIdolsByFansId(followerId));
-        followQos.stream().peek(o -> {
+        return followQos.stream().map(o -> {
             if (idolSet.contains(o.getUserId())) {
                 o.setFollowed(true);
             }
-        });
+            return o;
+        }).collect(Collectors.toList());
     }
 
     public void addFollowRel(FollowRelReq req, String followerId) {

community-service/src/main/java/com/tanpu/community/util/HttpServletHelper.java

 package com.tanpu.community.util;
 
+import com.tanpu.common.auth.UserHolder;
 import com.tanpu.common.redis.RedisHelper;
 import com.tanpu.community.api.constants.RedisKeyConstant;
 import lombok.extern.slf4j.Slf4j;
@@ -26,28 +27,31 @@ import java.util.Optional;
 public class HttpServletHelper {
     @Resource
     private RedisHelper redisHelper;
+    @Resource
+    private UserHolder userHolder;
 
     public String getCurrentUserId() {
-        String userId = null;
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-        String clientEnv = request.getHeader(RedisKeyConstant.ENV);
-        if (isAndroid(clientEnv) || isIOS(clientEnv) || isPc(clientEnv) || isMiniProgram(clientEnv)) {
-            // android，ios，pc，小程序用token
-            String token = request.getHeader(RedisKeyConstant.TAMP_TOKEN);
-            // redis获取的value,都带有 ""，这里去掉
-            userId = StringUtils.remove(redisHelper.get(RedisKeyConstant.REDIS_PREFIX_TOKEN + token), "\"");
-        } else {
-            // 用cookie
-            Cookie[] cookies = request.getCookies();
-            if (cookies != null) {
-                Optional<Cookie> first = Arrays.stream(request.getCookies())
-                        .filter(cookie -> StringUtils.equalsIgnoreCase(RedisKeyConstant.SESSION_COOKIE_NAME, cookie.getName()))
-                        .findFirst();
-                if (first.isPresent()) {
-                    userId = first.get().getValue();
-                }
-            }
-        }
+//        String userId = null;
+//        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+//        String clientEnv = request.getHeader(RedisKeyConstant.ENV);
+//        if (isAndroid(clientEnv) || isIOS(clientEnv) || isPc(clientEnv) || isMiniProgram(clientEnv)) {
+//            // android，ios，pc，小程序用token
+//            String token = request.getHeader(RedisKeyConstant.TAMP_TOKEN);
+//            // redis获取的value,都带有 ""，这里去掉
+//            userId = StringUtils.remove(redisHelper.get(RedisKeyConstant.REDIS_PREFIX_TOKEN + token), "\"");
+//        } else {
+//            // 用cookie
+//            Cookie[] cookies = request.getCookies();
+//            if (cookies != null) {
+//                Optional<Cookie> first = Arrays.stream(request.getCookies())
+//                        .filter(cookie -> StringUtils.equalsIgnoreCase(RedisKeyConstant.SESSION_COOKIE_NAME, cookie.getName()))
+//                        .findFirst();
+//                if (first.isPresent()) {
+//                    userId = first.get().getValue();
+//                }
+//            }
+//        }
+        String userId = userHolder.getUserId();
         log.debug("当前登录用户Id: {}", userId);
         return userId;
     }