feat(BangumiService): add access token parameter to related subjects and image retrieval methods

Author: LiggMax

flow-client/src/main/java/com/ligg/flowclient/controller/FlowUserController.java

@@ -5,17 +5,22 @@
 
 package com.ligg.flowclient.controller;
 
+import com.ligg.common.entity.UserOauthEntity;
+import com.ligg.common.exception.LoginExpiredException;
 import com.ligg.common.response.Result;
 import com.ligg.common.statuenum.ResponseCode;
 import com.ligg.flowclient.interceptor.AuthorizationInterceptor;
 import com.ligg.flowclient.module.dto.UpdateUserCollectionDto;
 import com.ligg.flowclient.module.dto.UpdateUserDto;
 import com.ligg.flowclient.module.vo.FlowUserVo;
 import com.ligg.common.vo.bangumi.UserCollectionsVo;
+import com.ligg.flowclient.service.BangumiOAuthTokenService;
+import com.ligg.flowclient.service.JwtTokenService;
 import com.ligg.flowclient.service.UserBgmCollectionService;
 import com.ligg.flowclient.service.UserService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -28,6 +33,10 @@ public class FlowUserController {
 
     private final UserBgmCollectionService userBgmCollectionService;
 
+    private final BangumiOAuthTokenService bangumiOAuthTokenService;
+
+    private final JwtTokenService jwtTokenService;
+
     /**
      * 获取当前登录用户信息（需携带 AnimeFlow access_token）。
      */
@@ -71,13 +80,16 @@ public Result<FlowUserVo> uploadAvatar(
      */
     @GetMapping("/collections")
     public Result<UserCollectionsVo> getMeCollections(
-            @RequestAttribute(AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE) String accessToken,
+            @RequestAttribute(AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE) String flowAccessToken,
             @RequestParam(defaultValue = "2") int subjectType,
             @RequestParam(defaultValue = "2") int type,
             @RequestParam(defaultValue = "20") int limit,
             @RequestParam(defaultValue = "0") int offset) {
+        Long userId = jwtTokenService.validateAccessToken(flowAccessToken);
+        UserOauthEntity bangumiOauth = bangumiOAuthTokenService.findBangumiOauth(userId);
+        //accessToken 可能为null (未绑定bangumi)
         UserCollectionsVo vo = userBgmCollectionService.listMyCollections(
-                accessToken, subjectType, type, limit, offset);
+                bangumiOauth.getAccessToken(), userId, subjectType, type, limit, offset);
         return Result.success(ResponseCode.SUCCESS, vo);
     }
 

flow-client/src/main/java/com/ligg/flowclient/controller/bangumi/SubjectsController.java

@@ -6,20 +6,16 @@
 
 import com.ligg.api.bangumiapi.BangumiClient;
 import com.ligg.common.constants.bangumi.BangumiConstants;
+import com.ligg.common.entity.UserOauthEntity;
+import com.ligg.common.exception.LoginExpiredException;
 import com.ligg.common.response.Result;
 import com.ligg.common.statuenum.ResponseCode;
 import com.ligg.common.thirdparty.bangumi.enums.SubjectBrowseSort;
 import com.ligg.common.thirdparty.bangumi.response.*;
 import com.ligg.common.utils.Utils;
 import com.ligg.common.vo.bangumi.*;
 import com.ligg.flowclient.interceptor.AuthorizationInterceptor;
-import com.ligg.flowclient.service.BangumiCacheService;
-import com.ligg.flowclient.service.BangumiOAuthExecutor;
-import com.ligg.flowclient.service.BangumiOAuthTokenService;
-import com.ligg.flowclient.service.BangumiService;
-import com.ligg.flowclient.service.JwtTokenService;
-import com.ligg.common.entity.UserOauthEntity;
-import com.ligg.common.exception.LoginExpiredException;
+import com.ligg.flowclient.service.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -219,8 +215,16 @@ public Result<SubjectRelationsVo> subjectRelationsLocal(
             @NotNull @PathVariable int subjectId,
             @RequestParam(defaultValue = "2") int type,
             @RequestParam(defaultValue = "20") int limit,
-            @RequestParam(defaultValue = "0") int offset) {
-        SubjectRelationsVo vo = bangumiService.getRelatedSubjects(subjectId, limit, offset, type);
+            @RequestParam(defaultValue = "0") int offset,
+            @RequestAttribute(name = AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE, required = false) String flowAccessToken) {
+        String bangumiAccessToken = null;
+        Long userId = jwtTokenService.validateAccessToken(flowAccessToken);
+        //bangumiAccessToken 可能为null (未绑定bangumi)
+        UserOauthEntity bangumiOauth = bangumiOAuthTokenService.findBangumiOauth(userId);
+        if (StringUtils.hasText(bangumiOauth.getAccessToken())) {
+            bangumiAccessToken = bangumiOauth.getAccessToken();
+        }
+        SubjectRelationsVo vo = bangumiService.getRelatedSubjects(subjectId, limit, offset, type, bangumiAccessToken);
         if (vo.getData() != null) {
             for (SubjectRelationsVo.Item item : vo.getData()) {
                 if (item != null && item.getSubject() != null) {
@@ -285,7 +289,7 @@ public Result<SubjectsVo> subjects(
      * 对应 Bangumi {@code GET /p1/subjects/{id}}。未登录时对近期放送条目缓存；
      * 携带 Flow JWT 且已绑定 Bangumi 时，服务端换取 Bangumi OAuth token 直查以返回 {@code interest}。
      *
-     * @param subjectId      Bangumi 条目 ID
+     * @param subjectId       Bangumi 条目 ID
      * @param flowAccessToken 可选 Flow JWT（Bearer）
      */
     @GetMapping("/{subjectId}")

flow-client/src/main/java/com/ligg/flowclient/service/BangumiService.java

@@ -28,5 +28,5 @@ public interface BangumiService {
     /**
      * 获取关联条目
      */
-    SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int offset,int type);
+    SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int offset,int type, String bangumiAccessToken);
 }

flow-client/src/main/java/com/ligg/flowclient/service/ImageBackfillService.java

@@ -33,11 +33,10 @@ public class ImageBackfillService {
      *
      * @param subjectImagesJson bangumi_subject.images 的 JSON 值，可为空
      * @param subjectId         条目 ID
+     * @param accessToken       Bangumi OAuth access token，可为 null（传 null 时不会在请求中携带）
      * @return 封面图，获取失败返回空 CoverImages
-     *
-     * TODO 需啊添加可选access_token，否有nsfw类型条目获取图片会失败
      */
-    public CoverImages resolve(String subjectImagesJson, int subjectId) {
+    public CoverImages resolve(String subjectImagesJson, int subjectId, String accessToken) {
         CoverImages images;
         if (StringUtils.hasText(subjectImagesJson) && !"null".equals(subjectImagesJson)) {
             try {
@@ -47,7 +46,7 @@ public CoverImages resolve(String subjectImagesJson, int subjectId) {
                 images = new CoverImages();
             }
         } else {
-            images = fetchAndSave(subjectId);
+            images = fetchAndSave(subjectId, accessToken);
         }
         if (images.getLarge() == null) images.setLarge("");
         if (images.getCommon() == null) images.setCommon("");
@@ -57,7 +56,7 @@ public CoverImages resolve(String subjectImagesJson, int subjectId) {
         return images;
     }
 
-    private CoverImages fetchAndSave(int subjectId) {
+    private CoverImages fetchAndSave(int subjectId, String accessToken) {
         // 锁对象不删除：避免 remove 后其他线程创建新锁绕过互斥，造成重复请求。
         // subjectId 数量有限（≈3 万），全量常驻仅约 2 MB，可接受。
         Object lock = locks.computeIfAbsent(subjectId, k -> new Object());
@@ -79,7 +78,7 @@ private CoverImages fetchAndSave(int subjectId) {
 
             for (SubjectImageType type : SubjectImageType.values()) {
                 try {
-                    String url = bangumiV0Client.getSubjectImageUrl(subjectId, type);
+                    String url = bangumiV0Client.getSubjectImageUrl(subjectId, type, accessToken);
                     if (StringUtils.hasText(url)) {
                         setField(images, type, url);
                         anySucceeded = true;

flow-client/src/main/java/com/ligg/flowclient/service/JwtTokenService.java

@@ -158,8 +158,8 @@ public void updateUserEmail(Long userId, String email) {
                 continue;
             }
             session.setEmail(email);
-            Long ttlSeconds = redisTemplate.getExpire(sessionRedisKey(sessionId), TimeUnit.SECONDS);
-            if (ttlSeconds != null && ttlSeconds > 0) {
+            long ttlSeconds = redisTemplate.getExpire(sessionRedisKey(sessionId), TimeUnit.SECONDS);
+            if (ttlSeconds > 0) {
                 redisTemplate.opsForValue().set(
                         sessionRedisKey(sessionId),
                         session,

flow-client/src/main/java/com/ligg/flowclient/service/UserBgmCollectionService.java

@@ -7,8 +7,9 @@ public interface UserBgmCollectionService {
 
     /**
      * 查询当前登录用户已同步到本地的 Bangumi 收藏列表。
+     * accessToken 可能为null
      */
-    UserCollectionsVo listMyCollections(String accessToken, int subjectType, int type, int limit, int offset);
+    UserCollectionsVo listMyCollections(String accessToken, long userId, int subjectType, int type, int limit, int offset);
 
     /**
      * 更新当前用户对条目的 Bangumi 收藏，并同步写入本地 {@code user_bgm_collection}。

flow-client/src/main/java/com/ligg/flowclient/service/impl/BangumiServiceImpl.java

@@ -148,7 +148,7 @@ public SubjectsDto searchSubjects(SearchSubjectsBody body, int limit, int offset
      * 获取关联条目。
      */
     @Override
-    public SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int offset, int type) {
+    public SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int offset, int type, String bangumiAccessToken) {
         SubjectRelationsVo vo = new SubjectRelationsVo();
         if (subjectId == null || limit <= 0) {
             vo.setData(Collections.emptyList());
@@ -166,7 +166,7 @@ public SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int o
             return vo;
         }
 
-        List<SubjectRelationsVo.Item> items = rows.stream().map(this::toRelationItem).toList();
+        List<SubjectRelationsVo.Item> items = rows.stream().map(row -> toRelationItem(row, bangumiAccessToken)).toList();
         vo.setData(items);
         vo.setTotal((int) page.getTotal());
         return vo;
@@ -175,7 +175,7 @@ public SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int o
     /**
      * 将 DB 行转为 VO 条目，在转换过程中按需获取并回写图片。
      */
-    private SubjectRelationsVo.Item toRelationItem(SubjectRelationRow row) {
+    private SubjectRelationsVo.Item toRelationItem(SubjectRelationRow row, String bangumiAccessToken) {
         SubjectRelationsVo.Item item = new SubjectRelationsVo.Item();
 
         // 构建关联信息
@@ -198,7 +198,7 @@ private SubjectRelationsVo.Item toRelationItem(SubjectRelationRow row) {
         subject.setInfo(InfoboxParser.toInfo(row.getInfobox()));
         subject.setRating(buildRating(row));
         subject.setLocked(false);
-        subject.setImages(imageBackfillService.resolve(row.getImages(), row.getId()));
+        subject.setImages(imageBackfillService.resolve(row.getImages(), row.getId(), bangumiAccessToken));
 
         item.setSubject(subject);
         return item;

flow-client/src/main/java/com/ligg/flowclient/service/impl/UserBgmCollectionServiceImpl.java

@@ -48,9 +48,7 @@ public class UserBgmCollectionServiceImpl implements UserBgmCollectionService {
     private final ImageBackfillService imageBackfillService;
 
     @Override
-    public UserCollectionsVo listMyCollections(String accessToken, int subjectType, int type, int limit, int offset) {
-        Long userId = jwtTokenService.validateAccessToken(accessToken);
-
+    public UserCollectionsVo listMyCollections(String accessToken, long userId, int subjectType, int type, int limit, int offset) {
         UserCollectionsVo vo = new UserCollectionsVo();
         if (limit <= 0) {
             vo.setData(Collections.emptyList());
@@ -70,7 +68,7 @@ public UserCollectionsVo listMyCollections(String accessToken, int subjectType,
 
         List<UserCollectionsDto.Item> items = new ArrayList<>(rows.size());
         for (UserBgmCollectionRow row : rows) {
-            items.add(toItem(row));
+            items.add(toItem(row, accessToken));
         }
 
         vo.setData(items);
@@ -230,7 +228,7 @@ private String toJson(Object value) {
         }
     }
 
-    private UserCollectionsDto.Item toItem(UserBgmCollectionRow row) {
+    private UserCollectionsDto.Item toItem(UserBgmCollectionRow row, String accessToken) {
         UserCollectionsDto.Item item = new UserCollectionsDto.Item();
         item.setId(row.getSubjectId());
         item.setInterest(toInterest(row));
@@ -248,7 +246,7 @@ private UserCollectionsDto.Item toItem(UserBgmCollectionRow row) {
             item.setRating(emptyRating());
         }
 
-        CoverImages images = imageBackfillService.resolve(row.getImages(), row.getSubjectId());
+        CoverImages images = imageBackfillService.resolve(row.getImages(), row.getSubjectId(), accessToken);
         Utils.applyWsrvCdnInPlace(images);
         item.setImages(images);
         item.setInfo(InfoboxParser.toInfo(row.getInfobox()));

flow-client/src/test/java/com/ligg/flowclient/service/ImageBackfillServiceTest.java

@@ -10,5 +10,5 @@ public interface BangumiV0Client {
     /**
      * 获取条目封面图片 URL（{@code GET /v0/subjects/{subject_id}/image} 302 {@code Location}）。
      */
-    String getSubjectImageUrl(int subjectId, SubjectImageType type);
+    String getSubjectImageUrl(int subjectId, SubjectImageType type, String accessToken);
 }