fix: base controller and base service

Author: easepan

src/main/java/org/code4everything/boot/service/impl/BaseServiceImpl.java

@@ -1,27 +1,22 @@
 package org.code4everything.boot.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import org.code4everything.boot.service.BootBaseService;
-import org.code4everything.boot.service.BootUserService;
 import org.code4everything.boot.web.http.HttpUtils;
-import org.code4everything.boot.web.mvc.AssertUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Objects;
 
 /**
+ * 服务基类
+ *
  * @author pantao
  * @since 2019/6/11
  **/
-public class BaseServiceImpl<U> implements BootBaseService {
+public class BaseServiceImpl implements BootBaseService {
 
     @Resource
     public HttpServletRequest request;
 
-    @Resource
-    protected BootUserService<U> userService;
-
     /**
      * 只能继承
      *
@@ -33,13 +28,11 @@ protected BaseServiceImpl() {}
      * 创建对象
      *
      * @param request {@link HttpServletRequest}
-     * @param userService {@link BootUserService}
      *
      * @since 1.1.3
      */
-    public BaseServiceImpl(HttpServletRequest request, BootUserService<U> userService) {
+    public BaseServiceImpl(HttpServletRequest request) {
         this.request = request;
-        this.userService = userService;
     }
 
     @Override
@@ -53,14 +46,12 @@ public String getToken(boolean require) {
     }
 
     @Override
-    public U getUser() {
+    public Object getUser() {
         return getUser(true);
     }
 
     @Override
-    public U getUser(boolean require) {
-        Objects.requireNonNull(userService, "please set interface 'BootUserService<T>'");
-        U user = userService.getUserByToken(StrUtil.nullToEmpty(getToken(require)));
-        return require ? AssertUtils.assertUserLoggedIn(user) : user;
+    public Object getUser(boolean require) {
+        throw new RuntimeException("if you want to get user directly, please use class 'BaseSignServiceImpl'");
     }
 }

src/main/java/org/code4everything/boot/service/impl/BaseSignServiceImpl.java

@@ -0,0 +1,53 @@
+package org.code4everything.boot.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import org.code4everything.boot.service.BootUserService;
+import org.code4everything.boot.web.mvc.AssertUtils;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * 可获取用户的服务基类
+ *
+ * @author pantao
+ * @since 2019/6/19
+ **/
+public class BaseSignServiceImpl<U> extends BaseServiceImpl {
+
+    @Resource
+    protected BootUserService<U> userService;
+
+    /**
+     * 只能继承
+     *
+     * @since 1.1.4
+     */
+    protected BaseSignServiceImpl() {}
+
+    /**
+     * 创建对象
+     *
+     * @param request {@link HttpServletRequest}
+     * @param userService {@link BootUserService}
+     *
+     * @since 1.1.3
+     */
+    public BaseSignServiceImpl(HttpServletRequest request, BootUserService<U> userService) {
+        super(request);
+        this.userService = userService;
+    }
+
+    @Override
+    public U getUser(boolean require) {
+        Objects.requireNonNull(userService, "please set interface 'BootUserService<T>'");
+        U user = userService.getUserByToken(StrUtil.nullToEmpty(getToken(require)));
+        return require ? AssertUtils.assertUserLoggedIn(user) : user;
+    }
+
+    @Override
+    public U getUser() {
+        return getUser(true);
+    }
+}

src/main/java/org/code4everything/boot/web/mvc/BaseController.java

@@ -1,10 +1,8 @@
 package org.code4everything.boot.web.mvc;
 
 import cn.hutool.core.collection.CollUtil;
-import com.google.common.base.Strings;
 import org.code4everything.boot.base.constant.MessageConsts;
 import org.code4everything.boot.config.BootConfig;
-import org.code4everything.boot.service.BootUserService;
 import org.code4everything.boot.web.http.HttpUtils;
 import org.code4everything.boot.web.mvc.exception.ExceptionBiscuit;
 import org.springframework.http.HttpEntity;
@@ -23,7 +21,7 @@
  * @author pantao
  * @since 2018/11/2
  **/
-public class BaseController<U> {
+public class BaseController {
 
     private static final int DEFAULT_ERROR_CODE = BootConfig.DEFAULT_ERROR_CODE;
 
@@ -32,12 +30,6 @@ public class BaseController<U> {
     @Resource
     public HttpServletRequest request;
 
-    /**
-     * @since 1.1.2
-     */
-    @Resource
-    private BootUserService<U> userService;
-
     /**
      * 只允许继承
      *
@@ -49,13 +41,11 @@ protected BaseController() {}
      * 创建对象
      *
      * @param request {@link HttpServletRequest}
-     * @param userService {@link BootUserService}
      *
      * @since 1.1.3
      */
-    public BaseController(HttpServletRequest request, BootUserService<U> userService) {
+    public BaseController(HttpServletRequest request) {
         this.request = request;
-        this.userService = userService;
     }
 
     /**
@@ -184,42 +174,6 @@ public String getToken(String tokenKey) {
         return HttpUtils.getToken(tokenKey, request);
     }
 
-    /**
-     * 获取用户
-     *
-     * @return 用户
-     *
-     * @since 1.0.4
-     */
-    public U getUser() {
-        return getUser(Strings.nullToEmpty(getToken()));
-    }
-
-    /**
-     * 获取用户
-     *
-     * @param token 令牌
-     *
-     * @return 用户
-     *
-     * @since 1.1.3
-     */
-    public U getUser(String token) {
-        Objects.requireNonNull(userService, "please implementation interface 'BootUserService<T>'");
-        return userService.getUserByToken(token);
-    }
-
-    /**
-     * 获取用户
-     *
-     * @return 用户
-     *
-     * @since 1.0.4
-     */
-    public U requireUser() {
-        return AssertUtils.assertUserLoggedIn(getUser(requireToken()));
-    }
-
     /**
      * 获取Token
      *

src/main/java/org/code4everything/boot/web/mvc/BaseSignController.java

@@ -0,0 +1,79 @@
+package org.code4everything.boot.web.mvc;
+
+import com.google.common.base.Strings;
+import org.code4everything.boot.service.BootUserService;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * 可获取用户信息的控制器基类
+ *
+ * @author pantao
+ * @since 2019/6/19
+ **/
+public class BaseSignController<U> extends BaseController {
+
+    /**
+     * @since 1.1.4
+     */
+    @Resource
+    private BootUserService<U> userService;
+
+    /**
+     * 只能继承
+     *
+     * @since 1.1.4
+     */
+    protected BaseSignController() {}
+
+    /**
+     * 创建对象
+     *
+     * @param request {@link HttpServletRequest}
+     * @param userService {@link BootUserService}
+     *
+     * @since 1.1.4
+     */
+    public BaseSignController(HttpServletRequest request, BootUserService<U> userService) {
+        super(request);
+        this.userService = userService;
+    }
+
+    /**
+     * 获取用户
+     *
+     * @param token 令牌
+     *
+     * @return 用户
+     *
+     * @since 1.1.4
+     */
+    public U getUser(String token) {
+        Objects.requireNonNull(userService, "please implementation interface 'BootUserService<U>'");
+        return userService.getUserByToken(token);
+    }
+
+    /**
+     * 获取用户
+     *
+     * @return 用户
+     *
+     * @since 1.1.4
+     */
+    public U getUser() {
+        return getUser(Strings.nullToEmpty(getToken()));
+    }
+
+    /**
+     * 获取用户
+     *
+     * @return 用户
+     *
+     * @since 1.1.4
+     */
+    public U requireUser() {
+        return AssertUtils.assertUserLoggedIn(getUser(requireToken()));
+    }
+}