refactor: 包名修改

mall-oms/oms-api/pom.xml

@@ -15,7 +15,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>

mall-oms/oms-boot/pom.xml

@@ -85,7 +85,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-resourceserver</artifactId>
+            <artifactId>common-security</artifactId>
         </dependency>
 
         <dependency>

mall-pms/pms-api/pom.xml

@@ -15,7 +15,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>

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<CategoryVO> children=new ArrayList<>();
+    private List<CategoryVO> children = new ArrayList<>();
 
 }

mall-pms/pms-boot/pom.xml

@@ -84,7 +84,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-resourceserver</artifactId>
+            <artifactId>common-security</artifactId>
         </dependency>
 
         <dependency>

mall-sms/sms-api/pom.xml

@@ -15,7 +15,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>

mall-ums/ums-api/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>

pom.xml

@@ -161,7 +161,7 @@
 
             <dependency>
                 <groupId>com.youlai</groupId>
-                <artifactId>common-base</artifactId>
+                <artifactId>common-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -195,11 +195,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.youlai</groupId>
-                <artifactId>common-sms</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>com.youlai</groupId>
@@ -219,6 +214,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.youlai</groupId>
+                <artifactId>common-captcha</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>aliyun-java-sdk-core</artifactId>

youlai-common/common-apidoc/pom.xml

@@ -25,12 +25,6 @@
             <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

youlai-common/common-base/src/main/java/com/youlai/common/enums/MenuTypeEnum.java

@@ -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<Integer> {
-
-    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;
-    }
-
-}

youlai-common/common-redis/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>

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

youlai-common/common-web/pom.xml

@@ -15,7 +15,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>

youlai-common/pom.xml

@@ -15,7 +15,7 @@
 
     <modules>
         <module>common-apidoc</module>
-        <module>common-base</module>
+        <module>common-core</module>
         <module>common-redis</module>
         <module>common-web</module>
         <module>common-mybatis</module>
@@ -23,5 +23,6 @@
         <module>common-log</module>
         <module>common-security</module>
         <module>common-seata</module>
+        <module>common-captcha</module>
     </modules>
 </project>

youlai-gateway/pom.xml

@@ -95,6 +95,11 @@
             <groupId>com.youlai</groupId>
             <artifactId>common-redis</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-captcha</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

youlai-system/system-api/pom.xml

@@ -15,7 +15,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-base</artifactId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>