调整包结构

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;

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;

src/com/lxyer/bbs/base/EnjoyService.java

@@ -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");
-    }
-}

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 = "文件上传")

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;

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;

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;
 

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;

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;

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.*;

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;
 

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.

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);

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;

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;
 

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;

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;