diff --git a/shoulder-user-center/README.md b/shoulder-user-center/README.md index 22637f0..d907261 100644 --- a/shoulder-user-center/README.md +++ b/shoulder-user-center/README.md @@ -1,5 +1,26 @@ # shoulder-user-center -工程目录结构： +基于 Spring Security 的 Oauth2 认证授权中心，可作为单点登录服务器。 + + +## 工程目录结构： + +![目录结构](img/projectAndModule.png) + +--- + +## 扩展 + +### 单点登录 SSO + +`SSO` 是一种思想，或者说是一种抽象的解决方案，可以通过它实现：用户可以无感知地在不同系统间访问受保护资源，而不必因访问不同系统而登录不同的账号。 + +![sso](img/sso.png) + +(图片来源于网络，侵删) + +由于 `SSO` 并没有强制要求使用者如何实现认证，因此，可以通过不同的手段来达到该墓地，比如可以通过 Oauth2、JWT、Session 等。 + +### Oauth2 + -![目录结构](img/projectAndModule.png) \ No newline at end of file diff --git a/shoulder-user-center/pom.xml b/shoulder-user-center/pom.xml index c7e0b9c..2f7ab44 100644 --- a/shoulder-user-center/pom.xml +++ b/shoulder-user-center/pom.xml @@ -4,28 +4,28 @@ cn.itlym.platform shoulder-platform-parent 1.0-SNAPSHOT - ../shoulder-platform-common/shoulder-platform-parent/pom.xml 4.0.0 - uaa + shoulder-user-center shoulder-user-center 用户认证授权中心 cn.itlym.platform pom - 1.0-SNAPSHOT + 1.0-SNAPSHOT + - shoulder-user-center-api - shoulder-user-center-infrastructure - shoulder-user-center-core - shoulder-user-center-reference - shoulder-user-center-modules - shoulder-user-center-provider - shoulder-user-center-web - shoulder-user-center-start + uaa-api + uaa-infrastructure + uaa-core + uaa-reference + uaa-modules + uaa-provider + uaa-web + uaa-start @@ -34,34 +34,34 @@ cn.itlym.platform - shoulder-user-center-infrastructure + uaa-infrastructure 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-storage + uaa-storage 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-storage-mysql + uaa-storage-mysql 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-cache + uaa-cache 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-cache-memory + uaa-cache-memory 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-cache-redis + uaa-cache-redis 1.0-SNAPSHOT @@ -70,17 +70,17 @@ cn.itlym.platform - shoulder-user-center-reference + uaa-reference 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-reference-adaptor + uaa-reference-adaptor 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-reference-xxx + uaa-reference-xxx 1.0-SNAPSHOT @@ -89,7 +89,7 @@ cn.itlym.platform - shoulder-user-center-core + uaa-core 1.0-SNAPSHOT @@ -97,12 +97,12 @@ cn.itlym.platform - shoulder-user-center-modules + uaa-modules 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-xxx + uaa-xxx 1.0-SNAPSHOT @@ -110,13 +110,13 @@ cn.itlym.platform - shoulder-user-center-api + uaa-api 1.0-SNAPSHOT cn.itlym.platform - shoulder-user-center-provider + uaa-provider 1.0-SNAPSHOT @@ -124,7 +124,7 @@ cn.itlym.platform - shoulder-user-center-web + uaa-web 1.0-SNAPSHOT diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/TenantPO.java b/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/TenantPO.java deleted file mode 100644 index 3c62846..0000000 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/TenantPO.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.itlym.platform.uaa.storage.po; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 租户信息 - * - * @author lym - * @date 2020-10-30 00:10:57 - */ - -@Data -@NoArgsConstructor -public class TenantPO implements Serializable { - private static final long serialVersionUID = 1L; - - - private String tenantId; - - private String tenantCode; - - private String name; - - private String desc; - - private String logoUrl; - - private Integer status; - - private Long creator; - - private Date createTime; - - private Long modifier; - - private Date updateTime; - - private String province; - - private String city; - - private String district; - - private String address; - - private String linkMan; - - private String linkPhone; - - private BigDecimal longitude; - - private BigDecimal latitude; - - private String adcode; - -} diff --git a/shoulder-user-center/shoulder-user-center-api/pom.xml b/shoulder-user-center/uaa-api/pom.xml similarity index 95% rename from shoulder-user-center/shoulder-user-center-api/pom.xml rename to shoulder-user-center/uaa-api/pom.xml index 2877bcd..225a8cb 100644 --- a/shoulder-user-center/shoulder-user-center-api/pom.xml +++ b/shoulder-user-center/uaa-api/pom.xml @@ -7,7 +7,7 @@ 4.0.0 - shoulder-user-center-api + uaa-api diff --git a/shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java b/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java rename to shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java diff --git a/shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/dto/package-info.java b/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/dto/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/dto/package-info.java rename to shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/dto/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/dto/param/package-info.java b/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/dto/param/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/dto/param/package-info.java rename to shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/dto/param/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/dto/result/package-info.java b/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/dto/result/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/api/dto/result/package-info.java rename to shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/dto/result/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/notify/XxxChangeEvent.java b/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/notify/XxxChangeEvent.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-api/src/main/java/cn/itlym/platform/uaa/notify/XxxChangeEvent.java rename to shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/notify/XxxChangeEvent.java diff --git a/shoulder-user-center/shoulder-user-center-core/pom.xml b/shoulder-user-center/uaa-core/pom.xml similarity index 80% rename from shoulder-user-center/shoulder-user-center-core/pom.xml rename to shoulder-user-center/uaa-core/pom.xml index 9fdddb2..c7352c9 100644 --- a/shoulder-user-center/shoulder-user-center-core/pom.xml +++ b/shoulder-user-center/uaa-core/pom.xml @@ -7,7 +7,7 @@ 4.0.0 - shoulder-user-center-core + uaa-core 共性业务放这里 @@ -21,19 +21,19 @@ cn.itlym.platform - shoulder-user-center-storage + uaa-storage cn.itlym.platform - shoulder-user-center-cache + uaa-cache cn.itlym.platform - shoulder-user-center-reference-adaptor + uaa-reference-adaptor diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/config/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/config/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/constant/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/constant/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/dto/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/dto/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/dto/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/dto/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/dto/param/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/dto/param/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/dto/param/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/dto/param/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/dto/result/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/dto/result/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/dto/result/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/dto/result/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/enums/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/enums/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/exception/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/exception/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/exception/package-info.java diff --git a/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserGroup.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserGroup.java new file mode 100644 index 0000000..be48d75 --- /dev/null +++ b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserGroup.java @@ -0,0 +1,44 @@ +package cn.itlym.platform.uaa.core.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 用户组、部门表 + * + * @author lym + */ +@Data +@NoArgsConstructor +public class UserGroup implements Serializable { + private static final long serialVersionUID = 1L; + + + private Integer id; + + private String name; + + private String initials; + + private String spellings; + + private Long parentId; + + private Integer level; + + private String path; + + private String description; + + private Integer weight; + + private Integer displayOrder; + + private Long creator; + + private Date createTime; + +} diff --git a/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserInfo.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserInfo.java new file mode 100644 index 0000000..ccb8a1b --- /dev/null +++ b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserInfo.java @@ -0,0 +1,62 @@ +package cn.itlym.platform.uaa.core.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 用户信息表 + * + * @author lym + */ +@Data +@NoArgsConstructor +public class UserInfo implements Serializable { + private static final long serialVersionUID = 1L; + + + private Long id; + + private String name; + + private Integer sex; + + private Integer age; + + private Date birth; + + private Integer level; + + private String idCard; + + private String realName; + + private String initials; + + private String spellings; + + private String phoneNum; + + private String email; + + private Integer status; + + private Integer groupAuth; + + private Integer groupId; + + private String groupName; + + private String groupPath; + + private Long creator; + + private Date createTime; + + private Date updateTime; + + private String description; + +} diff --git a/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginInfo.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginInfo.java new file mode 100644 index 0000000..804b226 --- /dev/null +++ b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginInfo.java @@ -0,0 +1,47 @@ +package cn.itlym.platform.uaa.core.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 用户登录信息表 + * + * @author lym + * @date 2020-10-30 00:10:57 + */ +@Data +@NoArgsConstructor +public class UserLoginInfo implements Serializable { + private static final long serialVersionUID = 1L; + + + private String id; + + private Long userId; + + private String identifier; + + private Integer identityType; + + private String credential; + + private Date lastPwdModifiedTime; + + private Integer pwdLevel; + + private Integer pwdExpireStrategy; + + private Integer loginStrategyConfig; + + private Integer onlineNumber; + + private String ip; + + private String ipSegment; + + private String mac; + +} diff --git a/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginRecordFail.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginRecordFail.java new file mode 100644 index 0000000..67dc5b4 --- /dev/null +++ b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginRecordFail.java @@ -0,0 +1,39 @@ +package cn.itlym.platform.uaa.core.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 登录失败记录表 + * + * @author lym + * @date 2020-10-30 00:10:57 + */ +@Data +@NoArgsConstructor +public class UserLoginRecordFail implements Serializable { + private static final long serialVersionUID = 1L; + + + private Long id; + + private String ip; + + private String mac; + + private String address; + + private String identifier; + + private Integer identityType; + + private Integer failTimes; + + private Date unlockTime; + + private Date loginTime; + +} diff --git a/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginRecordSuccess.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginRecordSuccess.java new file mode 100644 index 0000000..5bc4a8e --- /dev/null +++ b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/UserLoginRecordSuccess.java @@ -0,0 +1,30 @@ +package cn.itlym.platform.uaa.core.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 登录成功记录表 + * + * @author lym + * @date 2020-10-30 00:10:57 + */ +@Data +@NoArgsConstructor +public class UserLoginRecordSuccess implements Serializable { + private static final long serialVersionUID = 1L; + + private Long id; + + private String ip; + + private Integer identityType; + + private String identifier; + + private Date loginTime; + +} diff --git a/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/converter/ModelConverter.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/converter/ModelConverter.java new file mode 100644 index 0000000..f1bb73a --- /dev/null +++ b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/model/converter/ModelConverter.java @@ -0,0 +1,48 @@ +package cn.itlym.platform.uaa.core.model.converter; + +import cn.itlym.platform.uaa.core.model.*; +import cn.itlym.platform.uaa.storage.po.*; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 模型转换 + * + * @author lym + */ +@Mapper(componentModel = "spring") // 置为 spring 则默认注入 bean +public interface ModelConverter { + + ModelConverter CONVERTER = Mappers.getMapper(ModelConverter.class); + + UserGroup toModel(UserGroupPO po); + + UserGroupPO toPo(UserGroup model); + + // ---- + + UserInfo toModel(UserInfoPO po); + + UserInfoPO toPo(UserInfo model); + + // ---- + + UserLoginInfo toModel(UserLoginInfoPO po); + + UserLoginInfoPO toPo(UserLoginInfo model); + + // ---- + + UserLoginRecordFail toModel(UserLoginRecordFailPO po); + + UserLoginRecordFailPO toPo(UserLoginRecordFail model); + + // ---- + + UserLoginRecordSuccess toModel(UserLoginRecordSuccessPO po); + + UserLoginRecordSuccessPO toPo(UserLoginRecordSuccess model); + + // ---- + +} \ No newline at end of file diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/repository/impl/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/repository/impl/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/repository/impl/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/repository/impl/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/repository/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/repository/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/repository/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/repository/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/service/impl/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/service/impl/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/service/impl/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/service/impl/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/service/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/service/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/service/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/service/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/util/package-info.java b/shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/util/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-core/src/main/java/cn/itlym/platform/uaa/core/util/package-info.java rename to shoulder-user-center/uaa-core/src/main/java/cn/itlym/platform/uaa/core/util/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/pom.xml b/shoulder-user-center/uaa-infrastructure/pom.xml similarity index 68% rename from shoulder-user-center/shoulder-user-center-infrastructure/pom.xml rename to shoulder-user-center/uaa-infrastructure/pom.xml index f3521d3..4e60723 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/pom.xml @@ -7,18 +7,18 @@ 4.0.0 - shoulder-user-center-infrastructure + uaa-infrastructure pom 基础设施层：存放可能随着 技术发展、部署环境、产品定位 而产生变化的代码，如：数据库在不同环境选型容易更换 - shoulder-user-center-storage - shoulder-user-center-storage-mysql + uaa-storage + uaa-storage-mysql - shoulder-user-center-cache - shoulder-user-center-cache-memory - shoulder-user-center-cache-redis + uaa-cache + uaa-cache-memory + uaa-cache-redis diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache-memory/pom.xml b/shoulder-user-center/uaa-infrastructure/uaa-cache-memory/pom.xml similarity index 81% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache-memory/pom.xml rename to shoulder-user-center/uaa-infrastructure/uaa-cache-memory/pom.xml index bc4fdca..c43dab2 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache-memory/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/uaa-cache-memory/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-infrastructure + uaa-infrastructure 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-cache-memory + uaa-cache-memory jvm 内存缓存。 该缓存实现 在开发/测试模式，会将缓存DTO序列化/反序列化，以便于后续改为使用redis等缓存做铺垫。 @@ -18,7 +18,7 @@ cn.itlym.platform - shoulder-user-center-cache + uaa-cache 1.0-SNAPSHOT diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache-redis/pom.xml b/shoulder-user-center/uaa-infrastructure/uaa-cache-redis/pom.xml similarity index 78% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache-redis/pom.xml rename to shoulder-user-center/uaa-infrastructure/uaa-cache-redis/pom.xml index 2cfaad4..63ce1f5 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache-redis/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/uaa-cache-redis/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-infrastructure + uaa-infrastructure 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-cache-redis + uaa-cache-redis redis 缓存 @@ -16,7 +16,7 @@ cn.itlym.platform - shoulder-user-center-cache + uaa-cache 1.0-SNAPSHOT diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/pom.xml b/shoulder-user-center/uaa-infrastructure/uaa-cache/pom.xml similarity index 78% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/pom.xml rename to shoulder-user-center/uaa-infrastructure/uaa-cache/pom.xml index 3fc0b24..4bf3364 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/uaa-cache/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-infrastructure + uaa-infrastructure 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-cache + uaa-cache 缓存相关接口定义 diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/config/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/config/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/constant/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/constant/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/dto/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/dto/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/dto/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/dto/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/enums/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/enums/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/exception/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/exception/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/exception/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/service/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/service/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-cache/src/main/java/cn/itlym/platform/uaa/cache/service/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-cache/src/main/java/cn/itlym/platform/uaa/cache/service/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/pom.xml b/shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/pom.xml similarity index 83% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/pom.xml rename to shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/pom.xml index 04812dc..2f0100e 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-infrastructure + uaa-infrastructure 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-storage-mysql + uaa-storage-mysql 持久化存储 mysql 实现（这里选用 jdbc、hibernate、mybatis都不会对业务模块产生影响，自由切换） @@ -16,7 +16,7 @@ cn.itlym.platform - shoulder-user-center-storage + uaa-storage 1.0-SNAPSHOT diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/repository/impl/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/repository/impl/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/repository/impl/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage-mysql/src/main/java/cn/itlym/platform/uaa/storage/repository/impl/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/pom.xml b/shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml similarity index 54% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/pom.xml rename to shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml index be26a81..1ca646c 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-infrastructure + uaa-infrastructure 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-storage + uaa-storage 持久化存储相关接口（Mapper/Repository）、数据库模型定义（Entity/PO） @@ -18,6 +18,20 @@ provided + + + com.baomidou + mybatis-plus-annotation + 3.4.0 + provided + + + + + diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/config/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/config/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/constant/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/constant/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/enums/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/enums/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/exception/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/exception/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/exception/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/package-info.java diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/PrincipalRolePO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/PrincipalRolePO.java new file mode 100644 index 0000000..727b771 --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/PrincipalRolePO.java @@ -0,0 +1,49 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 凭证-角色关联表 + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class PrincipalRolePO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * principal_id 凭证标识 + */ + @TableField("principal_id") + private Long principalId; + + /** + * principal_type 凭证类型 0：用户，1：部门 + */ + @TableField("principal_type") + private String principalType; + + /** + * role_id 角色 + */ + @TableField("role_id") + private Long roleId; + +} diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RolePO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RolePO.java new file mode 100644 index 0000000..e40362a --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RolePO.java @@ -0,0 +1,98 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 角色表 + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class RolePO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * name 名称 + */ + @TableField("name") + private String name; + + /** + * initials 名称-首字母缩写 + */ + @TableField("initials") + private String initials; + + /** + * pinyin 名称-全拼音 + */ + @TableField("pinyin") + private String pinyin; + + /** + * type 角色类型，1管理员，2普通角色 + */ + @TableField("type") + private Integer type; + + /** + * sub_type 创建的角色类型，用于继承 0操作员 1管理员 2超级管理员 + */ + @TableField("sub_type") + private Integer subType; + + /** + * enable 0:禁用，1：启用 + */ + @TableField("enable") + private Integer enable; + + /** + * description 描述 + */ + @TableField("description") + private String description; + + /** + * creator 创建者 + */ + @TableField("creator") + private Long creator; + + /** + * create_time 创建时间 + */ + @TableField("create_time") + private Date createTime; + + /** + * modifier 修改者 + */ + @TableField("modifier") + private Long modifier; + + /** + * update_time 更新时间 + */ + @TableField("update_time") + private Date updateTime; + +} diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelMenuPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelMenuPO.java new file mode 100644 index 0000000..f2466e2 --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelMenuPO.java @@ -0,0 +1,55 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 角色-菜单的权限关系 + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class RoleRelMenuPO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * role_id 角色id + */ + @TableField("role_id") + private Long roleId; + + /** + * menu_id 菜单id + */ + @TableField("menu_id") + private Integer menuId; + + /** + * menu_type 菜单类型 + */ + @TableField("menu_type") + private String menuType; + + /** + * menu_permission_code 菜单的code + */ + @TableField("menu_permission_code") + private String menuPermissionCode; + +} diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelResourcePO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelResourcePO.java new file mode 100644 index 0000000..7757883 --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelResourcePO.java @@ -0,0 +1,55 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 角色-资源的权限关系（角色上配了哪些资源） + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class RoleRelResourcePO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * role_id 角色id + */ + @TableField("role_id") + private Long roleId; + + /** + * resource_id 资源id + */ + @TableField("resource_id") + private Long resourceId; + + /** + * resource_type 资源类型编码 + */ + @TableField("resource_type") + private String resourceType; + + /** + * auth_value + */ + @TableField("auth_value") + private Long authValue; + +} diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelResourceTypePO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelResourceTypePO.java new file mode 100644 index 0000000..cb4159c --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelResourceTypePO.java @@ -0,0 +1,55 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 角色-资源类型的权限关系 + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class RoleRelResourceTypePO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * role_id 角色id + */ + @TableField("role_id") + private Long roleId; + + /** + * contain_sub 是否包含下级：0 - 不包含； 1 - 包含 + */ + @TableField("contain_sub") + private Integer containSub; + + /** + * resource_type 资源类型编码 + */ + @TableField("resource_type") + private String resourceType; + + /** + * auth_value + */ + @TableField("auth_value") + private Long authValue; + +} diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelRolePO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelRolePO.java new file mode 100644 index 0000000..69bcb1d --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelRolePO.java @@ -0,0 +1,49 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 角色-角色的权限关系 + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class RoleRelRolePO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * role_id 角色id + */ + @TableField("role_id") + private Long roleId; + + /** + * control_role_id 目标角色id + */ + @TableField("control_role_id") + private Long controlRoleId; + + /** + * auth_value 权限值，为资源操作项值之和 + */ + @TableField("auth_value") + private Long authValue; + +} diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelUserGroupPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelUserGroupPO.java new file mode 100644 index 0000000..5a22bd2 --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/RoleRelUserGroupPO.java @@ -0,0 +1,49 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 角色-用户组的权限关系 + * + * @author lym + * @date 2020-11-01 20:57:04 + */ + +@Data +@NoArgsConstructor +public class RoleRelUserGroupPO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * role_id 角色id + */ + @TableField("role_id") + private Long roleId; + + /** + * user_group_id 目标用户组id + */ + @TableField("user_group_id") + private Integer userGroupId; + + /** + * auth_value 权限值，为资源操作项值之和，0 - 没有权限，1 2 4 + */ + @TableField("auth_value") + private Long authValue; + +} diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserGroupPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserGroupPO.java similarity index 89% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserGroupPO.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserGroupPO.java index 9fa0e37..6bee8e8 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserGroupPO.java +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserGroupPO.java @@ -1,5 +1,6 @@ package cn.itlym.platform.uaa.storage.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,6 +15,7 @@ import java.util.Date; */ @Data @NoArgsConstructor +@TableName("c_auth_application") public class UserGroupPO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserInfoPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserInfoPO.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserInfoPO.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserInfoPO.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginInfoPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginInfoPO.java similarity index 99% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginInfoPO.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginInfoPO.java index 2096321..b4579cf 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginInfoPO.java +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginInfoPO.java @@ -12,7 +12,6 @@ import java.util.Date; * @author lym * @date 2020-10-30 00:10:57 */ - @Data @NoArgsConstructor public class UserLoginInfoPO implements Serializable { diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordFailPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordFailPO.java similarity index 99% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordFailPO.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordFailPO.java index 3e957c0..6e0b795 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordFailPO.java +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordFailPO.java @@ -12,7 +12,6 @@ import java.util.Date; * @author lym * @date 2020-10-30 00:10:57 */ - @Data @NoArgsConstructor public class UserLoginRecordFailPO implements Serializable { diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordSuccessPO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordSuccessPO.java similarity index 99% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordSuccessPO.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordSuccessPO.java index 6a7a87c..e116e03 100644 --- a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordSuccessPO.java +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserLoginRecordSuccessPO.java @@ -12,7 +12,6 @@ import java.util.Date; * @author lym * @date 2020-10-30 00:10:57 */ - @Data @NoArgsConstructor public class UserLoginRecordSuccessPO implements Serializable { diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserRelRolePO.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserRelRolePO.java new file mode 100644 index 0000000..aac220f --- /dev/null +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/UserRelRolePO.java @@ -0,0 +1,49 @@ +package cn.itlym.platform.uaa.storage.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 用户-角色关系表 + * + * @author lym + * @date 2020-11-01 20:57:05 + */ + +@Data +@NoArgsConstructor +public class UserRelRolePO implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * id 主键 + */ + @TableId(type = IdType.AUTO) + @TableField("id") + private Long id; + + /** + * user_id 用户id + */ + @TableField("user_id") + private Long userId; + + /** + * user_name 用户名称 + */ + @TableField("user_name") + private String userName; + + /** + * role_id 角色id + */ + @TableField("role_id") + private Long roleId; + +} diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/po/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/po/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/repository/package-info.java b/shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/repository/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-infrastructure/shoulder-user-center-storage/src/main/java/cn/itlym/platform/uaa/storage/repository/package-info.java rename to shoulder-user-center/uaa-infrastructure/uaa-storage/src/main/java/cn/itlym/platform/uaa/storage/repository/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/pom.xml b/shoulder-user-center/uaa-modules/pom.xml similarity index 85% rename from shoulder-user-center/shoulder-user-center-modules/pom.xml rename to shoulder-user-center/uaa-modules/pom.xml index 06465b3..d28437b 100644 --- a/shoulder-user-center/shoulder-user-center-modules/pom.xml +++ b/shoulder-user-center/uaa-modules/pom.xml @@ -13,7 +13,7 @@ 4.0.0 - shoulder-user-center-modules + uaa-modules pom @@ -27,7 +27,7 @@ cn.itlym.platform - shoulder-user-center-core + uaa-core @@ -35,7 +35,7 @@ - shoulder-user-center-xxx + uaa-xxx diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/pom.xml b/shoulder-user-center/uaa-modules/uaa-xxx/pom.xml similarity index 77% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/pom.xml rename to shoulder-user-center/uaa-modules/uaa-xxx/pom.xml index 1f93f94..52ef542 100644 --- a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/pom.xml +++ b/shoulder-user-center/uaa-modules/uaa-xxx/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-modules + uaa-modules 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-xxx + uaa-xxx diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/config/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/config/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/constant/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/constant/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/param/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/param/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/param/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/param/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/result/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/result/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/result/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/dto/result/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/enums/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/enums/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/exception/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/exception/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/exception/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/impl/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/impl/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/impl/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/impl/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/repository/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/impl/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/impl/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/impl/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/impl/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/service/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/util/package-info.java b/shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/util/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-modules/shoulder-user-center-xxx/src/main/java/cn/itlym/platform/uaa/xxx/util/package-info.java rename to shoulder-user-center/uaa-modules/uaa-xxx/src/main/java/cn/itlym/platform/uaa/xxx/util/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/pom.xml b/shoulder-user-center/uaa-provider/pom.xml similarity index 75% rename from shoulder-user-center/shoulder-user-center-provider/pom.xml rename to shoulder-user-center/uaa-provider/pom.xml index 9a65c71..2476afd 100644 --- a/shoulder-user-center/shoulder-user-center-provider/pom.xml +++ b/shoulder-user-center/uaa-provider/pom.xml @@ -7,16 +7,22 @@ 4.0.0 - shoulder-user-center-provider + uaa-provider 为外部提供服务，若子业务过多，可拆分为多个 provider，该模块也可合并至具体 module 中 + + + cn.itlym.platform + uaa-api + + cn.itlym.platform - shoulder-user-center-xxx + uaa-xxx diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/config/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/config/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/constant/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/constant/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/controller/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/controller/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/controller/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/controller/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/enums/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/enums/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/exception/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/exception/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/exception/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/util/package-info.java b/shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/util/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-provider/src/main/java/cn/itlym/platform/uaa/provider/util/package-info.java rename to shoulder-user-center/uaa-provider/src/main/java/cn/itlym/platform/uaa/provider/util/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/pom.xml b/shoulder-user-center/uaa-reference/pom.xml similarity index 79% rename from shoulder-user-center/shoulder-user-center-reference/pom.xml rename to shoulder-user-center/uaa-reference/pom.xml index 2eb3230..2d9c4bd 100644 --- a/shoulder-user-center/shoulder-user-center-reference/pom.xml +++ b/shoulder-user-center/uaa-reference/pom.xml @@ -7,17 +7,17 @@ 4.0.0 - shoulder-user-center-reference + uaa-reference pom 存放调用其他服务的代码 - shoulder-user-center-reference-xxx + uaa-reference-xxx - shoulder-user-center-reference-adaptor + uaa-reference-adaptor diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/pom.xml b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/pom.xml similarity index 83% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/pom.xml rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/pom.xml index 2a208c8..78c3dc6 100644 --- a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/pom.xml +++ b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-reference + uaa-reference 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-reference-adaptor + uaa-reference-adaptor 调用外部服务接口适配模块、主要做DTO转换、错误码转换，异常处理等。 @@ -18,7 +18,7 @@ cn.itlym.platform - shoulder-user-center-reference-xxx + uaa-reference-xxx 1.0-SNAPSHOT true diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/config/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/config/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/constant/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/constant/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/enums/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/enums/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/exception/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/exception/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/exception/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/impl/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/impl/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/impl/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/impl/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/service/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/util/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/util/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/util/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-adaptor/src/main/java/cn/itlym/platform/uaa/reference/util/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-xxx/pom.xml b/shoulder-user-center/uaa-reference/uaa-reference-xxx/pom.xml similarity index 88% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-xxx/pom.xml rename to shoulder-user-center/uaa-reference/uaa-reference-xxx/pom.xml index 5f559bb..53fc9ea 100644 --- a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-xxx/pom.xml +++ b/shoulder-user-center/uaa-reference/uaa-reference-xxx/pom.xml @@ -2,12 +2,12 @@ cn.itlym.platform - shoulder-user-center-reference + uaa-reference 1.0-SNAPSHOT 4.0.0 - shoulder-user-center-reference-xxx + uaa-reference-xxx 调用 xxx 应用提供的接口 diff --git a/shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-xxx/src/main/java/cn/itlym/platform/uaa/reference/package-info.java b/shoulder-user-center/uaa-reference/uaa-reference-xxx/src/main/java/cn/itlym/platform/uaa/reference/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-reference/shoulder-user-center-reference-xxx/src/main/java/cn/itlym/platform/uaa/reference/package-info.java rename to shoulder-user-center/uaa-reference/uaa-reference-xxx/src/main/java/cn/itlym/platform/uaa/reference/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-start/pom.xml b/shoulder-user-center/uaa-start/pom.xml similarity index 81% rename from shoulder-user-center/shoulder-user-center-start/pom.xml rename to shoulder-user-center/uaa-start/pom.xml index efba723..4b7ae74 100644 --- a/shoulder-user-center/shoulder-user-center-start/pom.xml +++ b/shoulder-user-center/uaa-start/pom.xml @@ -7,16 +7,16 @@ 4.0.0 - shoulder-user-center-start + uaa-start uaa - shoulder-user-center-start + uaa-start cn.itlym.platform - shoulder-user-center-xxx + uaa-xxx @@ -24,9 +24,15 @@ cn.itlym.platform - shoulder-user-center-storage-mysql + uaa-storage-mysql + + + @@ -63,10 +69,10 @@ ${project.artifactId} - - + + diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/ShoulderApplication.java b/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/ShoulderApplication.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/ShoulderApplication.java rename to shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/ShoulderApplication.java diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/config/ServletInitializer.java b/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/config/ServletInitializer.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/config/ServletInitializer.java rename to shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/config/ServletInitializer.java diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/config/package-info.java b/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/config/package-info.java rename to shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java b/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java similarity index 80% rename from shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java rename to shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java index 906f06e..619e125 100644 --- a/shoulder-user-center/shoulder-user-center-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java +++ b/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java @@ -31,7 +31,9 @@ public class DemoController { @GetMapping("test") public String test() { return "Congratulations on your new project based on shoulder-platform!

