liuchang/mall-ebtp-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了用户信息模型

Browse Source
This commit is contained in:
ajaxfan
2021-01-04 17:10:29 +08:00
parent 5de23a6b45
commit 88e520b3cb
2 changed files with 128 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/BaseCacheUser.java
View File

@ -16,7 +16,6 @@ import java.util.Date;
@Accessors(chain = true) @Accessors(chain = true)
public class BaseCacheUser { public class BaseCacheUser {
/** /**
* PKID * PKID
*/ */

34
uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java
View File

@ -22,6 +22,8 @@ import lombok.extern.slf4j.Slf4j;
@Service @Service
@Slf4j @Slf4j
public class BaseCacheUserServiceImpl implements IBaseCacheUserService { public class BaseCacheUserServiceImpl implements IBaseCacheUserService {
// TODO 设置种子ID， 对其雪花ID长度
private static final long ID_SEED = 1345977833027100000L;
private static final Map<String, BaseCacheUser> USERS = new ConcurrentHashMap<>(); private static final Map<String, BaseCacheUser> USERS = new ConcurrentHashMap<>();
@ -31,19 +33,10 @@ public class BaseCacheUserServiceImpl implements IBaseCacheUserService {
log.debug("Current user principal: " + map); log.debug("Current user principal: " + map);
return new BaseCacheUser().setUserId(1L).setFullName((String) map.get("staffName")) return new BaseCacheUser().setUserId(getUserId((String) map.get("staffId")))
.setLoginName((String) map.get("username")).setRoleIds((String) map.get("staffId")) .setFullName((String) map.get("staffName")).setLoginName((String) map.get("username"))
.setOrganizationId((String) map.get("ou")).setOrganizationName((String) map.get("ouName")); .setRoleIds((String) map.get("staffId")).setOrganizationId((String) map.get("ou"))
.setOrganizationName((String) map.get("ouName"));
// 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;
} }
@Override @Override
@ -51,6 +44,21 @@ public class BaseCacheUserServiceImpl implements IBaseCacheUserService {
return USERS.values(); return USERS.values();
} }
/**
* @param string
* @return
*/
// TODO: 山东框架使用未使用雪花ID存放字符串，暂时使用该方法进行id转换
private Long getUserId(String rawUid) {
long id = ID_SEED;
byte[] bytes = rawUid.getBytes();
for (byte b : bytes) {
id += b;
}
return id;
}
static { static {
BaseCacheUser user = new BaseCacheUser().setUserId(1L).setFullName("采购经理").setLoginName("caigou") BaseCacheUser user = new BaseCacheUser().setUserId(1L).setFullName("采购经理").setLoginName("caigou")
.setRoleIds("caigou").setOrganizationId("100").setOrganizationName("中国联通吉林分公司"); .setRoleIds("caigou").setOrganizationId("100").setOrganizationName("中国联通吉林分公司");