|
|
@ -12,6 +12,7 @@ import com.luoo.comment.service.CommentService;
|
|
|
|
import com.luoo.comment.service.ComplaintService;
|
|
|
|
import com.luoo.comment.service.ComplaintService;
|
|
|
|
import com.luoo.comment.service.LikeService;
|
|
|
|
import com.luoo.comment.service.LikeService;
|
|
|
|
import com.luoo.comment.service.UserInfoService;
|
|
|
|
import com.luoo.comment.service.UserInfoService;
|
|
|
|
|
|
|
|
import com.luoo.comment.util.EmojiConverterUtil;
|
|
|
|
import com.luoo.comment.util.IpUtil;
|
|
|
|
import com.luoo.comment.util.IpUtil;
|
|
|
|
import com.luoo.comment.util.MySensitiveWordReplaceUtils;
|
|
|
|
import com.luoo.comment.util.MySensitiveWordReplaceUtils;
|
|
|
|
import constants.Constants;
|
|
|
|
import constants.Constants;
|
|
|
@ -199,7 +200,7 @@ public class CommentController extends BaseController {
|
|
|
|
commentResp.setNickName("已注销");
|
|
|
|
commentResp.setNickName("已注销");
|
|
|
|
commentResp.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
commentResp.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
if(null != commentUserInfo) {
|
|
|
|
if(null != commentUserInfo) {
|
|
|
|
commentResp.setNickName(commentUserInfo.getNickName());
|
|
|
|
commentResp.setNickName(EmojiConverterUtil.encode(commentUserInfo.getNickName()));
|
|
|
|
commentResp.setAvatar(getAvatar(commentUserInfo));
|
|
|
|
commentResp.setAvatar(getAvatar(commentUserInfo));
|
|
|
|
if(StringUtils.isNotEmpty(comment.getReplyToUserId())){
|
|
|
|
if(StringUtils.isNotEmpty(comment.getReplyToUserId())){
|
|
|
|
UserInfo replyToUserInfo = userInfoService.findById(comment.getReplyToUserId());
|
|
|
|
UserInfo replyToUserInfo = userInfoService.findById(comment.getReplyToUserId());
|
|
|
@ -227,7 +228,7 @@ public class CommentController extends BaseController {
|
|
|
|
topComment.setNickName("已注销");
|
|
|
|
topComment.setNickName("已注销");
|
|
|
|
topComment.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
topComment.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
if(null != topCommentUserInfo) {
|
|
|
|
if(null != topCommentUserInfo) {
|
|
|
|
topComment.setNickName(topCommentUserInfo.getNickName());
|
|
|
|
topComment.setNickName(EmojiConverterUtil.encode(topCommentUserInfo.getNickName()));
|
|
|
|
topComment.setAvatar(getAvatar(topCommentUserInfo));
|
|
|
|
topComment.setAvatar(getAvatar(topCommentUserInfo));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(StringUtils.isNotEmpty(topComment.getReplyToUserId())){
|
|
|
|
if(StringUtils.isNotEmpty(topComment.getReplyToUserId())){
|
|
|
@ -270,7 +271,7 @@ public class CommentController extends BaseController {
|
|
|
|
commentResp.setNickName("已注销");
|
|
|
|
commentResp.setNickName("已注销");
|
|
|
|
commentResp.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
commentResp.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
if (null != commentUserInfo) {
|
|
|
|
if (null != commentUserInfo) {
|
|
|
|
commentResp.setNickName(commentUserInfo.getNickName());
|
|
|
|
commentResp.setNickName(EmojiConverterUtil.encode(commentUserInfo.getNickName()));
|
|
|
|
commentResp.setAvatar(getAvatar(commentUserInfo));
|
|
|
|
commentResp.setAvatar(getAvatar(commentUserInfo));
|
|
|
|
if (StringUtils.isNotEmpty(commentUserInfo.getBadges())){
|
|
|
|
if (StringUtils.isNotEmpty(commentUserInfo.getBadges())){
|
|
|
|
Set<Integer> badgeSet = new HashSet<>();
|
|
|
|
Set<Integer> badgeSet = new HashSet<>();
|
|
|
@ -289,7 +290,7 @@ public class CommentController extends BaseController {
|
|
|
|
topComment.setNickName("已注销");
|
|
|
|
topComment.setNickName("已注销");
|
|
|
|
topComment.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
topComment.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
|
|
|
|
if(null != topCommentUserInfo) {
|
|
|
|
if(null != topCommentUserInfo) {
|
|
|
|
topComment.setNickName(topCommentUserInfo.getNickName());
|
|
|
|
topComment.setNickName(EmojiConverterUtil.encode(topCommentUserInfo.getNickName()));
|
|
|
|
topComment.setAvatar(getAvatar(topCommentUserInfo));
|
|
|
|
topComment.setAvatar(getAvatar(topCommentUserInfo));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|