diff --git a/lib/redkale.jar b/lib/redkale.jar index eee0c2e..b66f7e0 100644 Binary files a/lib/redkale.jar and b/lib/redkale.jar differ diff --git a/root/index.html b/root/index.html index 8710d38..40ca598 100644 --- a/root/index.html +++ b/root/index.html @@ -19,7 +19,13 @@

#(x.typeName) - #(x.title) + + #if(x.top == 3) + #(x.title) + #else + #(x.title) + #end +

@@ -34,6 +40,7 @@ 已结 --> + #(x.viewNum??0) #(x.replyNum??0)
@@ -90,6 +97,7 @@ 已结 --> + #(x.viewNum??0) #(x.replyNum??0) diff --git a/root/res/mods/index.js b/root/res/mods/index.js index bb93334..ac7f9ec 100644 --- a/root/res/mods/index.js +++ b/root/res/mods/index.js @@ -254,7 +254,17 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f var E = window.wangEditor; var editor = new E('#editor'); editor.customConfig.uploadImgServer = '/upload/img'; - editor.create() + + var cache_key = "content_" + $("input[name='contentId']").val(); + var html = localStorage.getItem(cache_key); + + editor.customConfig.onblur = function (html) { + localStorage.setItem(cache_key, html); + }; + + editor.create(); + + if (html) editor.txt.html(html);//缓存的内容 return editor; } @@ -319,11 +329,11 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f return arguments.callee; } - ,userstat: function () { + /*,userstat: function () { $.getJSON("/os/user/stat",{},function (data) { $("#user_count").html(data.count); }); - } + }*/ }; diff --git a/root/res/mods/jie.js b/root/res/mods/jie.js index b774380..4475adc 100644 --- a/root/res/mods/jie.js +++ b/root/res/mods/jie.js @@ -247,7 +247,9 @@ layui.define(['fly','laypage'], function(exports){ bean:JSON.stringify(bean) },function (res) { layer.msg("发布成功",{time:2000},function () { - location.href = "/"; + var cache_key = "content_" + $("input[name='contentId']").val(); + localStorage.removeItem(cache_key); + location.href = "/user"; }); }); return false; //阻止表单跳转。如果需要表单跳转,去掉这段即可。 diff --git a/root/res/mods/user.js b/root/res/mods/user.js index 7463ddf..763b321 100644 --- a/root/res/mods/user.js +++ b/root/res/mods/user.js @@ -288,7 +288,8 @@ layui.define(['laypage', 'fly', 'element', 'flow'], function(exports){ bean:JSON.stringify({username:fdata.username, password:fdata.password}) ,vercode:fdata.vercode },function (data) { - data = JSON.parse(data); + console.log(data); + //data = JSON.parse(data); if(data.retcode != 0){ layer.msg(data.retinfo); return false; diff --git a/src/com/lxyer/bbs/comment/CommentService.java b/src/com/lxyer/bbs/comment/CommentService.java index 9e55f1c..762f9fc 100644 --- a/src/com/lxyer/bbs/comment/CommentService.java +++ b/src/com/lxyer/bbs/comment/CommentService.java @@ -1,11 +1,12 @@ package com.lxyer.bbs.comment; import com.lxyer.bbs.base.BaseService; +import com.lxyer.bbs.base.LxyKit; import com.lxyer.bbs.base.RetCodes; import com.lxyer.bbs.base.entity.ActLog; -import com.lxyer.bbs.content.Content; import com.lxyer.bbs.base.user.User; import com.lxyer.bbs.base.user.UserService; +import com.lxyer.bbs.content.Content; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; @@ -20,7 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static com.lxyer.bbs.base.RetCodes.*; +import static com.lxyer.bbs.base.RetCodes.RET_COMMENT_CONTENT_ILLEGAL; +import static com.lxyer.bbs.base.RetCodes.RET_COMMENT_PARA_ILLEGAL; /** * Created by Lxy at 2017/11/29 10:00. diff --git a/src/com/lxyer/bbs/content/ContentService.java b/src/com/lxyer/bbs/content/ContentService.java index 4676062..f02e4cb 100644 --- a/src/com/lxyer/bbs/content/ContentService.java +++ b/src/com/lxyer/bbs/content/ContentService.java @@ -4,12 +4,10 @@ import com.jfinal.kit.Kv; import com.lxyer.bbs.base.BaseService; import com.lxyer.bbs.base.LxyKit; import com.lxyer.bbs.base.RetCodes; +import com.lxyer.bbs.base.entity.ActLog; +import com.lxyer.bbs.base.user.User; import com.lxyer.bbs.base.user.UserInfo; import com.lxyer.bbs.base.user.UserService; -import com.lxyer.bbs.content.ContentInfo; -import com.lxyer.bbs.base.entity.ActLog; -import com.lxyer.bbs.content.Content; -import com.lxyer.bbs.base.user.User; import org.redkale.net.http.*; import org.redkale.service.RetResult; import org.redkale.source.*; @@ -89,6 +87,11 @@ public class ContentService extends BaseService{ @RestMapping(name = "save", auth = true, comment = "内容保存") public RetResult contentSave(@RestParam(name = "bean")Content content, @RestSessionid String sessionid){ + //数据校验 + if (content.getTitle().isEmpty() || content.getTitle().length() > 64){ + return RetCodes.retResult(-1, "少年你的文章标题太长啦,精简化标题吧,为了更好的SEO长度请少于64个字节"); + } + if (content.getContentId() < 1){ int maxId = source.getNumberResult(Content.class, FilterFunc.MAX, 10_0000, "contentId").intValue(); int userId = userService.currentUserId(sessionid);