微调

system/pom.xml

@@ -28,7 +28,11 @@
             <version>2.3.12</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>com.njcn.gather</groupId>
+            <artifactId>user</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
 

system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java

@@ -1,16 +1,42 @@
 package com.njcn.gather.system.auth.controller;
 
+import cn.hutool.core.util.StrUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.constant.SecurityConstants;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.JwtUtil;
+import com.njcn.common.utils.LogUtil;
 import com.njcn.gather.system.auth.pojo.Token;
+import com.njcn.gather.user.pojo.constant.UserValidMessage;
+import com.njcn.gather.user.user.pojo.param.SysUserParam;
+import com.njcn.gather.user.user.pojo.po.SysUser;
+import com.njcn.gather.user.user.service.ISysUserService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.HttpResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 @Slf4j
 @RestController
-@RequestMapping("admin")
-public class AuthController {
+@Api(tags = "登录/注销")
+@RequestMapping("/admin")
+@RequiredArgsConstructor
+public class AuthController extends BaseController {
+
+    private final ISysUserService sysUserService;
 
     @RequestMapping("/login")
     public HttpResult<Token> login() {
@@ -31,4 +57,36 @@ public class AuthController {
         result.setData("退出成功");
         return result;
     }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.AUTHENTICATE)
+    @PostMapping("/login1")
+    @ApiOperation("登录")
+    public HttpResult<Object> login(@RequestBody SysUserParam.LoginParam param) {
+        String methodDescribe = getMethodDescribe("login");
+        LogUtil.njcnDebug(log, "{}，登录参数为：{}", methodDescribe, param);
+        SysUser user = sysUserService.getUserByLoginNameAndPassword(param.getUsername(), param.getPassword());
+        if (user == null) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, UserValidMessage.LOGIN_FAILED, methodDescribe);
+        } else {
+            String tokenStr = JwtUtil.generateToken(user.getId());
+            Token token = new Token();
+            token.setAccessToken(tokenStr);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, token, methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.LOGOUT)
+    @ApiOperation("注销登录")
+    @PostMapping("/logout1")
+    public HttpResult<Object> logout(HttpServletRequest request) {
+        String methodDescribe = getMethodDescribe("logout");
+        LogUtil.njcnDebug(log, "{}，注销登录", methodDescribe);
+        String authorization = request.getHeader(SecurityConstants.AUTHORIZATION_KEY);
+        if (StrUtil.isNotBlank(authorization)) {
+            String token = authorization.replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY);
+            JwtUtil.invalidateToken(token);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+    }
 }

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java

@@ -44,7 +44,7 @@ public class DictTreeController extends BaseController {
     private final IDictTreeService dictTreeService;
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @GetMapping("/likeName")
+    @GetMapping("/getTree")
     @ApiOperation("按照名称模糊查询字典树")
     @ApiImplicitParam(name = "keyword", value = "查询参数", required = true)
     public HttpResult<List<DictTree>> getDictTreeByKeyword(@RequestParam String keyword) {
@@ -176,17 +176,6 @@ public class DictTreeController extends BaseController {
         List<DictTree> result = dictTreeService.queryAllByType(type);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-
-
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @GetMapping("/queryTree")
-    @ApiOperation("树形字典树结构展示")
-    public HttpResult<List<DictTree>> queryTree() {
-        String methodDescribe = getMethodDescribe("queryTree");
-        List<DictTree> result = dictTreeService.queryTree();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
 }