From 23e78efefd96d28f0c492348f3cb8a9e6cdcbbab Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 12:31:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index bc8b1e9..2375d1e 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -14,10 +14,9 @@
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.service.IMemberLikeService;
-import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
-import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.article.vo.ArticleVO;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
@@ -25,6 +24,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.feignClient.MemberClient;
+import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -32,7 +32,6 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import util.HuaWeiOBSUtil;
/**
* <p>
@@ -77,7 +76,8 @@
List<ArticleVO> list2 = articleCommentsVOPageDTO.getList();
for (ArticleVO articleVO:list2) {
if (articleVO.getMemberId()!=null){
- R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId());
+ R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
+ SecurityConstants.INNER);
Member data = membeOne.getData();
articleVO.setMemberNickname(data.getNickname());
}
@@ -193,7 +193,8 @@
PageDTO<ArticleCommentsVO> articleCommentsVOPageDTO = PageDTO.of(page1, ArticleCommentsVO.class);
List<ArticleCommentsVO> list2 = articleCommentsVOPageDTO.getList();
for(ArticleCommentsVO articleCommentsVO:list2){
- R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId());
+ R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
+ SecurityConstants.INNER);
Member data = membeOne.getData();
articleCommentsVO.setMemberNickname(data.getNickname());
articleCommentsVO.setBmemberNickavatar(data.getAvatar());
@@ -220,10 +221,12 @@
for (ArticleComments articleComments1:list1){
ArticleCommentsVO articleCommentsVO1=new ArticleCommentsVO();
- R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId());
+ R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
+ SecurityConstants.INNER);
Member data1 = membeOne1.getData();
- R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId());
+ R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId(),
+ SecurityConstants.INNER);
Member data2 = membeOne2.getData();
articleCommentsVO1.setArticleId(articleComments1.getArticleId());
--
Gitblit v1.7.1