fix commentList nickName with emoji

luoo_comment/src/main/java/com/luoo/comment/controller/CommentController.java

@@ -200,7 +200,7 @@ public class CommentController extends BaseController {
         commentResp.setNickName("已注销");
         commentResp.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
         if(null != commentUserInfo) {
-            commentResp.setNickName(EmojiConverterUtil.encode(commentUserInfo.getNickName()));
+            commentResp.setNickName(commentUserInfo.getNickName());
             commentResp.setAvatar(getAvatar(commentUserInfo));
             if(StringUtils.isNotEmpty(comment.getReplyToUserId())){
                 UserInfo replyToUserInfo = userInfoService.findById(comment.getReplyToUserId());
@@ -228,7 +228,7 @@ public class CommentController extends BaseController {
             topComment.setNickName("已注销");
             topComment.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
             if(null != topCommentUserInfo) {
-                topComment.setNickName(EmojiConverterUtil.encode(topCommentUserInfo.getNickName()));
+                topComment.setNickName(topCommentUserInfo.getNickName());
                 topComment.setAvatar(getAvatar(topCommentUserInfo));
             }
            if(StringUtils.isNotEmpty(topComment.getReplyToUserId())){
@@ -271,7 +271,7 @@ public class CommentController extends BaseController {
         commentResp.setNickName("已注销");
         commentResp.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
         if (null != commentUserInfo) {
-            commentResp.setNickName(EmojiConverterUtil.encode(commentUserInfo.getNickName()));
+            commentResp.setNickName(commentUserInfo.getNickName());
             commentResp.setAvatar(getAvatar(commentUserInfo));
             if (StringUtils.isNotEmpty(commentUserInfo.getBadges())){
                 Set<Integer> badgeSet = new HashSet<>();
@@ -290,7 +290,7 @@ public class CommentController extends BaseController {
             topComment.setNickName("已注销");
             topComment.setAvatar(Constants.RESOURCE_PREFIX + Constants.DEFAULT_USER_THUMBNAIL);
             if(null != topCommentUserInfo) {
-                topComment.setNickName(EmojiConverterUtil.encode(topCommentUserInfo.getNickName()));
+                topComment.setNickName(topCommentUserInfo.getNickName());
                 topComment.setAvatar(getAvatar(topCommentUserInfo));
             }
 

luoo_comment/src/main/java/com/luoo/comment/pojo/UserInfo.java

@@ -1,6 +1,7 @@
 package com.luoo.comment.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.luoo.comment.util.EmojiConverterUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -35,6 +36,10 @@ public class UserInfo implements Serializable {
 	 */
 	private String nickName;
 
+	public String getNickName() {
+		return EmojiConverterUtil.decode(nickName);
+	}
+
 	/**
 	 * 头像
 	 */
@@ -145,4 +150,13 @@ public class UserInfo implements Serializable {
 	 * 是否启用推送
 	 */
 	private Integer enablePush;
+
+	/**
+	 * 微信 昵称
+	 */
+	private String wxNickname;
+
+	public String getWxNickname() {
+		return EmojiConverterUtil.decode(wxNickname);
+	}
 }