diff --git a/mall-oms/oms-api/pom.xml b/mall-oms/oms-api/pom.xml index 7771e99a2..4d56d9f21 100644 --- a/mall-oms/oms-api/pom.xml +++ b/mall-oms/oms-api/pom.xml @@ -15,7 +15,7 @@ com.youlai - common-base + common-core diff --git a/mall-oms/oms-boot/pom.xml b/mall-oms/oms-boot/pom.xml index 27c178b7f..120e83fd2 100644 --- a/mall-oms/oms-boot/pom.xml +++ b/mall-oms/oms-boot/pom.xml @@ -85,7 +85,7 @@ com.youlai - common-resourceserver + common-security diff --git a/mall-pms/pms-api/pom.xml b/mall-pms/pms-api/pom.xml index 16418e612..43ded1441 100644 --- a/mall-pms/pms-api/pom.xml +++ b/mall-pms/pms-api/pom.xml @@ -15,7 +15,7 @@ com.youlai - common-base + common-core diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java index 15cd2f9f3..dcf84bb01 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java @@ -22,6 +22,6 @@ public class CategoryVO { private Integer visible; - private List children=new ArrayList<>(); + private List children = new ArrayList<>(); } diff --git a/mall-pms/pms-boot/pom.xml b/mall-pms/pms-boot/pom.xml index 2fb1b1290..79fb399df 100644 --- a/mall-pms/pms-boot/pom.xml +++ b/mall-pms/pms-boot/pom.xml @@ -84,7 +84,7 @@ com.youlai - common-resourceserver + common-security diff --git a/mall-sms/sms-api/pom.xml b/mall-sms/sms-api/pom.xml index 7953c94e4..26aa7d8e4 100644 --- a/mall-sms/sms-api/pom.xml +++ b/mall-sms/sms-api/pom.xml @@ -15,7 +15,7 @@ com.youlai - common-base + common-core diff --git a/mall-ums/ums-api/pom.xml b/mall-ums/ums-api/pom.xml index 60ac90851..95921070a 100644 --- a/mall-ums/ums-api/pom.xml +++ b/mall-ums/ums-api/pom.xml @@ -14,7 +14,7 @@ com.youlai - common-base + common-core diff --git a/pom.xml b/pom.xml index 8b10d01bd..c8cc65c2b 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ com.youlai - common-base + common-core ${project.version} @@ -195,11 +195,6 @@ ${project.version} - - com.youlai - common-sms - ${project.version} - com.youlai @@ -219,6 +214,12 @@ ${project.version} + + com.youlai + common-captcha + ${project.version} + + com.aliyun aliyun-java-sdk-core diff --git a/youlai-common/common-apidoc/pom.xml b/youlai-common/common-apidoc/pom.xml index 53c4037ff..a5a08f172 100644 --- a/youlai-common/common-apidoc/pom.xml +++ b/youlai-common/common-apidoc/pom.xml @@ -25,12 +25,6 @@ knife4j-openapi3-jakarta-spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - \ No newline at end of file diff --git a/youlai-common/common-base/src/main/java/com/youlai/common/enums/MenuTypeEnum.java b/youlai-common/common-base/src/main/java/com/youlai/common/enums/MenuTypeEnum.java deleted file mode 100644 index de15c788d..000000000 --- a/youlai-common/common-base/src/main/java/com/youlai/common/enums/MenuTypeEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.youlai.common.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.youlai.common.base.IBaseEnum; -import lombok.Getter; - -/** - * 菜单类型枚举 - * - * @author haoxr - * @date 2022/4/23 9:36 - */ - -public enum MenuTypeEnum implements IBaseEnum { - - NULL(0, null), - MENU(1, "菜单"), - CATALOG(2, "目录"), - EXTLINK(3, "外链"), - BUTTON(4, "按钮"); - - @Getter - @EnumValue // Mybatis-Plus 提供注解表示插入数据库时插入该值 - private Integer value; - - @Getter - // @JsonValue // 表示对枚举序列化时返回此字段 - private String label; - - MenuTypeEnum(Integer value, String label) { - this.value = value; - this.label = label; - } - -} diff --git a/youlai-common/common-redis/pom.xml b/youlai-common/common-redis/pom.xml index a1461de02..268b2e367 100644 --- a/youlai-common/common-redis/pom.xml +++ b/youlai-common/common-redis/pom.xml @@ -14,7 +14,7 @@ com.youlai - common-base + common-core diff --git a/youlai-common/common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/youlai-common/common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..1054047c2 --- /dev/null +++ b/youlai-common/common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +com.youlai.common.security.service.PermissionService +com.youlai.common.security.config.ResourceServerConfig +com.youlai.common.security.exception.MyAccessDeniedHandler +com.youlai.common.security.exception.MyAuthenticationEntryPoint \ No newline at end of file diff --git a/youlai-common/common-web/pom.xml b/youlai-common/common-web/pom.xml index c0757624b..c20a4e4c3 100644 --- a/youlai-common/common-web/pom.xml +++ b/youlai-common/common-web/pom.xml @@ -15,7 +15,7 @@ com.youlai - common-base + common-core diff --git a/youlai-common/pom.xml b/youlai-common/pom.xml index 7f765e800..745d3d1fc 100644 --- a/youlai-common/pom.xml +++ b/youlai-common/pom.xml @@ -15,7 +15,7 @@ common-apidoc - common-base + common-core common-redis common-web common-mybatis @@ -23,5 +23,6 @@ common-log common-security common-seata + common-captcha diff --git a/youlai-gateway/pom.xml b/youlai-gateway/pom.xml index 41bf96043..f0f8b991f 100644 --- a/youlai-gateway/pom.xml +++ b/youlai-gateway/pom.xml @@ -95,6 +95,11 @@ com.youlai common-redis + + + com.youlai + common-captcha + diff --git a/youlai-system/system-api/pom.xml b/youlai-system/system-api/pom.xml index 393a5c3ba..1e1ebadbd 100644 --- a/youlai-system/system-api/pom.xml +++ b/youlai-system/system-api/pom.xml @@ -15,7 +15,7 @@ com.youlai - common-base + common-core