mirror of
				https://gitee.com/hhyykk/ipms-sjy.git
				synced 2025-11-04 12:18:42 +08:00 
			
		
		
		
	✨ 全局:迁移 pay 组件到 pay 模块,迁移 flowable 组件到 bpm 模块
This commit is contained in:
		@@ -111,11 +111,6 @@
 | 
				
			|||||||
                <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
 | 
					                <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
 | 
				
			||||||
                <version>${revision}</version>
 | 
					                <version>${revision}</version>
 | 
				
			||||||
            </dependency>
 | 
					            </dependency>
 | 
				
			||||||
            <dependency>
 | 
					 | 
				
			||||||
                <groupId>cn.iocoder.boot</groupId>
 | 
					 | 
				
			||||||
                <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
 | 
					 | 
				
			||||||
                <version>${revision}</version>
 | 
					 | 
				
			||||||
            </dependency>
 | 
					 | 
				
			||||||
            <dependency>
 | 
					            <dependency>
 | 
				
			||||||
                <groupId>cn.iocoder.boot</groupId>
 | 
					                <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
                <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
 | 
					                <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
 | 
				
			||||||
@@ -390,11 +385,6 @@
 | 
				
			|||||||
            </dependency>
 | 
					            </dependency>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <!-- 工作流相关 -->
 | 
					            <!-- 工作流相关 -->
 | 
				
			||||||
            <dependency>
 | 
					 | 
				
			||||||
                <groupId>cn.iocoder.boot</groupId>
 | 
					 | 
				
			||||||
                <artifactId>yudao-spring-boot-starter-flowable</artifactId>
 | 
					 | 
				
			||||||
                <version>${revision}</version>
 | 
					 | 
				
			||||||
            </dependency>
 | 
					 | 
				
			||||||
            <dependency>
 | 
					            <dependency>
 | 
				
			||||||
                <groupId>org.flowable</groupId>
 | 
					                <groupId>org.flowable</groupId>
 | 
				
			||||||
                <artifactId>flowable-spring-boot-starter-process</artifactId>
 | 
					                <artifactId>flowable-spring-boot-starter-process</artifactId>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,6 +15,7 @@
 | 
				
			|||||||
        <module>yudao-spring-boot-starter-redis</module>
 | 
					        <module>yudao-spring-boot-starter-redis</module>
 | 
				
			||||||
        <module>yudao-spring-boot-starter-web</module>
 | 
					        <module>yudao-spring-boot-starter-web</module>
 | 
				
			||||||
        <module>yudao-spring-boot-starter-security</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-monitor</module>
 | 
				
			||||||
        <module>yudao-spring-boot-starter-protection</module>
 | 
					        <module>yudao-spring-boot-starter-protection</module>
 | 
				
			||||||
@@ -26,14 +27,9 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        <module>yudao-spring-boot-starter-biz-operatelog</module>
 | 
					        <module>yudao-spring-boot-starter-biz-operatelog</module>
 | 
				
			||||||
        <module>yudao-spring-boot-starter-biz-dict</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-tenant</module>
 | 
				
			||||||
        <module>yudao-spring-boot-starter-biz-data-permission</module>
 | 
					        <module>yudao-spring-boot-starter-biz-data-permission</module>
 | 
				
			||||||
        <module>yudao-spring-boot-starter-biz-ip</module>
 | 
					        <module>yudao-spring-boot-starter-biz-ip</module>
 | 
				
			||||||
 | 
					 | 
				
			||||||
        <module>yudao-spring-boot-starter-flowable</module>
 | 
					 | 
				
			||||||
        <module>yudao-spring-boot-starter-websocket</module>
 | 
					 | 
				
			||||||
    </modules>
 | 
					    </modules>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <artifactId>yudao-framework</artifactId>
 | 
					    <artifactId>yudao-framework</artifactId>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,6 +11,7 @@
 | 
				
			|||||||
    <modules>
 | 
					    <modules>
 | 
				
			||||||
        <module>yudao-module-bpm-api</module>
 | 
					        <module>yudao-module-bpm-api</module>
 | 
				
			||||||
        <module>yudao-module-bpm-biz</module>
 | 
					        <module>yudao-module-bpm-biz</module>
 | 
				
			||||||
 | 
					        <module>yudao-spring-boot-starter-flowable</module>
 | 
				
			||||||
    </modules>
 | 
					    </modules>
 | 
				
			||||||
    <artifactId>yudao-module-bpm</artifactId>
 | 
					    <artifactId>yudao-module-bpm</artifactId>
 | 
				
			||||||
    <packaging>pom</packaging>
 | 
					    <packaging>pom</packaging>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -63,10 +63,12 @@
 | 
				
			|||||||
            <groupId>cn.iocoder.boot</groupId>
 | 
					            <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
            <artifactId>yudao-spring-boot-starter-test</artifactId>
 | 
					            <artifactId>yudao-spring-boot-starter-test</artifactId>
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- 工作流相关 -->
 | 
					        <!-- 工作流相关 -->
 | 
				
			||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
            <groupId>cn.iocoder.boot</groupId>
 | 
					            <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
            <artifactId>yudao-spring-boot-starter-flowable</artifactId>
 | 
					            <artifactId>yudao-spring-boot-starter-flowable</artifactId>
 | 
				
			||||||
 | 
					            <version>${revision}</version>
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
    </dependencies>
 | 
					    </dependencies>
 | 
				
			||||||
