From 36e3950ade8195a7d2fcea64c5118e3ddeec8c44 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 26 Jan 2021 23:24:29 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index d175ec5..c3cc658 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -28,6 +28,7 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -61,7 +62,8 @@
@Autowired
private RedisClient redisClient;
-
+ @Value("${login_private_key}")
+ private String privateKey;
@ApiOperation(value = "个人中心--获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")
@ApiResponses({
@@ -104,7 +106,7 @@
@ApiOperation(value = "退出登陆", notes = "退出登陆")
@GetMapping(value = "/loginOut")
public AjaxResult loginOut(HttpServletRequest request) {
- String token=ApiUserLoginInterceptor.resolveToken(request);
+ String token=ApiUserLoginInterceptor.resolveToken(request,privateKey);
redisClient.removeObject(token);
return AjaxResult.buildSuccessInstance("退出成功");
}
--
Gitblit v1.9.1