合并hhl代码

lidee-admin/src/main/resources/application.yaml

@@ -2,7 +2,7 @@ spring:
   application:
     name: lideeyunji-server
   profiles:
-    active: prod # 读取配置
+    active: local # 读取配置
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
 

lidee-dependencies/.flattened-pom.xml

@@ -9,18 +9,67 @@
   <name>${project.artifactId}</name>
   <description>基础 bom 文件，管理整个项目的依赖版本</description>
   <properties>
+    <servlet.version>4.0.4</servlet.version>
+    <tika-core.version>2.9.1</tika-core.version>
     <podam.version>7.2.11.RELEASE</podam.version>
+    <captcha-plus.version>1.0.10</captcha-plus.version>
+    <lidee.version>2.2.4</lidee.version>
+    <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
+    <poi-ooxml.verion>4.1.2</poi-ooxml.verion>
+    <express.version>3.3.3</express.version>
+    <bizlog-sdk.version>3.0.6</bizlog-sdk.version>
+    <starter.validation.version>2.3.12.RELEASE</starter.validation.version>
+    <mapstruct.version>1.5.5.Final</mapstruct.version>
+    <fastjson.version>1.2.83</fastjson.version>
     <junit.version>4.13.2</junit.version>
+    <groovy.version>3.0.21</groovy.version>
+    <tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
+    <mybatis-plus-generator.version>3.5.5</mybatis-plus-generator.version>
+    <mybatis.version>3.5.15</mybatis.version>
+    <opentracing.version>0.33.0</opentracing.version>
     <jsqlparser.version>4.3</jsqlparser.version>
+    <dom4j.version>1.6.1</dom4j.version>
+    <screw.version>1.0.5</screw.version>
+    <mybatis-plus-join.version>1.4.10</mybatis-plus-join.version>
+    <kingbase.jdbc.version>8.6.0</kingbase.jdbc.version>
+    <aspectjweaver.version>1.9.7</aspectjweaver.version>
+    <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
+    <revision>2.0.1-jdk8-snapshot</revision>
+    <jsch.version>0.1.55</jsch.version>
+    <xercesImpl.version>2.12.2</xercesImpl.version>
+    <ip2region.version>2.7.0</ip2region.version>
     <okio.version>3.5.0</okio.version>
+    <dynamic-datasource.version>4.3.0</dynamic-datasource.version>
+    <redisson.version>3.18.0</redisson.version>
+    <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
+    <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
     <guice.version>5.1.0</guice.version>
+    <minio.version>8.5.7</minio.version>
+    <aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
+    <jedis-mock.version>1.0.13</jedis-mock.version>
+    <spring.boot.version>2.7.18</spring.boot.version>
     <hutool.version>5.8.25</hutool.version>
+    <guava.version>33.0.0-jre</guava.version>
+    <servlet.versoin>2.5</servlet.versoin>
+    <springdoc.version>1.6.15</springdoc.version>
     <resilience4j.version>1.7.1</resilience4j.version>
+    <lock4j.version>2.2.7</lock4j.version>
+    <commons-io.version>2.15.1</commons-io.version>
+    <poi-scratchpad.verion>4.1.2</poi-scratchpad.verion>
     <okhttp3.version>4.9.3</okhttp3.version>
+    <commons-net.version>3.10.0</commons-net.version>
+    <jsoup.version>1.17.2</jsoup.version>
     <mybatis-plus.version>3.5.5</mybatis-plus.version>
+    <knife4j.version>4.3.0</knife4j.version>
+    <lombok.version>1.18.30</lombok.version>
     <easyexcel.verion>3.3.3</easyexcel.verion>
+    <flowable.version>6.8.0</flowable.version>
+    <druid.version>1.2.21</druid.version>
+    <skywalking.version>8.12.0</skywalking.version>
     <mockito-inline.version>4.11.0</mockito-inline.version>
+    <justauth.version>1.0.8</justauth.version>
     <dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
+    <velocity.version>2.3</velocity.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -42,6 +91,7 @@
         <version>${bizlog-sdk.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
           </exclusion>
         </exclusions>
@@ -147,6 +197,7 @@
         <version>${redisson.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
           </exclusion>
         </exclusions>
@@ -177,6 +228,7 @@
         <version>${lock4j.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
           </exclusion>
         </exclusions>
@@ -232,6 +284,7 @@
         <version>${spring-boot-admin.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-server-cloud</artifactId>
           </exclusion>
         </exclusions>
@@ -258,9 +311,11 @@
         <version>${spring.boot.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
           </exclusion>
           <exclusion>
+            <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
           </exclusion>
         </exclusions>
@@ -366,10 +421,12 @@
         <version>${screw.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
           </exclusion>
           <exclusion>
             <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -434,10 +491,12 @@
         <version>${aliyun-java-sdk-core.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>io.opentracing</groupId>
             <artifactId>opentracing-api</artifactId>
           </exclusion>
           <exclusion>
             <groupId>io.opentracing</groupId>
+            <artifactId>opentracing-util</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -458,6 +517,7 @@
         <exclusions>
           <exclusion>
             <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
           </exclusion>
         </exclusions>
       </dependency>