</project>
 | 
					</project>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,8 +3,8 @@
 | 
				
			|||||||
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
					         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">
 | 
					         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 | 
				
			||||||
    <parent>
 | 
					    <parent>
 | 
				
			||||||
        <artifactId>yudao-framework</artifactId>
 | 
					 | 
				
			||||||
        <groupId>cn.iocoder.boot</groupId>
 | 
					        <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
 | 
					        <artifactId>yudao-module-bpm</artifactId>
 | 
				
			||||||
        <version>${revision}</version>
 | 
					        <version>${revision}</version>
 | 
				
			||||||
    </parent>
 | 
					    </parent>
 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					    <modelVersion>4.0.0</modelVersion>
 | 
				
			||||||
@@ -74,12 +74,6 @@
 | 
				
			|||||||
            <artifactId>yudao-spring-boot-starter-security</artifactId>
 | 
					            <artifactId>yudao-spring-boot-starter-security</artifactId>
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- TODO 芋艿:引入依赖要优化下: -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>cn.iocoder.boot</groupId>
 | 
					 | 
				
			||||||
            <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- DB 相关 -->
 | 
					        <!-- DB 相关 -->
 | 
				
			||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
            <groupId>cn.iocoder.boot</groupId>
 | 
					            <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,6 +13,7 @@
 | 
				
			|||||||
    <modules>
 | 
					    <modules>
 | 
				
			||||||
        <module>yudao-module-pay-api</module>
 | 
					        <module>yudao-module-pay-api</module>
 | 
				
			||||||
        <module>yudao-module-pay-biz</module>
 | 
					        <module>yudao-module-pay-biz</module>
 | 
				
			||||||
 | 
					        <module>yudao-spring-boot-starter-biz-pay</module>
 | 
				
			||||||
    </modules>
 | 
					    </modules>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <name>${project.artifactId}</name>
 | 
					    <name>${project.artifactId}</name>
 | 
				
			||||||
@@ -21,5 +22,4 @@
 | 
				
			|||||||
        例如说:商户、应用、支付、退款等等
 | 
					        例如说:商户、应用、支付、退款等等
 | 
				
			||||||
    </description>
 | 
					    </description>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
</project>
 | 
					</project>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,8 +3,8 @@
 | 
				
			|||||||
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
					         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">
 | 
					         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 | 
				
			||||||
    <parent>
 | 
					    <parent>
 | 
				
			||||||
        <artifactId>yudao-module-pay</artifactId>
 | 
					 | 
				
			||||||
        <groupId>cn.iocoder.boot</groupId>
 | 
					        <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
 | 
					        <artifactId>yudao-module-pay</artifactId>
 | 
				
			||||||
        <version>${revision}</version>
 | 
					        <version>${revision}</version>
 | 
				
			||||||
    </parent>
 | 
					    </parent>
 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					    <modelVersion>4.0.0</modelVersion>
 | 
				
			||||||
@@ -37,6 +37,7 @@
 | 
				
			|||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
            <groupId>cn.iocoder.boot</groupId>
 | 
					            <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
            <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
 | 
					            <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
 | 
				
			||||||
 | 
					            <version>${revision}</version>
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
            <groupId>cn.iocoder.boot</groupId>
 | 
					            <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,8 +3,8 @@
 | 
				
			|||||||
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
					         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">
 | 
					         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 | 
				
			||||||
    <parent>
 | 
					    <parent>
 | 
				
			||||||
        <artifactId>yudao-framework</artifactId>
 | 
					 | 
				
			||||||
        <groupId>cn.iocoder.boot</groupId>
 | 
					        <groupId>cn.iocoder.boot</groupId>
 | 
				
			||||||
 | 
					        <artifactId>yudao-module-pay</artifactId>
 | 
				
			||||||
        <version>${revision}</version>
 | 
					        <version>${revision}</version>
 | 
				
			||||||
    </parent>
 | 
					    </parent>
 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					    <modelVersion>4.0.0</modelVersion>
 | 
				
			||||||
		Reference in New Issue
	
	Block a user