From c64de03d27e49baf46cca0c761e69b4da8dc743b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 22 一月 2025 11:24:06 +0800 Subject: [PATCH] update 优化 WorkflowService 增加获取流程变量方法 --- pom.xml | 147 ++++++++++++++++++++---------------------------- 1 files changed, 61 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 80de1c6..b5afcde 100644 --- a/pom.xml +++ b/pom.xml @@ -10,57 +10,54 @@ <name>RuoYi-Vue-Plus</name> <url>https://gitee.com/dromara/RuoYi-Vue-Plus</url> - <description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description> + <description>Dromara RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description> <properties> - <revision>5.2.0-SNAPSHOT</revision> - <spring-boot.version>3.2.3</spring-boot.version> + <revision>5.3.0-BETA</revision> + <spring-boot.version>3.4.1</spring-boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>17</java.version> - <spring-boot.mybatis>3.0.3</spring-boot.mybatis> - <springdoc.version>2.3.0</springdoc.version> + <mybatis.version>3.5.16</mybatis.version> + <springdoc.version>2.8.3</springdoc.version> <therapi-javadoc.version>0.15.0</therapi-javadoc.version> - <poi.version>5.2.3</poi.version> - <easyexcel.version>3.3.3</easyexcel.version> + <easyexcel.version>4.0.3</easyexcel.version> <velocity.version>2.3</velocity.version> - <satoken.version>1.37.0</satoken.version> - <mybatis-plus.version>3.5.5</mybatis-plus.version> + <satoken.version>1.39.0</satoken.version> + <mybatis-plus.version>3.5.10</mybatis-plus.version> <p6spy.version>3.9.1</p6spy.version> - <hutool.version>5.8.26</hutool.version> - <okhttp.version>4.10.0</okhttp.version> - <spring-boot-admin.version>3.2.2</spring-boot-admin.version> - <redisson.version>3.27.0</redisson.version> + <hutool.version>5.8.35</hutool.version> + <spring-boot-admin.version>3.4.1</spring-boot-admin.version> + <redisson.version>3.43.0</redisson.version> <lock4j.version>2.2.7</lock4j.version> - <dynamic-ds.version>4.3.0</dynamic-ds.version> - <alibaba-ttl.version>2.14.4</alibaba-ttl.version> - <powerjob.version>4.3.6</powerjob.version> - <easyretry.version>3.1.0</easyretry.version> - <mapstruct-plus.version>1.3.6</mapstruct-plus.version> + <dynamic-ds.version>4.3.1</dynamic-ds.version> + <snailjob.version>1.3.0-beta2</snailjob.version> + <mapstruct-plus.version>1.4.6</mapstruct-plus.version> <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version> - <lombok.version>1.18.30</lombok.version> + <lombok.version>1.18.36</lombok.version> <bouncycastle.version>1.76</bouncycastle.version> - <justauth.version>1.16.6</justauth.version> + <justauth.version>1.16.7</justauth.version> <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� --> <ip2region.version>2.7.0</ip2region.version> <!-- OSS 閰嶇疆 --> - <aws.sdk.version>2.23.0</aws.sdk.version> - <aws.crt.version>0.29.6</aws.crt.version> + <aws.sdk.version>2.28.22</aws.sdk.version> + <aws.crt.version>0.31.3</aws.crt.version> <!-- SMS 閰嶇疆 --> - <sms4j.version>3.1.1</sms4j.version> + <sms4j.version>3.3.3</sms4j.version> <!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 --> <fastjson.version>1.2.83</fastjson.version> + <!-- 闈㈠悜杩愯鏃剁殑D-ORM渚濊禆 --> + <anyline.version>8.7.2-20250101</anyline.version> + <!--宸ヤ綔娴侀厤缃�--> + <warm-flow.version>1.6.0-m5</warm-flow.version> <!-- 鎻掍欢鐗堟湰 --> <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> <maven-war-plugin.version>3.2.2</maven-war-plugin.version> - <maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison> + <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version> <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version> <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version> - - <!--宸ヤ綔娴侀厤缃�--> - <flowable.version>7.0.0</flowable.version> </properties> <profiles> @@ -70,6 +67,8 @@ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> <profiles.active>local</profiles.active> <logging.level>info</logging.level> + <monitor.username>ruoyi</monitor.username> + <monitor.password>123456</monitor.password> </properties> </profile> <profile> @@ -78,6 +77,8 @@ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> <profiles.active>dev</profiles.active> <logging.level>info</logging.level> + <monitor.username>ruoyi</monitor.username> + <monitor.password>123456</monitor.password> </properties> <activation> <!-- 榛樿鐜 --> @@ -89,6 +90,8 @@ <properties> <profiles.active>prod</profiles.active> <logging.level>warn</logging.level> + <monitor.username>ruoyi</monitor.username> + <monitor.password>123456</monitor.password> </properties> </profile> </profiles> @@ -115,12 +118,16 @@ <scope>import</scope> </dependency> + <!-- Warm-Flow鍥戒骇宸ヤ綔娴佸紩鎿�, 鍦ㄧ嚎鏂囨。锛歨ttp://warm-flow.cn/ --> <dependency> - <groupId>org.flowable</groupId> - <artifactId>flowable-bom</artifactId> - <version>${flowable.version}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.dromara.warm</groupId> + <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId> + <version>${warm-flow.version}</version> + </dependency> + <dependency> + <groupId>org.dromara.warm</groupId> + <artifactId>warm-flow-plugin-ui-sb-web</artifactId> + <version>${warm-flow.version}</version> </dependency> <!-- JustAuth 鐨勪緷璧栭厤缃�--> @@ -158,25 +165,9 @@ </dependency> <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> <groupId>com.alibaba</groupId> <artifactId>easyexcel</artifactId> <version>${easyexcel.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml-schemas</artifactId> - </exclusion> - </exclusions> </dependency> <!-- velocity浠g爜鐢熸垚浣跨敤妯℃澘 --> @@ -218,14 +209,20 @@ </dependency> <dependency> - <groupId>org.mybatis.spring.boot</groupId> - <artifactId>mybatis-spring-boot-starter</artifactId> - <version>${spring-boot.mybatis}</version> + <groupId>org.mybatis</groupId> + <artifactId>mybatis</artifactId> + <version>${mybatis.version}</version> </dependency> <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-spring-boot3-starter</artifactId> + <version>${mybatis-plus.version}</version> + </dependency> + + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>mybatis-plus-jsqlparser</artifactId> <version>${mybatis-plus.version}</version> </dependency> @@ -240,12 +237,6 @@ <groupId>p6spy</groupId> <artifactId>p6spy</artifactId> <version>${p6spy.version}</version> - </dependency> - - <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>okhttp</artifactId> - <version>${okhttp.version}</version> </dependency> <!-- AWS SDK for Java 2.x --> @@ -297,39 +288,16 @@ <version>${lock4j.version}</version> </dependency> - <!-- PowerJob --> - <dependency> - <groupId>tech.powerjob</groupId> - <artifactId>powerjob-worker-spring-boot-starter</artifactId> - <version>${powerjob.version}</version> - </dependency> - <dependency> - <groupId>tech.powerjob</groupId> - <artifactId>powerjob-official-processors</artifactId> - <version>${powerjob.version}</version> - </dependency> - - <!-- EasyRetry Client --> + <!-- SnailJob Client --> <dependency> <groupId>com.aizuda</groupId> - <artifactId>easy-retry-client-starter</artifactId> - <version>${easyretry.version}</version> + <artifactId>snail-job-client-starter</artifactId> + <version>${snailjob.version}</version> </dependency> <dependency> <groupId>com.aizuda</groupId> - <artifactId>easy-retry-client-core</artifactId> - <version>${easyretry.version}</version> - </dependency> - <dependency> - <groupId>com.aizuda</groupId> - <artifactId>easy-retry-client-job-core</artifactId> - <version>${easyretry.version}</version> - </dependency> - - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>transmittable-thread-local</artifactId> - <version>${alibaba-ttl.version}</version> + <artifactId>snail-job-client-job-core</artifactId> + <version>${snailjob.version}</version> </dependency> <!-- 鍔犲瘑鍖呭紩鍏� --> @@ -350,6 +318,12 @@ <groupId>org.lionsoul</groupId> <artifactId>ip2region</artifactId> <version>${ip2region.version}</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.15.0</version> </dependency> <dependency> @@ -405,7 +379,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.verison}</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> @@ -448,6 +422,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${maven-surefire-plugin.version}</version> <configuration> + <argLine>-Dfile.encoding=UTF-8</argLine> <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 --> <groups>${profiles.active}</groups> <!-- 鎺掗櫎鏍囩 --> -- Gitblit v1.9.3