From 217d44093f6c4e908faa227073de74f2eb54f513 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 11:15:49 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index 0da7a56..fd12c13 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -11,6 +11,7 @@
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.service.SysShopInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -57,16 +58,18 @@
LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
user = authorityManager.login(apLogin);
+ UserInfoVo userInfoVo = new UserInfoVo();
if(user.getShopId()!=null){
- user.setShopName(sysShopInfoService.findById(user.getShopId()).getShopName());
+ SysShopInfo shopInfo = sysShopInfoService.findById(user.getShopId());
+ user.setShopName(shopInfo.getShopName());
+ userInfoVo.setShopName(shopInfo.getShopShortName());
}
user.setSuPassword(null);
String token = UUIDUtil.getRandomID();
- redisClient.saveValue(token, JSONObject.toJSONString(user), 360000);
- redisClient.saveValue(user.getSuId().toString(), token, 3600000);
+ redisClient.saveValueForever(token, JSONObject.toJSONString(user));
+ redisClient.saveValueForever(user.getSuId().toString(), token);
- UserInfoVo userInfoVo = new UserInfoVo();
userInfoVo.setId(user.getSuId());
userInfoVo.setName(user.getSuName());
userInfoVo.setRoleName(user.getRoleName());
--
Gitblit v1.9.1