Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 5fe08a84d8b68023c3454815e98013081971855e
+  newTag: 8e6175c9b1f0d61a22b2b7ae11e8d2f63bbb92c8

release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java

@@ -99,9 +99,22 @@ public class DynamicController extends BaseController {
             @RequestParam(required = false) List<String> gambitName) {
         return ResultBody.success(
                 dynamicService.dynamicList(
-                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request,gambitId,id,userAccountId,description,gambitName));
+                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(),gambitId,id,userAccountId,description,gambitName));
     }
 
+    @ApiOperation(value = "动态 列表(未登录)")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
+    @GetMapping("/dynamicList1")
+    public ResultBody<DynamicVO> dynamicList1(
+            @RequestParam Integer pageNo, @RequestParam Integer pageSize,
+            @RequestParam(required = false) Integer gambitId, @RequestParam(required = false) Integer id,
+            @RequestParam(required = false) Integer userAccountId,
+            @RequestParam(required = false) String description,
+            @RequestParam(required = false) List<String> gambitName) {
+        return ResultBody.success(
+                dynamicService.dynamicList(
+                        pageNo, pageSize, 0,gambitId,id,userAccountId,description,gambitName));
+    }
 
     @ApiOperation(value = "new-小程序-返回最新5条带动态的图片")
     @GetMapping("/recentNews")

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

@@ -67,6 +67,9 @@ public interface UserAppApi {
     @PostMapping("/userapp/user-account/feignListAppUserAccount")
     List<UserAccountSimpleDTO> feignListAppUserAccount(@ApiParam(value = "账号查询QO", required = true) @RequestBody UserAccountQO userAccountQO, @RequestHeader("token") String token);
 
+    @PostMapping("/userapp/user-account/feignListAppUserAccount1")
+    List<UserAccountSimpleDTO> feignListAppUserAccount1(@ApiParam(value = "账号查询QO", required = true) @RequestBody UserAccountQO userAccountQO);
+
 
     /**
      * 根据用户id获取基本信息

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/UserAppApiHystrix.java

@@ -47,6 +47,11 @@ public class UserAppApiHystrix implements UserAppApi {
         log.error("熔断：feignListAppUserAccount：{}", userAccountQO);
         return null;
     }
+    @Override
+    public List<UserAccountSimpleDTO> feignListAppUserAccount1(UserAccountQO userAccountQO) {
+        log.error("熔断：feignListAppUserAccount：{}", userAccountQO);
+        return null;
+    }
 
     @Override
     public PilotCertificationInteriorDTO feignInteriorDetailPilot(Integer userAccountId) {

release-service/src/main/java/com/mmc/csf/release/service/DynamicService.java

@@ -58,7 +58,7 @@ public interface DynamicService {
     ResultBody dynamicDetails(Integer dynamicId, Integer userId, HttpServletRequest request);
 
     PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userAccountId, HttpServletRequest request, Integer gambitId, Integer id, Integer userId, String description, List<String> gambitName);
+            Integer pageNo, Integer pageSize, Integer userAccountId, Integer gambitId, Integer id, Integer userId, String description, List<String> gambitName);
 
     ResultBody recentNewsList(Integer userAccountId);
 

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -299,7 +299,7 @@ public class DynamicServiceImpl implements DynamicService {
 
     @Override
     public PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId,Integer userAccountIds,
+            Integer pageNo, Integer pageSize, Integer userId, Integer gambitId,Integer dynId,Integer userAccountIds,
             String description,List<String> gambitName) {
         Integer tokenUserId =userId;
         Integer inUserId =userAccountIds;
@@ -380,7 +380,7 @@ public class DynamicServiceImpl implements DynamicService {
         UserAccountQO bUserAccountQO = new UserAccountQO();
         bUserAccountQO.setUserIds(userIdList);
         List<UserAccountSimpleDTO> userAccountSimpleDTOS =
-                userAppApi.feignListAppUserAccount(bUserAccountQO, request.getHeader(TokenConstant.TOKEN));
+                userAppApi.feignListAppUserAccount1(bUserAccountQO);
         Map<Integer, UserAccountSimpleDTO> userAccountInfoMap =
                 userAccountSimpleDTOS.stream()
                         .collect(Collectors.toMap(UserAccountSimpleDTO::getId, Function.identity()));
@@ -406,7 +406,7 @@ public class DynamicServiceImpl implements DynamicService {
                                             List<Integer> commentUserIds = comment.stream().map(ForumDynamicDO::getUserAccountId).collect(Collectors.toList());
                                             bUserAccountQO.setUserIds(commentUserIds);
                                             List<UserAccountSimpleDTO> commentUserAccountSimple =
-                                                    userAppApi.feignListAppUserAccount(bUserAccountQO, request.getHeader(TokenConstant.TOKEN));
+                                                    userAppApi.feignListAppUserAccount1(bUserAccountQO);
                                             List<DynamicVO> commentAndReply = comment.stream().limit(2).map(ForumDynamicDO::buildDynamicVO).collect(Collectors.toList());
                                             for (DynamicVO vo : commentAndReply) {
                                                 for (UserAccountSimpleDTO userAccountSimpleDTO : commentUserAccountSimple) {
@@ -492,7 +492,6 @@ public class DynamicServiceImpl implements DynamicService {
         }
         return PageResult.buildPage(pageNo, pageSize, count, dynamicVOList);
     }
-
     @Override
     public ResultBody recentNewsList(Integer userAccountId) {
         List<ForumDynamicUserDO> forumDynamicDOS = dynamicDao.recentNewsList(userAccountId);

release-service/src/main/resources/not-check.yml

@@ -47,4 +47,5 @@ data-filter:
     - /release/dynamic/appGambitList
     - /release/curriculum/curriculumDetails
     - /release/backstage/forum/getNotCheckDynamicSum
+    - /release/dynamic/dynamicList1