From baec557961bc60a04a0ae18a27e0a87961ef1da8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 11:26:44 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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..c03a787 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
@@ -2,8 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.matrix.component.redis.RedisClient;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.UUIDUtil;
+import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.LoginDto;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
@@ -11,6 +13,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;
@@ -18,10 +21,7 @@
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-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 org.springframework.web.bind.annotation.*;
/**
* @author wzy
@@ -57,16 +57,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());
@@ -77,4 +79,5 @@
result.putInMap("token", token);
return result;
}
+
}
--
Gitblit v1.9.1