修改获取用户头像逻辑

jpress-model/src/main/java/io/jpress/model/query/CommentQuery.java

@@ -18,6 +18,7 @@ package io.jpress.model.query;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.ehcache.IDataLoader;
 import io.jpress.model.Comment;
+import io.jpress.model.core.Jdb;
 
 import java.math.BigInteger;
 import java.util.LinkedList;
@@ -271,4 +272,8 @@ public class CommentQuery extends JBaseQuery {
 		return comment;
 	}
 
+	public void updateAvaterById(BigInteger uuUserId, String uuUserAvater) {
+		Jdb.update("update comment set uu_user_avatar = ? WHERE uu_user_id= ? ", uuUserAvater, uuUserId);
+	}
+
 }

jpress-web-admin/src/main/java/io/jpress/admin/controller/_CommentController.java

@@ -33,7 +33,6 @@ import io.jpress.utils.StringUtils;
 
 import java.math.BigInteger;
 import java.util.Date;
-import java.util.List;
 
 @RouterMapping(url = "/admin/comment", viewPath = "/WEB-INF/admin/comment")
 @Before(ActionCacheClearInterceptor.class)
@@ -77,29 +76,19 @@ public class _CommentController extends JBaseCRUDController<Comment> {
 
 	@Override
 	public Page<Comment> onIndexDataLoad(int pageNumber, int pageSize) {
-		Page<Comment> page = null;
+
 		BigInteger contentId = getParaToBigInteger("cid");
 		BigInteger parentCommentId = getParaToBigInteger("pid");
 
 		if (StringUtils.isNotBlank(getPara("s"))) {
-			page = CommentQuery.me().paginateWithContent(pageNumber, pageSize, getModule(), getType(), contentId,
+			return CommentQuery.me().paginateWithContent(pageNumber, pageSize, getModule(), getType(), contentId,
 					parentCommentId, getPara("s"));
 		} else if (StringUtils.isNotBlank(getPara("son"))) {
-			page = CommentQuery.me().paginateWithContentAndSon(pageNumber, pageSize, getModule(), getType(), contentId,
+			return CommentQuery.me().paginateWithContentAndSon(pageNumber, pageSize, getModule(), getType(), contentId,
 					parentCommentId,getSon());
 		}
-		page = CommentQuery.me().paginateWithContentNotInDelete(pageNumber, pageSize, getModule(), getType(), contentId,
+		return CommentQuery.me().paginateWithContentNotInDelete(pageNumber, pageSize, getModule(), getType(), contentId,
 				parentCommentId);
-
-		List<Comment> comments = page.getList();
-		for (Comment comment : comments) {
-			String userAvater = comment.getUuUserAvatar();
-			if (!(StringUtils.isNotBlank(userAvater) && comment.isImageExist(userAvater))) {
-				comment.setUuUserAvatar(null);
-			}
-		}
-
-		return page;
 	}
 
 	@Override
@@ -253,4 +242,6 @@ public class _CommentController extends JBaseCRUDController<Comment> {
 		}
 	}
 
+
+
 }

jpress-web-front/src/main/java/io/jpress/front/controller/CommentController.java

@@ -120,6 +120,9 @@ public class CommentController extends BaseFrontController {
 		}
 
 		String uuUserAvatar = getPara("uuUserAvatar");
+		if (!StringUtils.isNotBlank(uuUserAvatar)) {
+			uuUserAvatar = null;
+		}
 
 		String author = getPara("author");
 		if (userId == null && uuUserId != null) {
@@ -165,6 +168,13 @@ public class CommentController extends BaseFrontController {
 		comment.setUuUserAvatar(uuUserAvatar);
 
 		if (comment.save()) {
+			//同步移动端用户头像
+			if (uuUserId != null && StringUtils.isNotBlank(uuUserAvatar) && comment.isImageExist(uuUserAvatar)) {
+				CommentQuery.me().updateAvaterById(uuUserId,uuUserAvatar);
+			} else if(StringUtils.isNotBlank(uuUserAvatar) && !comment.isImageExist(uuUserAvatar)){
+				comment.setUuUserAvatar(null);
+				comment.save();
+			}
 			ActionCacheManager.clearCache();
 		}