From b5e2569d7c0cd84148fd0003f11badd95a7fc63b Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Thu, 4 Jan 2018 16:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/_t/layout.html | 33 ++++++++++++++----- root/jie/add.html | 15 +++++---- root/res/css/global.css | 2 +- root/res/mods/index.js | 2 +- src/com/lxyer/bbs/base/BaseService.java | 1 - src/com/lxyer/bbs/base/BaseServlet.java | 2 +- src/com/lxyer/bbs/base/EnjoyService.java | 26 --------------- src/com/lxyer/bbs/base/FileService.java | 4 +-- .../bbs/base/{bean => user}/LoginBean.java | 3 +- .../lxyer/bbs/base/{entity => user}/User.java | 3 +- .../bbs/base/{bean => user}/UserBean.java | 2 +- .../bbs/base/{bean => user}/UserInfo.java | 2 +- .../{service => base/user}/UserService.java | 12 +++---- .../bbs/{base/entity => comment}/Comment.java | 3 +- .../{base/bean => comment}/CommentInfo.java | 2 +- .../{service => comment}/CommentService.java | 10 +++--- .../bbs/{base/entity => content}/Content.java | 5 ++- .../{base/bean => content}/ContentBean.java | 2 +- .../{base/bean => content}/ContentInfo.java | 2 +- .../{service => content}/ContentService.java | 9 ++--- src/com/lxyer/bbs/servlet/IndexServlet.java | 12 ++++--- 21 files changed, 70 insertions(+), 82 deletions(-) delete mode 100644 src/com/lxyer/bbs/base/EnjoyService.java rename src/com/lxyer/bbs/base/{bean => user}/LoginBean.java (93%) rename src/com/lxyer/bbs/base/{entity => user}/User.java (98%) rename src/com/lxyer/bbs/base/{bean => user}/UserBean.java (97%) rename src/com/lxyer/bbs/base/{bean => user}/UserInfo.java (98%) rename src/com/lxyer/bbs/{service => base/user}/UserService.java (96%) rename src/com/lxyer/bbs/{base/entity => comment}/Comment.java (97%) rename src/com/lxyer/bbs/{base/bean => comment}/CommentInfo.java (98%) rename src/com/lxyer/bbs/{service => comment}/CommentService.java (96%) rename src/com/lxyer/bbs/{base/entity => content}/Content.java (96%) rename src/com/lxyer/bbs/{base/bean => content}/ContentBean.java (98%) rename src/com/lxyer/bbs/{base/bean => content}/ContentInfo.java (98%) rename src/com/lxyer/bbs/{service => content}/ContentService.java (97%) diff --git a/root/_t/layout.html b/root/_t/layout.html index d394e42..6536059 100644 --- a/root/_t/layout.html +++ b/root/_t/layout.html @@ -9,27 +9,40 @@ - #if(title)#(title) - #end优乐园社区 + #if(title)#(title) - #end Redbbs社区 - - + + + +
- @@ -79,7 +92,7 @@ #@main?()
-

优乐园社区 2017 © http://1216.top

+

Redbbs 2017 © http://1216.top

#define x()

付费计划 @@ -99,11 +112,13 @@

    -
  • 首页
    • +
  • 全部
  • 求助
  • 分享
    • +
  • 动态
    • diff --git a/root/jie/add.html b/root/jie/add.html index 5ec73a3..58cfc47 100644 --- a/root/jie/add.html +++ b/root/jie/add.html @@ -19,12 +19,15 @@
