商品业代价格,最小议价区间，最大议价区间添加

.flattened-pom.xml

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-  <description>芋道项目基础脚手架</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <modules>
-    <module>cdm-dependencies</module>
-    <module>cdm-framework</module>
-    <module>cdm-server</module>
-    <module>cdm-module-system</module>
-    <module>cdm-module-infra</module>
-    <module>cdm-module-member</module>
-    <module>cdm-module-report</module>
-    <module>cdm-module-pay</module>
-    <module>cdm-module-mall</module>
-  </modules>
-  <properties>
-    <lombok.version>1.18.30</lombok.version>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-    <java.version>17</java.version>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <mapstruct.version>1.5.5.Final</mapstruct.version>
-    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.boot.version>2.7.17</spring.boot.version>
-    <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-    <revision>2.0.0-jdk8-snapshot</revision>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-dependencies</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <repositories>
-    <repository>
-      <id>huaweicloud</id>
-      <name>huawei</name>
-      <url>https://mirrors.huaweicloud.com/repository/maven/</url>
-    </repository>
-    <repository>
-      <id>aliyunmaven</id>
-      <name>aliyun</name>
-      <url>https://maven.aliyun.com/repository/public</url>
-    </repository>
-  </repositories>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven-surefire-plugin.version}</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin.version}</version>
-          <configuration>
-            <annotationProcessorPaths>
-              <path>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-configuration-processor</artifactId>
-                <version>${spring.boot.version}</version>
-              </path>
-              <path>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-              </path>
-              <path>
-                <groupId>org.mapstruct</groupId>
-                <artifactId>mapstruct-processor</artifactId>
-                <version>${mapstruct.version}</version>
-              </path>
-            </annotationProcessorPaths>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-        <version>${flatten-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>flatten</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>flatten</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>flatten.clean</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <flattenMode>resolveCiFriendliesOnly</flattenMode>
-          <updatePomFile>true</updatePomFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

cdm-dependencies/.flattened-pom.xml

@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-dependencies</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-  <description>基础 bom 文件，管理整个项目的依赖版本</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <properties>
-    <tika-core.version>2.7.0</tika-core.version>
-    <podam.version>7.2.11.RELEASE</podam.version>
-    <captcha-plus.version>1.0.10</captcha-plus.version>
-    <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-    <mapstruct.version>1.5.5.Final</mapstruct.version>
-    <fastjson.version>1.2.83</fastjson.version>
-    <tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
-    <weixin-java.version>4.5.7.B</weixin-java.version>
-    <mybatis-plus-generator.version>3.5.4</mybatis-plus-generator.version>
-    <opentracing.version>0.33.0</opentracing.version>
-    <screw.version>1.0.5</screw.version>
-    <mybatis-plus-join.version>1.4.7</mybatis-plus-join.version>
-    <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
-    <revision>2.0.0-jdk8-snapshot</revision>
-    <jsch.version>0.1.55</jsch.version>
-    <xercesImpl.version>2.12.2</xercesImpl.version>
-    <rocketmq-spring.version>2.2.3</rocketmq-spring.version>
-    <ip2region.version>2.7.0</ip2region.version>
-    <okio.version>3.5.0</okio.version>
-    <dynamic-datasource.version>3.6.1</dynamic-datasource.version>
-    <redisson.version>3.18.0</redisson.version>
-    <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
-    <spring-boot-admin.version>2.7.11</spring-boot-admin.version>
-    <guice.version>5.1.0</guice.version>
-    <minio.version>8.5.6</minio.version>
-    <aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
-    <jedis-mock.version>1.0.7</jedis-mock.version>
-    <spring.boot.version>2.7.17</spring.boot.version>
-    <hutool.version>5.8.22</hutool.version>
-    <guava.version>32.1.3-jre</guava.version>
-    <servlet.versoin>2.5</servlet.versoin>
-    <springdoc.version>1.6.15</springdoc.version>
-    <resilience4j.version>1.7.1</resilience4j.version>
-    <commons-io.version>2.11.0</commons-io.version>
-    <lock4j.version>2.2.5</lock4j.version>
-    <okhttp3.version>4.11.0</okhttp3.version>
-    <commons-net.version>3.10.0</commons-net.version>
-    <jsoup.version>1.16.2</jsoup.version>
-    <mybatis-plus.version>3.5.4</mybatis-plus.version>
-    <jimureport.version>1.6.1</jimureport.version>
-    <knife4j.version>4.3.0</knife4j.version>
-    <lombok.version>1.18.30</lombok.version>
-    <easyexcel.verion>3.3.2</easyexcel.verion>
-    <ureport2.version>2.2.9</ureport2.version>
-    <flowable.version>6.8.0</flowable.version>
-    <druid.version>1.2.20</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>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-banner</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-operatelog</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-dict</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-sms</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-pay</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-tenant</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-data-permission</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-social</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-error-code</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-biz-ip</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-captcha</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-desensitize</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-configuration-processor</artifactId>
-        <version>${spring.boot.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-web</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-security</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-websocket</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.xiaoymin</groupId>
-        <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
-        <version>${knife4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springdoc</groupId>
-        <artifactId>springdoc-openapi-ui</artifactId>
-        <version>${springdoc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-mybatis</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alibaba</groupId>
-        <artifactId>druid-spring-boot-starter</artifactId>
-        <version>${druid.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.baomidou</groupId>
-        <artifactId>mybatis-plus-boot-starter</artifactId>
-        <version>${mybatis-plus.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.baomidou</groupId>
-        <artifactId>mybatis-plus-generator</artifactId>
-        <version>${mybatis-plus-generator.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.baomidou</groupId>
-        <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-        <version>${dynamic-datasource.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.yulichang</groupId>
-        <artifactId>mybatis-plus-join-boot-starter</artifactId>
-        <version>${mybatis-plus-join.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-redis</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>org.redisson</groupId>
-        <artifactId>redisson-spring-boot-starter</artifactId>
-        <version>${redisson.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-            <groupId>org.springframework.boot</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.dameng</groupId>
-        <artifactId>DmJdbcDriver18</artifactId>
-        <version>${dm8.jdbc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-job</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-mq</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.rocketmq</groupId>
-        <artifactId>rocketmq-spring-boot-starter</artifactId>
-        <version>${rocketmq-spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-protection</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.baomidou</groupId>
-        <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-        <version>${lock4j.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <groupId>org.redisson</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>io.github.resilience4j</groupId>
-        <artifactId>resilience4j-ratelimiter</artifactId>
-        <version>${resilience4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.resilience4j</groupId>
-        <artifactId>resilience4j-spring-boot2</artifactId>
-        <version>${resilience4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-monitor</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.skywalking</groupId>
-        <artifactId>apm-toolkit-trace</artifactId>
-        <version>${skywalking.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.skywalking</groupId>
-        <artifactId>apm-toolkit-logback-1.x</artifactId>
-        <version>${skywalking.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.skywalking</groupId>
-        <artifactId>apm-toolkit-opentracing</artifactId>
-        <version>${skywalking.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.opentracing</groupId>
-        <artifactId>opentracing-api</artifactId>
-        <version>${opentracing.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.opentracing</groupId>
-        <artifactId>opentracing-util</artifactId>
-        <version>${opentracing.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.opentracing</groupId>
-        <artifactId>opentracing-noop</artifactId>
-        <version>${opentracing.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>de.codecentric</groupId>
-        <artifactId>spring-boot-admin-starter-server</artifactId>
-        <version>${spring-boot-admin.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>spring-boot-admin-server-cloud</artifactId>
-            <groupId>de.codecentric</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>de.codecentric</groupId>
-        <artifactId>spring-boot-admin-starter-client</artifactId>
-        <version>${spring-boot-admin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-test</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>${mockito-inline.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-test</artifactId>
-        <version>${spring.boot.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>asm</artifactId>
-            <groupId>org.ow2.asm</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>mockito-core</artifactId>
-            <groupId>org.mockito</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.github.fppt</groupId>
-        <artifactId>jedis-mock</artifactId>
-        <version>${jedis-mock.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>uk.co.jemos.podam</groupId>
-        <artifactId>podam</artifactId>
-        <version>${podam.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-flowable</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>org.flowable</groupId>
-        <artifactId>flowable-spring-boot-starter-process</artifactId>
-        <version>${flowable.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.flowable</groupId>
-        <artifactId>flowable-spring-boot-starter-actuator</artifactId>
-        <version>${flowable.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-common</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-excel</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>${lombok.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mapstruct</groupId>
-        <artifactId>mapstruct</artifactId>
-        <version>${mapstruct.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mapstruct</groupId>
-        <artifactId>mapstruct-jdk8</artifactId>
-        <version>${mapstruct.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mapstruct</groupId>
-        <artifactId>mapstruct-processor</artifactId>
-        <version>${mapstruct.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>cn.hutool</groupId>
-        <artifactId>hutool-all</artifactId>
-        <version>${hutool.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alibaba</groupId>
-        <artifactId>easyexcel</artifactId>
-        <version>${easyexcel.verion}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tika</groupId>
-        <artifactId>tika-core</artifactId>
-        <version>${tika-core.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity-engine-core</artifactId>
-        <version>${velocity.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alibaba</groupId>
-        <artifactId>fastjson</artifactId>
-        <version>${fastjson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>cn.smallbun.screw</groupId>
-        <artifactId>screw-core</artifactId>
-        <version>${screw.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>freemarker</artifactId>
-            <groupId>org.freemarker</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>fastjson</artifactId>
-            <groupId>com.alibaba</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.inject</groupId>
-        <artifactId>guice</artifactId>
-        <version>${guice.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alibaba</groupId>
-        <artifactId>transmittable-thread-local</artifactId>
-        <version>${transmittable-thread-local.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>${commons-net.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.jcraft</groupId>
-        <artifactId>jsch</artifactId>
-        <version>${jsch.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.xingyuv</groupId>
-        <artifactId>spring-boot-starter-captcha-plus</artifactId>
-        <version>${captcha-plus.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.lionsoul</groupId>
-        <artifactId>ip2region</artifactId>
-        <version>${ip2region.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jsoup</groupId>
-        <artifactId>jsoup</artifactId>
-        <version>${jsoup.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.squareup.okio</groupId>
-        <artifactId>okio</artifactId>
-        <version>${okio.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>${okhttp3.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.cdm</groupId>
-        <artifactId>cdm-spring-boot-starter-file</artifactId>
-        <version>2.0.0-jdk8-snapshot</version>
-      </dependency>
-      <dependency>
-        <groupId>io.minio</groupId>
-        <artifactId>minio</artifactId>
-        <version>${minio.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.aliyun</groupId>
-        <artifactId>aliyun-java-sdk-core</artifactId>
-        <version>${aliyun-java-sdk-core.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>opentracing-api</artifactId>
-            <groupId>io.opentracing</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>opentracing-util</artifactId>
-            <groupId>io.opentracing</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.aliyun</groupId>
-        <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-        <version>${aliyun-java-sdk-dysmsapi.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.tencentcloudapi</groupId>
-        <artifactId>tencentcloud-sdk-java-sms</artifactId>
-        <version>${tencentcloud-sdk-java.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.xingyuv</groupId>
-        <artifactId>spring-boot-starter-justauth</artifactId>
-        <version>${justauth.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>hutool-core</artifactId>
-            <groupId>cn.hutool</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.github.binarywang</groupId>
-        <artifactId>weixin-java-pay</artifactId>
-        <version>${weixin-java.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.binarywang</groupId>
-        <artifactId>wx-java-mp-spring-boot-starter</artifactId>
-        <version>${weixin-java.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.binarywang</groupId>
-        <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
-        <version>${weixin-java.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jeecgframework.jimureport</groupId>
-        <artifactId>jimureport-spring-boot-starter</artifactId>
-        <version>${jimureport.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>druid</artifactId>
-            <groupId>com.alibaba</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>${xercesImpl.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.bstek.ureport</groupId>
-        <artifactId>ureport2-console</artifactId>
-        <version>${ureport2.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-        <version>${flatten-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>flatten</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>flatten</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>flatten.clean</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <flattenMode>resolveCiFriendliesOnly</flattenMode>
-          <updatePomFile>true</updatePomFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

cdm-framework/.flattened-pom.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-framework</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <packaging>pom</packaging>
-  <description>该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：
-            1. core 包：是该组件的核心封装
-            2. config 包：是该组件基于 Spring 的配置
-
-        技术组件，也分成两类：
-            1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展
-            2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。
-        如果是业务组件，Maven 名字会包含 biz</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <modules>
-    <module>cdm-common</module>
-    <module>cdm-spring-boot-starter-banner</module>
-    <module>cdm-spring-boot-starter-mybatis</module>
-    <module>cdm-spring-boot-starter-redis</module>
-    <module>cdm-spring-boot-starter-web</module>
-    <module>cdm-spring-boot-starter-security</module>
-    <module>cdm-spring-boot-starter-file</module>
-    <module>cdm-spring-boot-starter-monitor</module>
-    <module>cdm-spring-boot-starter-protection</module>
-    <module>cdm-spring-boot-starter-job</module>
-    <module>cdm-spring-boot-starter-mq</module>
-    <module>cdm-spring-boot-starter-excel</module>
-    <module>cdm-spring-boot-starter-test</module>
-    <module>cdm-spring-boot-starter-biz-operatelog</module>
-    <module>cdm-spring-boot-starter-biz-dict</module>
-    <module>cdm-spring-boot-starter-biz-sms</module>
-    <module>cdm-spring-boot-starter-biz-pay</module>
-    <module>cdm-spring-boot-starter-biz-tenant</module>
-    <module>cdm-spring-boot-starter-biz-data-permission</module>
-    <module>cdm-spring-boot-starter-biz-error-code</module>
-    <module>cdm-spring-boot-starter-biz-ip</module>
-    <module>cdm-spring-boot-starter-flowable</module>
-    <module>cdm-spring-boot-starter-captcha</module>
-    <module>cdm-spring-boot-starter-websocket</module>
-    <module>cdm-spring-boot-starter-desensitize</module>
-  </modules>
-</project>

cdm-framework/cdm-common/.flattened-pom.xml

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-common</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>定义基础 pojo 类、枚举、工具类等等</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-expression</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.skywalking</groupId>
-      <artifactId>apm-toolkit-trace</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct-jdk8</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct-processor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>cn.hutool</groupId>
-      <artifactId>hutool-all</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>transmittable-thread-local</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-banner/.flattened-pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-banner</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>Banner 用于在 console 控制台，打印开发文档、接口文档等</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-data-permission/.flattened-pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-data-permission</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>数据权限</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-security</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mybatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-system-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-dict/.flattened-pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-dict</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>字典类型、数据</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-system-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-error-code/.flattened-pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-error-code</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>错误码 ErrorCode 的自动配置功能，提供如下功能：
-        1. 远程读取：项目启动时，从 system-server 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提示可配置；
-        2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-server 服务加载最新的 ErrorCode 错误码；
-        3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑；</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-system-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-ip/.flattened-pom.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-ip</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>IP 拓展，支持如下功能：
-        1. IP 功能：查询 IP 对应的城市信息
-            基于 https://gitee.com/lionsoul/ip2region 实现
-        2. 城市功能：查询城市编码对应的城市信息
-            基于 https://github.com/modood/Administrative-divisions-of-China 实现</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.lionsoul</groupId>
-      <artifactId>ip2region</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-operatelog/.flattened-pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-operatelog</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>操作日志</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-aop</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-web</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-system-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-pay/.flattened-pom.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-pay</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>支付拓展，接入国内多个支付渠道
-        1. 支付宝，基于官方 SDK 接入
-        2. 微信支付，基于 weixin-java-pay 接入</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.alipay.sdk</groupId>
-      <artifactId>alipay-sdk-java</artifactId>
-      <version>4.35.79.ALL</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>bcprov-jdk15on</artifactId>
-          <groupId>org.bouncycastle</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.github.binarywang</groupId>
-      <artifactId>weixin-java-pay</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-sms/.flattened-pom.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-sms</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>短信拓展，支持阿里云、腾讯云</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.aliyun</groupId>
-      <artifactId>aliyun-java-sdk-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.aliyun</groupId>
-      <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.tencentcloudapi</groupId>
-      <artifactId>tencentcloud-sdk-java-sms</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-biz-tenant/.flattened-pom.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-biz-tenant</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>多租户</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mybatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-redis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-job</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mq</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.kafka</groupId>
-      <artifactId>spring-kafka</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.amqp</groupId>
-      <artifactId>spring-rabbit</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.rocketmq</groupId>
-      <artifactId>rocketmq-spring-boot-starter</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-captcha/.flattened-pom.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-captcha</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>验证码拓展
-        1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.xingyuv</groupId>
-      <artifactId>spring-boot-starter-captcha-plus</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-redis</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-desensitize/.flattened-pom.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-desensitize</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <description>脱敏组件：支持 JSON 返回数据时，将邮箱、手机等字段进行脱敏</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-excel/.flattened-pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-excel</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>Excel 拓展</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-dict</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>easyexcel</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-file/.flattened-pom.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-file</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>文件客户端，支持多种存储器
-        1. file：本地磁盘
-        2. ftp：FTP 服务器
-        2. sftp：SFTP 服务器
-        4. db：数据库
-        5. s3：支持 S3 协议的云存储服务，例如说 MinIO、阿里云、华为云、腾讯云、七牛云等等</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jsch</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.minio</groupId>
-      <artifactId>minio</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-flowable/.flattened-pom.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-flowable</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.flowable</groupId>
-      <artifactId>flowable-spring-boot-starter-process</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.flowable</groupId>
-      <artifactId>flowable-spring-boot-starter-actuator</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-job/.flattened-pom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-job</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>任务拓展
-        1. 定时任务，基于 Quartz 拓展
-        2. 异步任务，基于 Spring Async 拓展</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-quartz</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-monitor/.flattened-pom.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-monitor</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>服务监控，提供链路追踪、日志服务、指标收集等等功能</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-aop</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.skywalking</groupId>
-      <artifactId>apm-toolkit-trace</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.skywalking</groupId>
-      <artifactId>apm-toolkit-logback-1.x</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.skywalking</groupId>
-      <artifactId>apm-toolkit-opentracing</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-prometheus</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>de.codecentric</groupId>
-      <artifactId>spring-boot-admin-starter-client</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-mq/.flattened-pom.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-mq</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>消息队列，支持 Redis、RocketMQ、RabbitMQ、Kafka 四种</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-redis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.kafka</groupId>
-      <artifactId>spring-kafka</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.amqp</groupId>
-      <artifactId>spring-rabbit</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.rocketmq</groupId>
-      <artifactId>rocketmq-spring-boot-starter</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-mybatis/.flattened-pom.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-mybatis</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>数据库连接池、多数据源、事务、MyBatis 拓展</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-web</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.mysql</groupId>
-      <artifactId>mysql-connector-j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc8</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.sqlserver</groupId>
-      <artifactId>mssql-jdbc</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.dameng</groupId>
-      <artifactId>DmJdbcDriver18</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>druid-spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.yulichang</groupId>
-      <artifactId>mybatis-plus-join-boot-starter</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-protection/.flattened-pom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-protection</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>服务保证，提供分布式锁、幂等、限流、熔断等等功能</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-redis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.resilience4j</groupId>
-      <artifactId>resilience4j-spring-boot2</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-redis/.flattened-pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-redis</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>Redis 封装拓展</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.redisson</groupId>
-      <artifactId>redisson-spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-cache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-security/.flattened-pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-security</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>用户的认证、权限的校验</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-aop</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-system-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-test/.flattened-pom.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-test</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>测试组件，用于单元测试、集成测试</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mybatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-redis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.fppt</groupId>
-      <artifactId>jedis-mock</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>uk.co.jemos.podam</groupId>
-      <artifactId>podam</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-web/.flattened-pom.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-web</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>Web 框架，全局异常、API 日志等</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.github.xiaoymin</groupId>
-      <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-infra-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-framework/cdm-spring-boot-starter-websocket/.flattened-pom.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-framework</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-spring-boot-starter-websocket</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>WebSocket 框架，支持多节点的广播</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-security</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-websocket</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mq</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.kafka</groupId>
-      <artifactId>spring-kafka</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.amqp</groupId>
-      <artifactId>spring-rabbit</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.rocketmq</groupId>
-      <artifactId>rocketmq-spring-boot-starter</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-tenant</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>

cdm-module-infra/.flattened-pom.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-module-infra</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-  <description>infra 模块，主要提供两块能力：
-        1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等
-        2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等</description>
-  <modules>
-    <module>cdm-module-infra-api</module>
-    <module>cdm-module-infra-biz</module>
-  </modules>
-</project>

cdm-module-infra/cdm-module-infra-api/.flattened-pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-module-infra</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-module-infra-api</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>infra 模块 API，暴露给其它模块调用</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java

@@ -59,6 +59,10 @@ public class ProductSkuBaseVO {
     @Schema(description = "属性数组")
     private List<Property> properties;
 
+    private Integer agentPrice;
+    private Integer minBargain;
+    private Integer maxBargain;
+
     @Schema(description = "商品属性")
     @Data
     @NoArgsConstructor

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/controller/admin/spu/vo/GoodsVO.java

@@ -0,0 +1,9 @@
+package com.cdm.module.product.controller.admin.spu.vo;
+
+import lombok.Data;
+
+@Data
+public class GoodsVO {
+    private Integer id;
+    private String gallery;
+}

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java

@@ -1,5 +1,7 @@
 package com.cdm.module.product.controller.admin.spu.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -108,4 +110,9 @@ public class ProductSpuBaseVO {
     @Schema(description = "虚拟销量", example = "66")
     private Integer virtualSalesCount;
 
+    private Integer agentPrice;
+    private Integer minBargain;
+    private Integer maxBargain;
+    private List<WmsItemVO> wmsItems;
+
 }

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/controller/admin/spu/vo/WmsItemVO.java

@@ -0,0 +1,12 @@
+package com.cdm.module.product.controller.admin.spu.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class WmsItemVO {
+    @Schema(description = "产品id")
+    private Long id;
+    @Schema(description = "产品数量")
+    private Integer number;
+}

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/controller/admin/sync/SyncController.java

@@ -0,0 +1,86 @@
+package com.cdm.module.product.controller.admin.sync;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.cdm.framework.common.pojo.CommonResult;
+import com.cdm.module.product.dal.dataobject.sku.ProductSkuDO;
+import com.cdm.module.product.dal.dataobject.spu.ProductSpuDO;
+import com.cdm.module.product.dal.mysql.sku.ProductSkuMapper;
+import com.cdm.module.product.dal.mysql.spu.ProductSpuMapper;
+import com.cdm.module.product.controller.admin.spu.vo.GoodsVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+import static com.cdm.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.cdm.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 商品 SPU")
+@RestController
+@RequestMapping("/product/sync")
+@Validated
+public class SyncController {
+
+    @Resource
+    private ProductSpuMapper productSpuMapper;
+    @Resource
+    private ProductSkuMapper productSkuMapper;
+
+    @GetMapping("/createSKU")
+    @Operation(summary = "创建商品 SKU")
+    public CommonResult<Integer> createSKU() {
+        List<ProductSpuDO> productSpuDOS = productSpuMapper.selectList();
+        List<ProductSkuDO.Property> propertyList=new ArrayList<>();
+        ProductSkuDO.Property property = new ProductSkuDO.Property();
+        property.setPropertyId(0L);
+        property.setPropertyName("默认");
+        property.setValueId(0L);
+        property.setValueName("默认");
+        propertyList.add(property);
+        List<ProductSkuDO> productSkuDOList=new ArrayList<>();
+        for (ProductSpuDO productSpuDO : productSpuDOS) {
+            ProductSkuDO productSkuDO = new ProductSkuDO();
+            productSkuDO.setSpuId(productSpuDO.getId());
+            productSkuDO.setProperties(propertyList);
+            productSkuDO.setPrice(productSpuDO.getPrice());
+            productSkuDO.setMarketPrice(productSpuDO.getMarketPrice());
+            productSkuDO.setCostPrice(productSpuDO.getCostPrice());
+            productSkuDO.setPicUrl(productSpuDO.getPicUrl());
+            productSkuDO.setStock(productSpuDO.getStock());
+            productSkuDOList.add(productSkuDO);
+        }
+        productSkuMapper.insertBatch(productSkuDOList);
+        return success(productSkuDOList.size());
+    }
+
+
+    @GetMapping("/createSKU1")
+    @Operation(summary = "创建商品 SKU")
+    public void createSKU1() {
+        List<GoodsVO> hashMapList = productSpuMapper.selectGoods();
+        for (GoodsVO hashMap : hashMapList) {
+            Integer id = hashMap.getId();
+            ProductSpuDO productSpuDO = productSpuMapper.selectById(id);
+            String gallery = hashMap.getGallery();
+
+            JSONArray objects = JSONUtil.parseArray(gallery);
+            List<Test1> userList = JSONUtil.toList(objects, Test1.class);
+            List<String> stringList=new ArrayList<>();
+            for (Test1 object : userList) {
+                stringList.add(object.getUrl());
+            }
+            productSpuDO.setSliderPicUrls(stringList);
+            productSpuMapper.updateById(productSpuDO);
+        }
+    }
+    @Data
+    class Test1{
+        private String url;
+    }
+
+}

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -95,6 +95,10 @@ public class ProductSkuDO extends BaseDO {
      */
     private Integer salesCount;
 
+    private Integer agentPrice;
+    private Integer minBargain;
+    private Integer maxBargain;
+
     /**
      * 商品属性
      */

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/dal/dataobject/spu/ProductSpuDO.java

@@ -1,6 +1,7 @@
 package com.cdm.module.product.dal.dataobject.spu;
 
 import com.cdm.framework.mybatis.core.dataobject.BaseDO;
+import com.cdm.module.product.controller.admin.spu.vo.WmsItemVO;
 import com.cdm.module.product.dal.dataobject.brand.ProductBrandDO;
 import com.cdm.module.product.dal.dataobject.category.ProductCategoryDO;
 import com.cdm.module.product.dal.dataobject.sku.ProductSkuDO;
@@ -210,4 +211,21 @@ public class ProductSpuDO extends BaseDO {
      * 浏览量
      */
     private Integer browseCount;
+    /**
+     * 业代价格
+     */
+    private Integer agentPrice;
+    /**
+     * 议价最小区间
+     */
+    private Integer minBargain;
+    /**
+     * 议价最大区间
+     */
+    private Integer maxBargain;
+    /**
+     * 产品组合（产品id+数量number）
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<WmsItemVO> wmsItems;
 }

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/dal/mysql/spu/ProductSpuMapper.java

@@ -8,12 +8,14 @@ import com.cdm.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cdm.framework.mybatis.core.query.QueryWrapperX;
 import com.cdm.module.product.controller.admin.spu.vo.ProductSpuExportReqVO;
 import com.cdm.module.product.controller.admin.spu.vo.ProductSpuPageReqVO;
+import com.cdm.module.product.controller.admin.spu.vo.GoodsVO;
 import com.cdm.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
 import com.cdm.module.product.dal.dataobject.spu.ProductSpuDO;
 import com.cdm.module.product.enums.ProductConstants;
 import com.cdm.module.product.enums.spu.ProductSpuStatusEnum;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Objects;
@@ -165,5 +167,7 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
             query.eqIfPresent(ProductSpuDO::getStatus, ProductSpuStatusEnum.RECYCLE.getStatus());
         }
     }
+    @Select("select id,goods_gallery gallery from jyshop.shop_goods_info")
+    List<GoodsVO> selectGoods();
 
 }

cdm-module-mall/cdm-module-product-biz/src/main/java/com/cdm/module/product/service/spu/ProductSpuServiceImpl.java

@@ -2,6 +2,8 @@ package com.cdm.module.product.service.spu;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
 import com.cdm.framework.common.enums.CommonStatusEnum;
 import com.cdm.framework.common.pojo.PageResult;
 import com.cdm.framework.common.util.collection.CollectionUtils;
@@ -105,6 +107,12 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         spu.setPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getPrice));
         // sku 单价最低的商品的市场价格
         spu.setMarketPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
+        // sku 单价最低的商品的业代价格
+        spu.setMarketPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getAgentPrice));
+        // sku 单价最低的商品的最小议价价格
+        spu.setMarketPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getMinBargain));
+        // sku 单价最低的商品的最大议价价格
+        spu.setMarketPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getMaxBargain));
         // sku 单价最低的商品的成本价格
         spu.setCostPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getCostPrice));
         // sku 单价最低的商品的条形码 TODO 芋艿：条形码字段，是不是可以删除

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/article/ArticleCategoryConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class ArticleCategoryConvertImpl implements ArticleCategoryConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/article/ArticleConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class ArticleConvertImpl implements ArticleConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/banner/BannerConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BannerConvertImpl implements BannerConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/bargain/BargainActivityConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BargainActivityConvertImpl implements BargainActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/bargain/BargainHelpConvertImpl.java

@@ -10,7 +10,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BargainHelpConvertImpl implements BargainHelpConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/bargain/BargainRecordConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BargainRecordConvertImpl implements BargainRecordConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/combination/CombinationActivityConvertImpl.java

@@ -21,7 +21,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class CombinationActivityConvertImpl implements CombinationActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/coupon/CouponConvertImpl.java

@@ -15,7 +15,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class CouponConvertImpl implements CouponConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/coupon/CouponTemplateConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class CouponTemplateConvertImpl implements CouponTemplateConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/decorate/DecorateComponentConvertImpl.java

@@ -10,7 +10,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DecorateComponentConvertImpl implements DecorateComponentConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/discount/DiscountActivityConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DiscountActivityConvertImpl implements DiscountActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/diy/DiyPageConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DiyPageConvertImpl implements DiyPageConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/diy/DiyTemplateConvertImpl.java

@@ -16,7 +16,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DiyTemplateConvertImpl implements DiyTemplateConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/reward/RewardActivityConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class RewardActivityConvertImpl implements RewardActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvertImpl.java

@@ -18,7 +18,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:12+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class SeckillActivityConvertImpl implements SeckillActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/seckill/seckillconfig/SeckillConfigConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:11+0800",
+    date = "2024-01-02T10:49:50+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class SeckillConfigConvertImpl implements SeckillConfigConvert {

cdm-module-mall/cdm-module-statistics-biz/target/generated-sources/annotations/com/cdm/module/statistics/convert/member/MemberStatisticsConvertImpl.java

@@ -9,7 +9,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:12:09+0800",
+    date = "2024-01-02T10:49:38+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class MemberStatisticsConvertImpl implements MemberStatisticsConvert {

cdm-module-mall/cdm-module-statistics-biz/target/generated-sources/annotations/com/cdm/module/statistics/convert/pay/PayStatisticsConvertImpl.java

@@ -5,7 +5,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:12:09+0800",
+    date = "2024-01-02T10:49:38+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class PayStatisticsConvertImpl implements PayStatisticsConvert {

cdm-module-mall/cdm-module-statistics-biz/target/generated-sources/annotations/com/cdm/module/statistics/convert/trade/TradeStatisticsConvertImpl.java

@@ -16,7 +16,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:12:09+0800",
+    date = "2024-01-02T10:49:38+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeStatisticsConvertImpl implements TradeStatisticsConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/aftersale/AfterSaleConvertImpl.java

@@ -24,7 +24,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AfterSaleConvertImpl implements AfterSaleConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/aftersale/AfterSaleLogConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AfterSaleLogConvertImpl implements AfterSaleLogConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/brokerage/BrokerageRecordConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:22+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BrokerageRecordConvertImpl implements BrokerageRecordConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/brokerage/BrokerageUserConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BrokerageUserConvertImpl implements BrokerageUserConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/brokerage/BrokerageWithdrawConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:22+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BrokerageWithdrawConvertImpl implements BrokerageWithdrawConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/cart/TradeCartConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeCartConvertImpl implements TradeCartConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/config/TradeConfigConvertImpl.java

@@ -10,7 +10,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeConfigConvertImpl implements TradeConfigConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/delivery/DeliveryExpressConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DeliveryExpressConvertImpl implements DeliveryExpressConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/delivery/DeliveryExpressTemplateConvertImpl.java

@@ -18,7 +18,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DeliveryExpressTemplateConvertImpl implements DeliveryExpressTemplateConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/delivery/DeliveryPickUpStoreConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DeliveryPickUpStoreConvertImpl implements DeliveryPickUpStoreConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/order/TradeOrderConvertImpl.java

@@ -34,7 +34,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeOrderConvertImpl implements TradeOrderConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/order/TradeOrderLogConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeOrderLogConvertImpl implements TradeOrderLogConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/framework/delivery/core/client/convert/ExpressQueryConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:11:46+0800",
+    date = "2024-01-02T10:49:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class ExpressQueryConvertImpl implements ExpressQueryConvert {

cdm-module-report/cdm-module-report-biz/target/generated-sources/annotations/com/cdm/module/report/convert/goview/GoViewProjectConvertImpl.java

@@ -11,7 +11,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:10:23+0800",
+    date = "2024-01-02T10:49:42+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class GoViewProjectConvertImpl implements GoViewProjectConvert {

cdm-module-system/.flattened-pom.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-module-system</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-  <description>system 模块下，我们放通用业务，支撑上层的核心业务。
-        例如说：用户、部门、权限、数据字典等等</description>
-  <modules>
-    <module>cdm-module-system-api</module>
-    <module>cdm-module-system-biz</module>
-  </modules>
-</project>

cdm-module-system/cdm-module-system-api/.flattened-pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-module-system</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-module-system-api</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>system 模块 API，暴露给其它模块调用</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>

cdm-module-system/cdm-module-system-biz/.flattened-pom.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.cdm</groupId>
-    <artifactId>cdm-module-system</artifactId>
-    <version>2.0.0-jdk8-snapshot</version>
-  </parent>
-  <groupId>com.cdm</groupId>
-  <artifactId>cdm-module-system-biz</artifactId>
-  <version>2.0.0-jdk8-snapshot</version>
-  <name>${project.artifactId}</name>
-  <description>system 模块下，我们放通用业务，支撑上层的核心业务。
-        例如说：用户、部门、权限、数据字典等等</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-system-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-module-infra-api</artifactId>
-      <version>${revision}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-operatelog</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-sms</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-dict</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-data-permission</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-tenant</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-biz-ip</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mybatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-redis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-job</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-mq</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-excel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.cdm</groupId>
-      <artifactId>cdm-spring-boot-starter-captcha</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-mail</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.xingyuv</groupId>
-      <artifactId>spring-boot-starter-justauth</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.binarywang</groupId>
-      <artifactId>wx-java-mp-spring-boot-starter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.binarywang</groupId>
-      <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
-    </dependency>
-  </dependencies>
-</project>

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/auth/AuthConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:14+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AuthConvertImpl implements AuthConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/ip/AreaConvertImpl.java

@@ -9,7 +9,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:15+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AreaConvertImpl implements AreaConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/logger/OperateLogConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:14+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class OperateLogConvertImpl implements OperateLogConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/mail/MailAccountConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:15+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class MailAccountConvertImpl implements MailAccountConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/oauth2/OAuth2OpenConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:14+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class OAuth2OpenConvertImpl implements OAuth2OpenConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/social/SocialUserConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:14+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class SocialUserConvertImpl implements SocialUserConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/tenant/TenantConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:14+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TenantConvertImpl implements TenantConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/user/UserConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-27T15:09:15+0800",
+    date = "2024-01-02T10:49:31+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class UserConvertImpl implements UserConvert {

cdm-server/src/main/resources/application.yaml

@@ -166,7 +166,7 @@ cdm:
     license: MIT
     license-url: https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE
   captcha:
-    enable: true # 验证码的开关，默认为 true
+    enable: false # 验证码的开关，默认为 true
   codegen:
     base-package: ${cdm.info.base-package}
     db-schemas: ${spring.datasource.dynamic.datasource.master.name}