整理代码结构

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

@@ -1,7 +1,10 @@
 package com.lxyer.bbs.base;
 
+import com.lxyer.bbs.base.user.UserInfo;
 import org.redkale.service.Service;
+import org.redkale.source.CacheSource;
 import org.redkale.source.DataSource;
+import org.redkalex.cache.RedisCacheSource;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -19,6 +22,12 @@ public class BaseService implements Service {
     @Resource(name = "art123")
     protected DataSource source;
 
+    @Resource(name = "redis")
+    protected RedisCacheSource<Integer> sessions;
+
+    @Resource(name = "userInfos")
+    protected CacheSource<UserInfo> userInfos;
+
     protected static final boolean winos = System.getProperty("os.name").contains("Window");
 
 }

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

@@ -3,8 +3,12 @@ package com.lxyer.bbs.base;
 import com.jfinal.kit.Kv;
 import com.jfinal.template.Engine;
 import com.jfinal.template.Template;
+import com.lxyer.bbs.base.kit.EJ;
+import com.lxyer.bbs.base.kit.RetCodes;
 import com.lxyer.bbs.base.user.UserInfo;
 import com.lxyer.bbs.base.user.UserService;
+import com.lxyer.bbs.comment.CommentService;
+import com.lxyer.bbs.content.ContentService;
 import org.redkale.net.http.HttpContext;
 import org.redkale.net.http.HttpRequest;
 import org.redkale.net.http.HttpResponse;
@@ -17,12 +21,20 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 
-import static com.lxyer.bbs.base.RetCodes.RET_USER_UNLOGIN;
+import static com.lxyer.bbs.base.kit.RetCodes.RET_USER_UNLOGIN;
 
 /**
  * Created by Lxy at 2017/10/3 13:39.
  */
 public class BaseServlet extends HttpServlet {
+    private HttpRequest request;
+    private HttpResponse response;
+    private static final Kv _kv = Kv.create();
+    private static Engine engine;
+    protected String sessionid;
+    protected int currentId;//登录人id
+
+    protected static final boolean winos = System.getProperty("os.name").contains("Window");
 
     @Resource(name = "SERVER_ROOT")
     protected File webroot;
@@ -35,11 +47,12 @@ public class BaseServlet extends HttpServlet {
     /*@Resource(name = "redis")
     protected RedisCacheSource<String> cache;*/
 
-    private HttpRequest request;
-    private HttpResponse response;
-    private static final Kv _kv = Kv.create();
-    private static Engine engine;
-    protected String sessionid;
+    @Resource
+    protected ContentService contentService;
+
+    @Resource
+    protected CommentService commentService;
+
 
     @Override
     public void init(HttpContext context, AnyValue config) {
@@ -56,6 +69,7 @@ public class BaseServlet extends HttpServlet {
         sessionid = request.getSessionid(false);
         if (sessionid != null) {
             request.setCurrentUser(userService.current(sessionid));
+            currentId = userService.currentUserId(sessionid);
             _kv.set("mine", request.currentUser());
         }
 
@@ -171,8 +185,4 @@ public class BaseServlet extends HttpServlet {
 
         return node;
     }
-    protected int currentId(){
-        UserInfo userInfo = request.currentUser();
-        return userInfo == null ? 0 : userInfo.getUserId();
-    }
 }

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

@@ -2,6 +2,7 @@ package com.lxyer.bbs.base;
 
 import com.jfinal.template.Engine;
 import com.jfinal.template.Template;
+import com.lxyer.bbs.base.kit.EJ;
 import org.redkale.convert.Convert;
 import org.redkale.net.http.*;
 import org.redkale.util.AnyValue;

src/com/lxyer/bbs/base/kit/EJ.java

@@ -1,4 +1,4 @@
-package com.lxyer.bbs.base;
+package com.lxyer.bbs.base.kit;
 
 import org.redkale.net.http.RestService;
 

src/com/lxyer/bbs/base/kit/LxyKit.java

@@ -1,4 +1,4 @@
-package com.lxyer.bbs.base;
+package com.lxyer.bbs.base.kit;
 
 import java.text.SimpleDateFormat;
 import java.util.regex.Matcher;

src/com/lxyer/bbs/base/kit/RetCodes.java

@@ -1,4 +1,4 @@
-package com.lxyer.bbs.base;
+package com.lxyer.bbs.base.kit;
 
 import org.redkale.service.RetLabel;
 import org.redkale.service.RetResult;

src/com/lxyer/bbs/base/user/UserService.java

@@ -1,8 +1,8 @@
 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.kit.LxyKit;
+import com.lxyer.bbs.base.kit.RetCodes;
 import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
@@ -11,14 +11,12 @@ import org.redkale.service.RetResult;
 import org.redkale.source.*;
 import org.redkale.util.SelectColumn;
 import org.redkale.util.Sheet;
-import org.redkalex.cache.RedisCacheSource;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Random;
 
-import static com.lxyer.bbs.base.RetCodes.*;
+import static com.lxyer.bbs.base.kit.RetCodes.*;
 
 /**
  * Created by Lxy at 2017/10/3 14:02.
@@ -26,12 +24,6 @@ import static com.lxyer.bbs.base.RetCodes.*;
 @RestService(automapping = true, comment = "用户服务")
 public class UserService extends BaseService {
 
-    @Resource(name = "redis")
-    protected RedisCacheSource<Integer> sessions;
-
-    @Resource
-    protected CacheSource<UserInfo> userInfos;
-
     @RestMapping(auth = false, comment = "登录校验")
     public RetResult<UserInfo> login(@RestParam(name = "bean") LoginBean loginBean){
         if (loginBean == null || loginBean.emptyUsername()) return RetCodes.retResult(RetCodes.RET_PARAMS_ILLEGAL, "参数错误");
@@ -47,7 +39,7 @@ public class UserService extends BaseService {
         //log(user, 0, "用户登录成功.");
         UserInfo userInfo = user.createUserInfo();
 
-        this.sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), userInfo.getUserId());
+        sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), userInfo.getUserId());
         retResult.setRetcode(0);
         retResult.setResult(userInfo);
         retResult.setRetinfo("登录成功.");