对接移动端

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

@@ -15,6 +15,7 @@
  */
 package io.jpress.admin.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jfinal.aop.Before;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.IAtom;
@@ -37,6 +38,7 @@ import io.jpress.router.RouterNotAllowConvert;
 import io.jpress.template.TemplateManager;
 import io.jpress.template.TplModule;
 import io.jpress.template.TplTaxonomyType;
+import io.jpress.utils.HttpUtils;
 import io.jpress.utils.JsoupUtils;
 import io.jpress.utils.StringUtils;
 
@@ -458,12 +460,43 @@ public class _ContentController extends JBaseCRUDController<Content> {
 			return;
 		}
 
+		if ("uuhelper".equals(content.getModule()) && Content.STATUS_NORMAL.equals(content.getStatus())) {
+			pushUuHelper(content);
+		}
+
 		AjaxResult ar = new AjaxResult();
 		ar.setErrorCode(0);
 		ar.setData(content.getId());
 		renderAjaxResult("save ok", 0, content.getId());
 	}
 
+	private void pushUuHelper(Content content) {
+		Map<String, String> map = new HashMap<>();
+		String url = "http://113.105.74.140:8092/console/pushToAll";
+		String fromUserId = "10000";
+		JSONObject bodyJO = new JSONObject(true);
+		bodyJO.put("content", content.getTitle());
+		bodyJO.put("fromUserId", "10000");
+		bodyJO.put("fromUserName", "系统消息");
+		bodyJO.put("type", 1);
+		bodyJO.put("timeSend", "");
+		bodyJO.put("imageUrl", content.getThumbnail());
+		bodyJO.put("linkUrl", content.getUrl());
+		String body = bodyJO.toJSONString();
+
+		map.put("fromUserId", fromUserId);
+		map.put("body", body);
+
+
+		try {
+			String response = HttpUtils.get(url, map);
+			System.out.println(response);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
 	private Content getContent() {
 		Content content = getModel(Content.class);
 

jpress-web-admin/src/main/webapp/WEB-INF/admin/comment/uuHelperCommentList.html

@@ -108,10 +108,10 @@
                                 <td>
                                     <div class="messageContent">
                                         <div class="leftImg">
-                                            <img src="${(bean.user.avatar)!CPATH+'/static/jpress/admin/image/nothumbnail.jpg'}" alt="头像">
+                                            <img src="${(bean.uu_user_avatar)!(bean.user.avatar)!CPATH+'/static/jpress/admin/image/nothumbnail.jpg'}" alt="头像">
                                         </div>
                                         <div class="rightContent">
-                                            <p><a href="${CPATH}/admin/user/edit?id=${bean.user_id!}&c=list&p=user"><#if bean.user?? >${(bean.user.username)!}<#else>${(comment.author)!}</#if> </a></p>
+                                            <p>${bean.author!}</p>
                                             <span>
                                                 ${bean.text!}<#if "draft" == bean.status!>(待审核)</#if>
                                             </span>

jpress-web-admin/src/main/webapp/WEB-INF/admin/comment/uuHelperGroupDetail.html

@@ -158,7 +158,7 @@
                                             <img src="${(bean.user.avatar)!CPATH+'/static/jpress/admin/image/nothumbnail.jpg'}" alt="头像">
                                         </div>
                                         <div class="rightContent">
-                                            <p><a href="${CPATH}/admin/user/edit?id=${bean.user_id!}&c=list&p=user"> ${(bean.user.username)!comment.author!} </a></p>
+                                            <p>${bean.author!}</p>
                                             <span>${bean.text!}<#if "draft" == bean.status!>(待审核)<#elseif "delete" == bean.status!>(垃圾箱)</#if></span>
                                         </div>
                                     </div>

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

@@ -15,9 +15,6 @@
  */
 package io.jpress.front.controller;
 
-import java.math.BigInteger;
-import java.util.Date;
-
 import io.jpress.Consts;
 import io.jpress.core.BaseFrontController;
 import io.jpress.core.cache.ActionCacheManager;
@@ -31,6 +28,9 @@ import io.jpress.router.RouterMapping;
 import io.jpress.utils.CookieUtils;
 import io.jpress.utils.StringUtils;
 
+import java.math.BigInteger;
+import java.util.Date;
+
 @RouterMapping(url = "/comment")
 public class CommentController extends BaseFrontController {
 
@@ -60,13 +60,15 @@ public class CommentController extends BaseFrontController {
 		}
 
 		BigInteger userId = StringUtils.toBigInteger(CookieUtils.get(this, Consts.COOKIE_LOGINED_USER), null);
+		BigInteger uuUserId = getParaToBigInteger("uuUserId");
 
 		// 允许未登录用户评论
 		Boolean comment_allow_not_login = OptionQuery.me().findValueAsBool("comment_allow_not_login");
 
 		// 允许未登录用户评论
 		if (comment_allow_not_login == null || comment_allow_not_login == false) {
-			if (userId == null) {
+			//在不允许未登录用户评论，uuhelper只能在uuId和uuUserId都为空的情况下不准评论
+			if (userId == null && uuUserId == null) {
 				String redirect = Consts.ROUTER_USER_LOGIN;
 				if (StringUtils.isNotBlank(gotoUrl)) {
 					redirect += "?goto=" + StringUtils.urlEncode(gotoUrl);
@@ -105,7 +107,13 @@ public class CommentController extends BaseFrontController {
 			return;
 		}
 
+		String uuUserAvatar = getPara("uu_user_avatar");
+
 		String author = getPara("author");
+		if (userId == null && uuUserId != null) {
+			author = getPara("uuUserName");
+		}
+
 		String email = getPara("email");
 
 		String ip = getIPAddress();
@@ -141,6 +149,9 @@ public class CommentController extends BaseFrontController {
 		comment.setCreated(new Date());
 		comment.setParentId(parentId);
 
+		comment.setUuUserId(uuUserId);
+		comment.setUuUserAvatar(uuUserAvatar);
+
 		if (comment.save()) {
 			ActionCacheManager.clearCache();
 		}

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_uuhelper.html

@@ -221,13 +221,24 @@
             <div class="readCount"><div><span>阅读 <em>${content.view_count!'0'}</em></span><span> <img src="/jpress/static/jpress/admin/image/hands.png" alt=""><em>${content.vote_up!'0'}</em></span></div><p>${(content.getMetadataByKey("copy_right"))!}</p></div>
         </div>
         <div class="footer">
-            <div class="footer-header">
-                <div class="infoMessage"><span>写留言</span><img src="/jpress/static/jpress/admin/image/pen.png" alt=""></div>
-                <div class="writeMessage">
-                    <textarea name="" id="" cols="30" rows="10"></textarea>
-                    <div><a>提交留言</a></div>
-                </div>
-            </div>
+            <#if content.isCommentEnable() >
+                <form action="${CPATH}/comment/submit" method="post"  id="comment">
+                    <input type="hidden" name="cid" value="${(content.id)!}" >
+                    <input type="hidden" id="parent_id" name="parent_id" >
+                    <input type="hidden" name="uuUserId" value="${userid!}" >
+                    <input type="hidden" name="uuUserName" value="${username!}" >
+                    <input type="hidden" name="uuUserAvatar" value="${iconurl!}" >
+
+                    <div class="footer-header">
+                        <div class="infoMessage"><span>写留言</span><img src="/jpress/static/jpress/admin/image/pen.png" alt=""></div>
+                        <div class="writeMessage">
+                            <textarea name="text" id="" cols="30" rows="10"></textarea>
+                            <div><button type="submit">提交留言</div>
+                        </div>
+                    </div>
+                </form>
+            </#if>
+
             <div class="footer-section">
                 <@jp.commentPage pageSize="2">
                 <#if page ??>