把user-server的内容移到sys-server

api-server/src/main/java/com/zq/api/interceptor/ApiInterceptor.java

@@ -22,10 +22,9 @@ public class ApiInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String uri = request.getRequestURI();
-        String queryString = request.getQueryString();
-        System.out.println("get URI = " + request.getRequestURL());
-        System.out.println("get queryString = " + queryString);
+        String ip = ServletUtil.getClientIP(request);
+
+        log.debug("{}请求URI: {}", ip, request.getRequestURL());
 
         long start = System.currentTimeMillis();
 
@@ -39,7 +38,6 @@ public class ApiInterceptor extends HandlerInterceptorAdapter {
         }
 
         // 黑名单
-        String ip = ServletUtil.getClientIP(request);
         String blackIps = ConfigCache.getValue("API.IP.BLACK");
         if (StrUtil.isNotBlank(ip) && StrUtil.isNotBlank(blackIps)) {
             List<String> ipList = Arrays.asList(blackIps.split(","));
@@ -69,7 +67,7 @@ public class ApiInterceptor extends HandlerInterceptorAdapter {
 
         // 调试日志
         if (ApiUtils.DEBUG) {
-            log.info("API DEBUG INTERCEPTOR \n[path=" + uri + "/" + queryString + "]" //
+            log.info("API DEBUG INTERCEPTOR \n[path=" + request.getRequestURI() + "/" + request.getQueryString() + "]"
                     + "[from:" + form + "]" //
                     + "\n[time=" + (System.currentTimeMillis() - start) + "ms]");
         }

sys-server/src/main/java/com/zq/system/SysApplication.java

@@ -17,6 +17,7 @@ package com.zq.system;
 
 import com.zq.common.annotation.rest.AnonymousGetMapping;
 import io.swagger.annotations.Api;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Zheng Jie
  * @date 2018/11/15 9:20:19
  */
+@MapperScan("com.zq.system.modules.system.dao")
 @EnableAsync
 @RestController
 @Api(hidden = true)

sys-server/src/main/java/com/zq/system/exception/handler/GlobalExceptionHandler.java

@@ -15,11 +15,14 @@
  */
 package com.zq.system.exception.handler;
 
+import com.zq.common.exception.BusinessException;
+import com.zq.common.utils.ThrowableUtil;
+import com.zq.common.vo.ResultVo;
 import com.zq.system.exception.BadRequestException;
 import com.zq.system.exception.EntityExistException;
 import com.zq.system.exception.EntityNotFoundException;
-import com.zq.common.utils.ThrowableUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -27,6 +30,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 
 import static org.springframework.http.HttpStatus.NOT_FOUND;
@@ -49,6 +53,18 @@ public class GlobalExceptionHandler {
         return buildResponseEntity(ApiError.error(e.getMessage()));
     }
 
+    @ExceptionHandler(BusinessException.class)
+    public ResultVo handleBusinessException(BusinessException ex, HttpServletRequest request) {
+        log.info(">> business exception: {}, {}, {}", request.getRequestURI(), ex.getCode(), ex.getMessage());
+        String errMessage = ex.getMessage();
+        // 防止空的错误信息
+        if (StringUtils.isBlank(errMessage)) {
+            errMessage = "服务器繁忙";
+            log.warn(">> 空的业务错误信息", ex);
+        }
+        return ResultVo.fail(ex.getCode(), errMessage);
+    }
+
     /**
      * BadCredentialsException
      */

sys-server/src/main/java/com/zq/system/modules/system/repository/AppVersionDao.java → sys-server/src/main/java/com/zq/system/modules/system/dao/AppVersionDao.java

-package com.zq.system.modules.system.repository;
+package com.zq.system.modules.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zq.common.entity.AppVersion;

sys-server/src/main/java/com/zq/system/modules/system/repository/PfuserDao.java → sys-server/src/main/java/com/zq/system/modules/system/dao/PfuserDao.java

-package com.zq.system.modules.system.repository;
+package com.zq.system.modules.system.dao;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

sys-server/src/main/java/com/zq/system/modules/system/rest/app/AppUserController.java

 package com.zq.system.modules.system.rest.app;
 
 
+import com.zq.common.annotation.AnonymousAccess;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.ValidateUtil;
 import com.zq.common.vo.ApiTokenVo;
@@ -24,6 +25,7 @@ public class AppUserController {
 
     private final UserService userService;
 
+    @AnonymousAccess
     @ApiOperation("发送验证码")
     @GetMapping(value = "/sendCode")
     public ResultVo sendCode(String phone) {
@@ -33,6 +35,7 @@ public class AppUserController {
         return ResultVo.success();
     }
 
+    @AnonymousAccess
     @ApiOperation("重置登录密码")
     @PostMapping(value = "/resetPassword")
     public ResultVo resetPassword(@RequestBody LoginVo vo) {
@@ -43,6 +46,7 @@ public class AppUserController {
         return ResultVo.success();
     }
 
+    @AnonymousAccess
     @ApiOperation("修改登录密码")
     @PostMapping(value = "/modifyPasswd")
     public ResultVo modifyPasswd(@RequestBody LoginVo vo) {
@@ -54,6 +58,7 @@ public class AppUserController {
         return ResultVo.success();
     }
 
+    @AnonymousAccess
     @ApiOperation("手机号登录")
     @PostMapping(value = "/phoneLogin")
     public ResultVo<ApiTokenVo> phoneLogin(@RequestBody LoginVo vo) {
@@ -62,6 +67,7 @@ public class AppUserController {
         return ResultVo.success(userService.phoneLogin(vo));
     }
 
+    @AnonymousAccess
     @ApiOperation("密码登录")
     @PostMapping(value = "/passwdLogin")
     public ResultVo<ApiTokenVo> passwdLogin(@RequestBody LoginVo vo) {

sys-server/src/main/java/com/zq/system/modules/system/service/VersionService.java

@@ -6,7 +6,7 @@ import com.zq.common.entity.AppVersion;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.PageVo;
 import com.zq.system.modules.system.domain.vo.AppVersionFindVo;
-import com.zq.system.modules.system.repository.AppVersionDao;
+import com.zq.system.modules.system.dao.AppVersionDao;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

sys-server/src/main/java/com/zq/system/modules/system/service/impl/UserServiceImpl.java

@@ -17,14 +17,11 @@ package com.zq.system.modules.system.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.config.redis.RedisUtils;
 import com.zq.common.config.security.ApiTokenUtils;
 import com.zq.common.constant.SystemName;
-import com.zq.common.entity.AppUser;
 import com.zq.common.entity.Pfuser;
-import com.zq.common.http.HttpRequestUtils;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.common.utils.UploadUtils;
@@ -33,6 +30,7 @@ import com.zq.system.config.CacheKeys;
 import com.zq.system.config.FileProperties;
 import com.zq.system.exception.EntityExistException;
 import com.zq.system.exception.EntityNotFoundException;
+import com.zq.system.modules.system.dao.PfuserDao;
 import com.zq.system.modules.system.domain.Job;
 import com.zq.system.modules.system.domain.Role;
 import com.zq.system.modules.system.domain.User;
@@ -56,7 +54,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;