" + - "恭喜你成功创建了一个基于shoulder-platform的工程！"; + "恭喜你成功创建了一个基于shoulder-platform的工程！" + + "shoulder-platform 是借助 shoulder-framework 快速开发能力构建的示例平台," + + "可以 点击这里查看使用案例，以快速了解 Shoulder。"; } diff --git a/shoulder-user-center/uaa-start/src/main/resources/application.yml b/shoulder-user-center/uaa-start/src/main/resources/application.yml new file mode 100644 index 0000000..f1614d0 --- /dev/null +++ b/shoulder-user-center/uaa-start/src/main/resources/application.yml @@ -0,0 +1,18 @@ + +# 不对接注册中心时的配置文件参考 + +spring: + application: + name: @project.name@ + + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${MYSQL_ADDR:'127.0.0.1:3306'}/yourDataBaseName?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true + username: root + password: ${MYSQL_PWD} + +shoulder: + application: + id: ${spring.application.name} + errorCodePrefix: '0x000b' # unique code to mark a application diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/banner.txt b/shoulder-user-center/uaa-start/src/main/resources/banner.txt similarity index 95% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/banner.txt rename to shoulder-user-center/uaa-start/src/main/resources/banner.txt index e11860d..ef808c3 100644 --- a/shoulder-user-center/shoulder-user-center-start/src/main/resources/banner.txt +++ b/shoulder-user-center/uaa-start/src/main/resources/banner.txt @@ -5,8 +5,9 @@ ${AnsiColor.CYAN} ___) | | | | (_) | |_| | | (_| | __/ | ${AnsiColor.BRIGHT_Y ${AnsiColor.CYAN}|____/|_| |_|\___/ \__,_|_|\__,_|\___|_| ${AnsiColor.BRIGHT_YELLOW} \___/|___/\___|_| \____\___|_| |_|\__\___|_| ${AnsiColor.CYAN} / / / / / / ${AnsiColor.CYAN}====================================================================================================/_/==/_/===/_/ - ${AnsiColor.BLUE} :: Spring Boot :: ${AnsiColor.CYAN}${spring-boot.formatted-version} ${AnsiColor.BLUE} :: Shoulder-Framework :: ${AnsiColor.CYAN}(v@shoulder.version@) ${AnsiColor.BRIGHT_GREEN} :: @project.artifactId@ :: ${AnsiColor.GREEN}(v@project.version@)${AnsiColor.CYAN} @project.description@ ${AnsiColor.DEFAULT} + +# http://patorjk.com/software/taag/#p=display&f=Ivrit&t=Shoulder- diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/bootstrap.yml b/shoulder-user-center/uaa-start/src/main/resources/bootstrap.yml similarity index 81% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/bootstrap.yml rename to shoulder-user-center/uaa-start/src/main/resources/bootstrap.yml index 62ab4de..18db66d 100644 --- a/shoulder-user-center/shoulder-user-center-start/src/main/resources/bootstrap.yml +++ b/shoulder-user-center/uaa-start/src/main/resources/bootstrap.yml @@ -1,9 +1,11 @@ -# 先从环境变量里取，若不存在，则以 maven 打包时的配置为准 + +# 使用 spring-cloud 注册中心时，使用如下配置即可，若不使用注册中心，删掉该文件即可 + shoulder: nacos: - ip: ${NACOS_IP:@nacos.ip@} - port: ${NACOS_PORT:@nacos.port@} - namespace: ${NACOS_ID:@nacos.namespace@} + ip: ${NACOS_IP:localhost} # 这里替换成自己的 nacos ip + port: ${NACOS_PORT:8848} # 这里替换成自己的 nacos port + namespace: ${NACOS_ID:} # 这里替换成自己的 namespace，默认空 # spring-boot-actuate 展示信息 info: @@ -55,4 +57,4 @@ boot: #password: instance: prefer-ip: true - service-url: localhost:8080 \ No newline at end of file + service-url: localhost:8080 diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/language/en_US/messages.properties b/shoulder-user-center/uaa-start/src/main/resources/language/en_US/messages.properties similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/language/en_US/messages.properties rename to shoulder-user-center/uaa-start/src/main/resources/language/en_US/messages.properties diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/language/zh_CN/messages.properties b/shoulder-user-center/uaa-start/src/main/resources/language/zh_CN/messages.properties similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/language/zh_CN/messages.properties rename to shoulder-user-center/uaa-start/src/main/resources/language/zh_CN/messages.properties diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/language/zh_CN/module2.properties b/shoulder-user-center/uaa-start/src/main/resources/language/zh_CN/module2.properties similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/language/zh_CN/module2.properties rename to shoulder-user-center/uaa-start/src/main/resources/language/zh_CN/module2.properties diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/language/zh_CN/readme b/shoulder-user-center/uaa-start/src/main/resources/language/zh_CN/readme similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/language/zh_CN/readme rename to shoulder-user-center/uaa-start/src/main/resources/language/zh_CN/readme diff --git a/shoulder-user-center/shoulder-user-center-start/src/main/resources/static/favicon.ico b/shoulder-user-center/uaa-start/src/main/resources/static/favicon.ico similarity index 100% rename from shoulder-user-center/shoulder-user-center-start/src/main/resources/static/favicon.ico rename to shoulder-user-center/uaa-start/src/main/resources/static/favicon.ico diff --git a/shoulder-user-center/shoulder-user-center-web/pom.xml b/shoulder-user-center/uaa-web/pom.xml similarity index 86% rename from shoulder-user-center/shoulder-user-center-web/pom.xml rename to shoulder-user-center/uaa-web/pom.xml index 3083168..35c47d9 100644 --- a/shoulder-user-center/shoulder-user-center-web/pom.xml +++ b/shoulder-user-center/uaa-web/pom.xml @@ -7,7 +7,7 @@ 4.0.0 - shoulder-user-center-web + uaa-web 为自身前端提供的接口 @@ -17,7 +17,7 @@ cn.itlym.platform - shoulder-user-center-xxx + uaa-xxx diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/config/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/config/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/config/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/config/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/constant/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/constant/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/constant/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/constant/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/controller/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/controller/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/controller/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/controller/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/enums/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/enums/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/enums/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/enums/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/exception/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/exception/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/exception/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/exception/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/package-info.java diff --git a/shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/util/package-info.java b/shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/util/package-info.java similarity index 100% rename from shoulder-user-center/shoulder-user-center-web/src/main/java/cn/itlym/platform/uaa/web/util/package-info.java rename to shoulder-user-center/uaa-web/src/main/java/cn/itlym/platform/uaa/web/util/package-info.java