修改了BaseCacheUserServiceImpl, 增加了鉴权中心引用
This commit is contained in:
@ -45,6 +45,11 @@
|
||||
<groupId>com.chinaunicom.ebtp</groupId>
|
||||
<artifactId>mall-ebtp-cloud-redis-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.chinaunicom.ebtp</groupId>
|
||||
<artifactId>mall-ebtp-cloud-security-starter</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
|
@ -1,21 +1,19 @@
|
||||
package com.chinaunicom.mall.ebtp.common.base.service.impl;
|
||||
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
||||
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
|
||||
import com.chinaunicom.mall.ebtp.common.util.JsonUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
||||
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* 缓存用户service实现层
|
||||
* 获取缓存用户信息
|
||||
* 缓存用户service实现层 获取缓存用户信息
|
||||
*
|
||||
* @author daixc
|
||||
* @version 1.0
|
||||
@ -25,93 +23,67 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
@Slf4j
|
||||
public class BaseCacheUserServiceImpl implements IBaseCacheUserService {
|
||||
|
||||
private static final Map<String, BaseCacheUser> USERS = new ConcurrentHashMap<>();
|
||||
private static final Map<String, BaseCacheUser> USERS = new ConcurrentHashMap<>();
|
||||
|
||||
@Override
|
||||
public BaseCacheUser getCacheUser() {
|
||||
Map map = (Map) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
|
||||
|
||||
@Override
|
||||
public BaseCacheUser getCacheUser() {
|
||||
BaseCacheUser user = new BaseCacheUser();
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes != null) {
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String token = request.getHeader("JwtToken");
|
||||
user = USERS.get(token);
|
||||
}
|
||||
log.info(" --------------- 当前用户:" + JsonUtils.objectToJson(user) + " ------------------------------");
|
||||
return user;
|
||||
}
|
||||
log.debug("Current user principal: " + map);
|
||||
|
||||
@Override
|
||||
public Collection<BaseCacheUser> getUsers() {
|
||||
return USERS.values();
|
||||
}
|
||||
return new BaseCacheUser().setUserId(1L).setFullName((String) map.get("staffName"))
|
||||
.setLoginName((String) map.get("username")).setRoleIds((String) map.get("staffId"))
|
||||
.setOrganizationId((String) map.get("ou")).setOrganizationName((String) map.get("ouName"));
|
||||
|
||||
static {
|
||||
BaseCacheUser user = new BaseCacheUser()
|
||||
.setUserId(1L)
|
||||
.setFullName("采购经理")
|
||||
.setLoginName("caigou")
|
||||
.setRoleIds("caigou")
|
||||
.setOrganizationId("100")
|
||||
.setOrganizationName("中国联通吉林分公司");
|
||||
USERS.put(String.valueOf(user.getUserId()), user);
|
||||
// BaseCacheUser user = new BaseCacheUser();
|
||||
// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
// if (attributes != null) {
|
||||
// HttpServletRequest request = attributes.getRequest();
|
||||
// String token = request.getHeader("JwtToken");
|
||||
// user = USERS.get(token);
|
||||
// }
|
||||
// log.info(" --------------- 当前用户:" + JsonUtils.objectToJson(user) + " ------------------------------");
|
||||
// return user;
|
||||
}
|
||||
|
||||
BaseCacheUser user0 = new BaseCacheUser()
|
||||
.setUserId(2L)
|
||||
.setFullName("代理机构管理员")
|
||||
.setLoginName("daili-admin")
|
||||
.setRoleIds("daili-admin")
|
||||
.setOrganizationId("100100")
|
||||
.setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user0.getUserId()), user0);
|
||||
@Override
|
||||
public Collection<BaseCacheUser> getUsers() {
|
||||
return USERS.values();
|
||||
}
|
||||
|
||||
BaseCacheUser user1 = new BaseCacheUser()
|
||||
.setUserId(3L)
|
||||
.setFullName("代理机构子管理员")
|
||||
.setLoginName("daili-subadmin")
|
||||
.setRoleIds("daili-subadmin")
|
||||
.setOrganizationId("100100")
|
||||
.setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user1.getUserId()), user1);
|
||||
static {
|
||||
BaseCacheUser user = new BaseCacheUser().setUserId(1L).setFullName("采购经理").setLoginName("caigou")
|
||||
.setRoleIds("caigou").setOrganizationId("100").setOrganizationName("中国联通吉林分公司");
|
||||
USERS.put(String.valueOf(user.getUserId()), user);
|
||||
|
||||
BaseCacheUser user2 = new BaseCacheUser()
|
||||
.setUserId(4L)
|
||||
.setFullName("项目经理1")
|
||||
.setLoginName("daili1")
|
||||
.setRoleIds("daili")
|
||||
.setOrganizationId("100100")
|
||||
.setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user2.getUserId()), user2);
|
||||
BaseCacheUser user0 = new BaseCacheUser().setUserId(2L).setFullName("代理机构管理员").setLoginName("daili-admin")
|
||||
.setRoleIds("daili-admin").setOrganizationId("100100").setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user0.getUserId()), user0);
|
||||
|
||||
BaseCacheUser user3 = new BaseCacheUser()
|
||||
.setUserId(5L)
|
||||
.setFullName("项目经理2")
|
||||
.setLoginName("daili2")
|
||||
.setRoleIds("daili")
|
||||
.setOrganizationId("100100")
|
||||
.setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user3.getUserId()), user3);
|
||||
BaseCacheUser user1 = new BaseCacheUser().setUserId(3L).setFullName("代理机构子管理员").setLoginName("daili-subadmin")
|
||||
.setRoleIds("daili-subadmin").setOrganizationId("100100").setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user1.getUserId()), user1);
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
BaseCacheUser user4 = new BaseCacheUser()
|
||||
.setUserId(6L + i)
|
||||
.setFullName("专家" + (i + 1))
|
||||
.setLoginName("1300000000" + (i + 1))
|
||||
.setRoleIds("zhuanjia")
|
||||
.setOrganizationId("666")
|
||||
.setOrganizationName("专家公司");
|
||||
USERS.put(String.valueOf(user4.getUserId()), user4);
|
||||
}
|
||||
BaseCacheUser user2 = new BaseCacheUser().setUserId(4L).setFullName("项目经理1").setLoginName("daili1")
|
||||
.setRoleIds("daili").setOrganizationId("100100").setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user2.getUserId()), user2);
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
BaseCacheUser user4 = new BaseCacheUser()
|
||||
.setUserId(11L + i)
|
||||
.setFullName("供应商" + (i + 1))
|
||||
.setLoginName("gys" + (i + 1))
|
||||
.setRoleIds("gys")
|
||||
.setOrganizationId("200"+ (i + 1))
|
||||
.setOrganizationName("供应商公司" + (i + 1));
|
||||
USERS.put(String.valueOf(user4.getUserId()), user4);
|
||||
}
|
||||
}
|
||||
BaseCacheUser user3 = new BaseCacheUser().setUserId(5L).setFullName("项目经理2").setLoginName("daili2")
|
||||
.setRoleIds("daili").setOrganizationId("100100").setOrganizationName("中兴代理公司");
|
||||
USERS.put(String.valueOf(user3.getUserId()), user3);
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
BaseCacheUser user4 = new BaseCacheUser().setUserId(6L + i).setFullName("专家" + (i + 1))
|
||||
.setLoginName("1300000000" + (i + 1)).setRoleIds("zhuanjia").setOrganizationId("666")
|
||||
.setOrganizationName("专家公司");
|
||||
USERS.put(String.valueOf(user4.getUserId()), user4);
|
||||
}
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
BaseCacheUser user4 = new BaseCacheUser().setUserId(11L + i).setFullName("供应商" + (i + 1))
|
||||
.setLoginName("gys" + (i + 1)).setRoleIds("gys").setOrganizationId("200" + (i + 1))
|
||||
.setOrganizationName("供应商公司" + (i + 1));
|
||||
USERS.put(String.valueOf(user4.getUserId()), user4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user