From 33d82cdff305ce4cb784638edc258b7bb8397353 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 15:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 16 ++++++++--------
1 files changed, 8 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 266baef..a9c7719 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
@@ -4,7 +4,6 @@
import com.matrix.component.redis.RedisClient;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.UUIDUtil;
-import com.matrix.system.app.authority.AppAuthorityManager;
import com.matrix.system.app.dto.LoginDto;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
@@ -12,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;
@@ -19,10 +19,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
@@ -40,7 +37,7 @@
private SysShopInfoService sysShopInfoService;
@Autowired
- private AppAuthorityManager authorityManager;
+ private DefaultAuthorityManager authorityManager;
@Autowired
private RedisClient redisClient;
@@ -58,8 +55,11 @@
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);
@@ -67,7 +67,6 @@
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());
@@ -79,4 +78,5 @@
result.putInMap("token", token);
return result;
}
+
}
--
Gitblit v1.9.1