diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java index e7e36a6..e050168 100644 --- a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java @@ -7,8 +7,10 @@ import lombok.Data; @Data public class AuthorityEntity { + private String roleId; private String roleName; private String roleCode; + private String roleScope; private List authorities; } diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java deleted file mode 100644 index 29bc1ac..0000000 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.chinaunicom.mall.ebtp.common.base; \ No newline at end of file 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 3bee414..069b450 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 @@ -55,24 +55,9 @@ public class BaseCacheUserServiceImpl implements IBaseCacheUserService { * @return */ private BaseCacheUser convertToBusinessModel(SecurityEntity raw) { - return new BaseCacheUser().setUserId(getUserId(raw.getStaffId())).setFullName(raw.getStaffName()) + return new BaseCacheUser().setUserId(raw.getStaffId()).setFullName(raw.getStaffName()) .setLastName(raw.getUsername()).setRoleIds(raw.getStaffId()).setOrganizationId(raw.getOu()) .setOrganizationName(raw.getOuName()).setAuthorityList(raw.getAuthorityList()); } - /** - * @param string - * @return - */ - // TODO: 山东框架使用未使用雪花ID存放字符串,暂时使用该方法进行id转换 - private String getUserId(String rawUid) { - long id = ID_SEED; - byte[] bytes = rawUid.getBytes(); - - for (byte b : bytes) { - id += b; - } - return String.valueOf(id); - } - }