Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud

yudao-dependencies/pom.xml

@@ -132,11 +132,6 @@
                 <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.iocoder.cloud</groupId>
-                <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>cn.iocoder.cloud</groupId>
                 <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
@@ -426,11 +421,6 @@
             </dependency>
 
             <!-- 工作流相关 -->
-            <dependency>
-                <groupId>cn.iocoder.cloud</groupId>
-                <artifactId>yudao-spring-boot-starter-flowable</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>org.flowable</groupId>
                 <artifactId>flowable-spring-boot-starter-process</artifactId>

yudao-framework/pom.xml

@@ -16,6 +16,7 @@
         <module>yudao-spring-boot-starter-redis</module>
         <module>yudao-spring-boot-starter-web</module>
         <module>yudao-spring-boot-starter-security</module>
+        <module>yudao-spring-boot-starter-websocket</module>
 
         <module>yudao-spring-boot-starter-monitor</module>
         <module>yudao-spring-boot-starter-protection</module>
@@ -29,14 +30,9 @@
 
         <module>yudao-spring-boot-starter-biz-operatelog</module>
         <module>yudao-spring-boot-starter-biz-dict</module>
-
-        <module>yudao-spring-boot-starter-biz-pay</module>
         <module>yudao-spring-boot-starter-biz-tenant</module>
         <module>yudao-spring-boot-starter-biz-data-permission</module>
         <module>yudao-spring-boot-starter-biz-ip</module>
-
-        <module>yudao-spring-boot-starter-flowable</module>
-        <module>yudao-spring-boot-starter-websocket</module>
     </modules>
 
     <artifactId>yudao-framework</artifactId>

yudao-module-bpm/pom.xml

@@ -11,6 +11,7 @@
     <modules>
         <module>yudao-module-bpm-api</module>
         <module>yudao-module-bpm-biz</module>
+        <module>yudao-spring-boot-starter-flowable</module>
     </modules>
     <artifactId>yudao-module-bpm</artifactId>
     <packaging>pom</packaging>

yudao-module-bpm/yudao-module-bpm-biz/pom.xml

@@ -104,8 +104,10 @@
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-flowable</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
+
     <build>
         <!-- 设置构建的 jar 包名 -->
         <finalName>${project.artifactId}</finalName>

yudao-module-bpm/yudao-spring-boot-starter-flowable/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yudao-framework</artifactId>
         <groupId>cn.iocoder.cloud</groupId>
+        <artifactId>yudao-module-bpm</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

yudao-module-mall/yudao-module-trade-biz/pom.xml

@@ -86,12 +86,6 @@
             <artifactId>yudao-spring-boot-starter-security</artifactId>
         </dependency>
 
-        <!-- TODO 芋艿：引入依赖要优化下： -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
-        </dependency>
-
         <!-- DB 相关 -->
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>

yudao-module-pay/yudao-module-pay-biz/pom.xml

@@ -48,6 +48,7 @@
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
+            <version>${revision}</version>
         </dependency>
 
         <!-- Web 相关 -->

yudao-module-pay/yudao-spring-boot-starter-biz-pay/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>cn.iocoder.cloud</groupId>
-        <artifactId>yudao-framework</artifactId>
+        <artifactId>yudao-module-pay</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>