diff --git a/root/res/css/global.css b/root/res/css/global.css index ec29da9..00a399f 100644 --- a/root/res/css/global.css +++ b/root/res/css/global.css @@ -138,7 +138,7 @@ pre{padding: 10px 15px; margin: 10px 0; font-size: 12px; border-left: 6px solid /* 头部 */ .fly-header{position: fixed; left: 0; top: 0; z-index: 10000; width: 100%; height: 60px; border-bottom: 1px solid #404553; border-right: 1px solid #404553; border-radius: 0;} .fly-logo{position: absolute; left: 15px; top: 11px;} -.fly-nav{margin-left: 110px;} +.fly-nav{margin-left: 130px;} .fly-nav a i{position: absolute; left: 25px; top: 0; padding-right: 10px; font-size: 26px;} .fly-nav a .icon-shouye, .nav a .icon-shezhi{top: 2px;} diff --git a/root/res/mods/index.js b/root/res/mods/index.js index e8fb3e0..2cd737d 100644 --- a/root/res/mods/index.js +++ b/root/res/mods/index.js @@ -618,7 +618,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f //固定Bar util.fixbar({ bar1: '' - ,bgcolor: '#009688' + ,bgcolor: '#4a184c' ,click: function(type){ if(type === 'bar1'){ //layer.msg('打开 index.js，开启发表新帖的路径'); diff --git a/src/com/lxyer/bbs/base/BaseService.java b/src/com/lxyer/bbs/base/BaseService.java index 5ff8ba6..c7ad06e 100644 --- a/src/com/lxyer/bbs/base/BaseService.java +++ b/src/com/lxyer/bbs/base/BaseService.java @@ -12,7 +12,6 @@ import java.io.File; public class BaseService implements Service { protected final int sessionExpireSeconds = 30 * 60; - protected final int contentinfoExpireSeconds = 30 * 60; @Resource(name = "SERVER_ROOT") protected File webroot; diff --git a/src/com/lxyer/bbs/base/BaseServlet.java b/src/com/lxyer/bbs/base/BaseServlet.java index 89674ce..5151de3 100644 --- a/src/com/lxyer/bbs/base/BaseServlet.java +++ b/src/com/lxyer/bbs/base/BaseServlet.java @@ -3,7 +3,7 @@ package com.lxyer.bbs.base; import com.jfinal.kit.Kv; import com.jfinal.template.Engine; import com.jfinal.template.Template; -import com.lxyer.bbs.service.UserService; +import com.lxyer.bbs.base.user.UserService; import org.redkale.net.http.HttpContext; import org.redkale.net.http.HttpRequest; import org.redkale.net.http.HttpResponse; diff --git a/src/com/lxyer/bbs/base/EnjoyService.java b/src/com/lxyer/bbs/base/EnjoyService.java deleted file mode 100644 index 97545cb..0000000 --- a/src/com/lxyer/bbs/base/EnjoyService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lxyer.bbs.base; - -import com.jfinal.template.Engine; -import org.redkale.net.http.RestService; -import org.redkale.service.Service; -import org.redkale.util.AnyValue; - -import javax.annotation.Resource; -import java.io.File; - -/** - * Created by Lxy at 2017/10/1 8:41. - */ -@RestService(automapping = false) -public class EnjoyService extends Engine implements Service { - @Resource(name = "SERVER_ROOT") - protected File webroot; - - @Override - public void init(AnyValue config) { - setBaseTemplatePath(webroot.getPath()); - - addSharedObject("EJ", new EJ()); - addSharedFunction("/_t/layout.html"); - } -} diff --git a/src/com/lxyer/bbs/base/FileService.java b/src/com/lxyer/bbs/base/FileService.java index bfcb28a..7852209 100644 --- a/src/com/lxyer/bbs/base/FileService.java +++ b/src/com/lxyer/bbs/base/FileService.java @@ -16,8 +16,8 @@ import java.nio.file.StandardCopyOption; @RestService(automapping = true, comment = "文件服务") public class FileService extends BaseService { - private static final String dir = "/var/www/upload/bbs/"; - private static final String view = "http://img.1216.top/bbs/"; + private static final String dir = "/var/www/upload/redbbs/"; + private static final String view = "http://img.1216.top/redbbs/"; private static final String format = "%1$tY%1$tm%1$td%1$tH%1$tM%1$tS"; @RestMapping(name = "upload", comment = "文件上传") diff --git a/src/com/lxyer/bbs/base/bean/LoginBean.java b/src/com/lxyer/bbs/base/user/LoginBean.java similarity index 93% rename from src/com/lxyer/bbs/base/bean/LoginBean.java rename to src/com/lxyer/bbs/base/user/LoginBean.java index 3dbc803..8315f6c 100644 --- a/src/com/lxyer/bbs/base/bean/LoginBean.java +++ b/src/com/lxyer/bbs/base/user/LoginBean.java @@ -1,6 +1,5 @@ -package com.lxyer.bbs.base.bean; +package com.lxyer.bbs.base.user; -import com.lxyer.bbs.base.entity.User; import org.redkale.net.http.RestSessionid; import org.redkale.source.FilterBean; import org.redkale.util.Comment; diff --git a/src/com/lxyer/bbs/base/entity/User.java b/src/com/lxyer/bbs/base/user/User.java similarity index 98% rename from src/com/lxyer/bbs/base/entity/User.java rename to src/com/lxyer/bbs/base/user/User.java index 9175bc0..d1d4bd4 100644 --- a/src/com/lxyer/bbs/base/entity/User.java +++ b/src/com/lxyer/bbs/base/user/User.java @@ -1,6 +1,5 @@ -package com.lxyer.bbs.base.entity; +package com.lxyer.bbs.base.user; -import com.lxyer.bbs.base.bean.UserInfo; import org.redkale.convert.ConvertColumn; import org.redkale.convert.ConvertType; import org.redkale.convert.json.JsonConvert; diff --git a/src/com/lxyer/bbs/base/bean/UserBean.java b/src/com/lxyer/bbs/base/user/UserBean.java similarity index 97% rename from src/com/lxyer/bbs/base/bean/UserBean.java rename to src/com/lxyer/bbs/base/user/UserBean.java index 968e2cb..7f33a58 100644 --- a/src/com/lxyer/bbs/base/bean/UserBean.java +++ b/src/com/lxyer/bbs/base/user/UserBean.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.bean; +package com.lxyer.bbs.base.user; import org.redkale.source.FilterBean; diff --git a/src/com/lxyer/bbs/base/bean/UserInfo.java b/src/com/lxyer/bbs/base/user/UserInfo.java similarity index 98% rename from src/com/lxyer/bbs/base/bean/UserInfo.java rename to src/com/lxyer/bbs/base/user/UserInfo.java index 090596a..ebca9cb 100644 --- a/src/com/lxyer/bbs/base/bean/UserInfo.java +++ b/src/com/lxyer/bbs/base/user/UserInfo.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.bean; +package com.lxyer.bbs.base.user; import org.redkale.convert.ConvertColumn; import org.redkale.convert.ConvertType; diff --git a/src/com/lxyer/bbs/service/UserService.java b/src/com/lxyer/bbs/base/user/UserService.java similarity index 96% rename from src/com/lxyer/bbs/service/UserService.java rename to src/com/lxyer/bbs/base/user/UserService.java index d67e97b..02150df 100644 --- a/src/com/lxyer/bbs/service/UserService.java +++ b/src/com/lxyer/bbs/base/user/UserService.java @@ -1,12 +1,12 @@ -package com.lxyer.bbs.service; +package com.lxyer.bbs.base.user; import com.lxyer.bbs.base.BaseService; import com.lxyer.bbs.base.LxyKit; import com.lxyer.bbs.base.RetCodes; -import com.lxyer.bbs.base.bean.LoginBean; -import com.lxyer.bbs.base.bean.UserBean; -import com.lxyer.bbs.base.bean.UserInfo; -import com.lxyer.bbs.base.entity.User; +import com.lxyer.bbs.base.user.LoginBean; +import com.lxyer.bbs.base.user.UserBean; +import com.lxyer.bbs.base.user.UserInfo; +import com.lxyer.bbs.base.user.User; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; @@ -20,8 +20,6 @@ import org.redkale.util.SelectColumn; import org.redkale.util.Sheet; import javax.annotation.Resource; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Objects; import java.util.Random; diff --git a/src/com/lxyer/bbs/base/entity/Comment.java b/src/com/lxyer/bbs/comment/Comment.java similarity index 97% rename from src/com/lxyer/bbs/base/entity/Comment.java rename to src/com/lxyer/bbs/comment/Comment.java index 6642009..1c42c6e 100644 --- a/src/com/lxyer/bbs/base/entity/Comment.java +++ b/src/com/lxyer/bbs/comment/Comment.java @@ -1,7 +1,6 @@ -package com.lxyer.bbs.base.entity; +package com.lxyer.bbs.comment; import com.lxyer.bbs.base.LxyKit; -import com.lxyer.bbs.base.bean.CommentInfo; import org.redkale.convert.json.JsonConvert; import javax.persistence.*; diff --git a/src/com/lxyer/bbs/base/bean/CommentInfo.java b/src/com/lxyer/bbs/comment/CommentInfo.java similarity index 98% rename from src/com/lxyer/bbs/base/bean/CommentInfo.java rename to src/com/lxyer/bbs/comment/CommentInfo.java index 74ad1cf..fbf3178 100644 --- a/src/com/lxyer/bbs/base/bean/CommentInfo.java +++ b/src/com/lxyer/bbs/comment/CommentInfo.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.bean; +package com.lxyer.bbs.comment; import org.redkale.convert.json.JsonConvert; diff --git a/src/com/lxyer/bbs/service/CommentService.java b/src/com/lxyer/bbs/comment/CommentService.java similarity index 96% rename from src/com/lxyer/bbs/service/CommentService.java rename to src/com/lxyer/bbs/comment/CommentService.java index 4b677f3..9e55f1c 100644 --- a/src/com/lxyer/bbs/service/CommentService.java +++ b/src/com/lxyer/bbs/comment/CommentService.java @@ -1,12 +1,11 @@ -package com.lxyer.bbs.service; +package com.lxyer.bbs.comment; import com.lxyer.bbs.base.BaseService; import com.lxyer.bbs.base.RetCodes; -import com.lxyer.bbs.base.bean.CommentInfo; import com.lxyer.bbs.base.entity.ActLog; -import com.lxyer.bbs.base.entity.Comment; -import com.lxyer.bbs.base.entity.Content; -import com.lxyer.bbs.base.entity.User; +import com.lxyer.bbs.content.Content; +import com.lxyer.bbs.base.user.User; +import com.lxyer.bbs.base.user.UserService; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; @@ -22,7 +21,6 @@ import java.util.List; import java.util.Map; import static com.lxyer.bbs.base.RetCodes.*; -import static java.util.Arrays.asList; /** * Created by Lxy at 2017/11/29 10:00. diff --git a/src/com/lxyer/bbs/base/entity/Content.java b/src/com/lxyer/bbs/content/Content.java similarity index 96% rename from src/com/lxyer/bbs/base/entity/Content.java rename to src/com/lxyer/bbs/content/Content.java index 92c6e4a..3b1c0c2 100644 --- a/src/com/lxyer/bbs/base/entity/Content.java +++ b/src/com/lxyer/bbs/content/Content.java @@ -1,8 +1,7 @@ -package com.lxyer.bbs.base.entity; +package com.lxyer.bbs.content; import com.jfinal.kit.Kv; import com.lxyer.bbs.base.LxyKit; -import com.lxyer.bbs.base.bean.ContentInfo; import org.redkale.convert.json.JsonConvert; import javax.persistence.*; @@ -177,7 +176,7 @@ public class Content implements java.io.Serializable { return JsonConvert.root().convertTo(this); } - private static final Kv types = Kv.by(10, "求助").set(20, "分享").set(30, "建议").set(40, "公告").set(50, "动态"); + private static final Kv types = Kv.by(10, "求助").set(20, "分享").set(30, "讨论").set(40, "公告").set(50, "动态"); public ContentInfo createContentInfo(){ ContentInfo info = new ContentInfo(); info.setContentId(contentId); diff --git a/src/com/lxyer/bbs/base/bean/ContentBean.java b/src/com/lxyer/bbs/content/ContentBean.java similarity index 98% rename from src/com/lxyer/bbs/base/bean/ContentBean.java rename to src/com/lxyer/bbs/content/ContentBean.java index 984d6bb..f320207 100644 --- a/src/com/lxyer/bbs/base/bean/ContentBean.java +++ b/src/com/lxyer/bbs/content/ContentBean.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.bean; +package com.lxyer.bbs.content; import org.redkale.convert.json.JsonConvert; import org.redkale.source.FilterBean; diff --git a/src/com/lxyer/bbs/base/bean/ContentInfo.java b/src/com/lxyer/bbs/content/ContentInfo.java similarity index 98% rename from src/com/lxyer/bbs/base/bean/ContentInfo.java rename to src/com/lxyer/bbs/content/ContentInfo.java index 4d35c06..85633f7 100644 --- a/src/com/lxyer/bbs/base/bean/ContentInfo.java +++ b/src/com/lxyer/bbs/content/ContentInfo.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.bean; +package com.lxyer.bbs.content; import java.io.Serializable; diff --git a/src/com/lxyer/bbs/service/ContentService.java b/src/com/lxyer/bbs/content/ContentService.java similarity index 97% rename from src/com/lxyer/bbs/service/ContentService.java rename to src/com/lxyer/bbs/content/ContentService.java index 6fd112e..8da1b1a 100644 --- a/src/com/lxyer/bbs/service/ContentService.java +++ b/src/com/lxyer/bbs/content/ContentService.java @@ -1,12 +1,13 @@ -package com.lxyer.bbs.service; +package com.lxyer.bbs.content; import com.lxyer.bbs.base.BaseService; import com.lxyer.bbs.base.LxyKit; import com.lxyer.bbs.base.RetCodes; -import com.lxyer.bbs.base.bean.ContentInfo; +import com.lxyer.bbs.base.user.UserService; +import com.lxyer.bbs.content.ContentInfo; import com.lxyer.bbs.base.entity.ActLog; -import com.lxyer.bbs.base.entity.Content; -import com.lxyer.bbs.base.entity.User; +import com.lxyer.bbs.content.Content; +import com.lxyer.bbs.base.user.User; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; diff --git a/src/com/lxyer/bbs/servlet/IndexServlet.java b/src/com/lxyer/bbs/servlet/IndexServlet.java index 7ba574b..c53a1e8 100644 --- a/src/com/lxyer/bbs/servlet/IndexServlet.java +++ b/src/com/lxyer/bbs/servlet/IndexServlet.java @@ -2,10 +2,14 @@ package com.lxyer.bbs.servlet; import com.jfinal.kit.Kv; import com.lxyer.bbs.base.BaseServlet; -import com.lxyer.bbs.base.bean.*; -import com.lxyer.bbs.base.entity.User; -import com.lxyer.bbs.service.CommentService; -import com.lxyer.bbs.service.ContentService; +import com.lxyer.bbs.base.user.User; +import com.lxyer.bbs.base.user.UserBean; +import com.lxyer.bbs.base.user.UserInfo; +import com.lxyer.bbs.comment.CommentInfo; +import com.lxyer.bbs.content.ContentBean; +import com.lxyer.bbs.content.ContentInfo; +import com.lxyer.bbs.comment.CommentService; +import com.lxyer.bbs.content.ContentService; import org.redkale.net.http.*; import org.redkale.source.FilterExpress; import org.redkale.source.FilterNode;