From 0f2577195bc2931d773e7699b7bfa930fd243870 Mon Sep 17 00:00:00 2001
From: ajaxfan <909938737@qq.com>
Date: Wed, 30 Dec 2020 15:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86BaseCacheUserService?=
=?UTF-8?q?Impl=EF=BC=8C=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=89=B4=E6=9D=83?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
uboot-common/pom.xml | 5 +
.../impl/BaseCacheUserServiceImpl.java | 152 +++++++-----------
2 files changed, 67 insertions(+), 90 deletions(-)
diff --git a/uboot-common/pom.xml b/uboot-common/pom.xml
index abd57ed..6ba65c2 100644
--- a/uboot-common/pom.xml
+++ b/uboot-common/pom.xml
@@ -45,6 +45,11 @@
com.chinaunicom.ebtp
mall-ebtp-cloud-redis-starter
+
+
+ com.chinaunicom.ebtp
+ mall-ebtp-cloud-security-starter
+
diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java
index f5533ec..42e2a86 100644
--- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java
+++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java
@@ -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 USERS = new ConcurrentHashMap<>();
+ private static final Map 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 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 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);
+ }
+ }
}