From 1ff6502ea9d0472640cd9a253f252c4f5e1e7ce0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 16 五月 2024 13:33:20 +0800 Subject: [PATCH] remove 移除 powerjob 相关菜单 --- pom.xml | 120 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 83 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 8aac718..b084048 100644 --- a/pom.xml +++ b/pom.xml @@ -13,40 +13,43 @@ <description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description> <properties> - <revision>5.1.0</revision> - <spring-boot.version>3.1.5</spring-boot.version> + <revision>5.2.0-SNAPSHOT</revision> + <spring-boot.version>3.2.5</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.2</spring-boot.mybatis> - <springdoc.version>2.2.0</springdoc.version> + <mybatis.version>3.5.16</mybatis.version> + <springdoc.version>2.5.0</springdoc.version> <therapi-javadoc.version>0.15.0</therapi-javadoc.version> - <poi.version>5.2.4</poi.version> - <easyexcel.version>3.3.2</easyexcel.version> + <poi.version>5.2.3</poi.version> + <easyexcel.version>3.3.4</easyexcel.version> <velocity.version>2.3</velocity.version> - <satoken.version>1.37.0</satoken.version> - <mybatis-plus.version>3.5.3.2</mybatis-plus.version> + <satoken.version>1.38.0</satoken.version> + <mybatis-plus.version>3.5.6</mybatis-plus.version> <p6spy.version>3.9.1</p6spy.version> - <hutool.version>5.8.22</hutool.version> + <hutool.version>5.8.27</hutool.version> <okhttp.version>4.10.0</okhttp.version> - <spring-boot-admin.version>3.1.7</spring-boot-admin.version> - <redisson.version>3.24.1</redisson.version> - <lock4j.version>2.2.5</lock4j.version> - <dynamic-ds.version>4.1.3</dynamic-ds.version> - <alibaba-ttl.version>2.14.2</alibaba-ttl.version> - <powerjob.version>4.3.3</powerjob.version> - <mapstruct-plus.version>1.3.5</mapstruct-plus.version> + <spring-boot-admin.version>3.2.3</spring-boot-admin.version> + <redisson.version>3.29.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> + <easyretry.version>3.2.0</easyretry.version> + <mapstruct-plus.version>1.3.6</mapstruct-plus.version> <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version> - <lombok.version>1.18.30</lombok.version> - <bouncycastle.version>1.72</bouncycastle.version> - <justauth.version>1.16.5</justauth.version> + <lombok.version>1.18.32</lombok.version> + <bouncycastle.version>1.76</bouncycastle.version> + <justauth.version>1.16.6</justauth.version> <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� --> <ip2region.version>2.7.0</ip2region.version> <!-- OSS 閰嶇疆 --> - <aws-java-sdk-s3.version>1.12.540</aws-java-sdk-s3.version> + <aws.sdk.version>2.25.15</aws.sdk.version> + <aws.crt.version>0.29.13</aws.crt.version> <!-- SMS 閰嶇疆 --> - <sms4j.version>2.2.0</sms4j.version> + <sms4j.version>3.2.1</sms4j.version> + <!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 --> + <fastjson.version>1.2.83</fastjson.version> <!-- 鎻掍欢鐗堟湰 --> <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> @@ -54,6 +57,9 @@ <maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison> <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> @@ -62,7 +68,7 @@ <properties> <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> <profiles.active>local</profiles.active> - <logging.level>debug</logging.level> + <logging.level>info</logging.level> </properties> </profile> <profile> @@ -70,7 +76,7 @@ <properties> <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> <profiles.active>dev</profiles.active> - <logging.level>debug</logging.level> + <logging.level>info</logging.level> </properties> <activation> <!-- 榛樿鐜 --> @@ -104,6 +110,14 @@ <groupId>cn.hutool</groupId> <artifactId>hutool-bom</artifactId> <version>${hutool.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.flowable</groupId> + <artifactId>flowable-bom</artifactId> + <version>${flowable.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -203,14 +217,14 @@ </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-boot-starter</artifactId> + <artifactId>mybatis-plus-spring-boot3-starter</artifactId> <version>${mybatis-plus.version}</version> </dependency> @@ -233,10 +247,23 @@ <version>${okhttp.version}</version> </dependency> + <!-- AWS SDK for Java 2.x --> <dependency> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-s3</artifactId> - <version>${aws-java-sdk-s3.version}</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3</artifactId> + <version>${aws.sdk.version}</version> + </dependency> + <!-- 浣跨敤AWS鍩轰簬 CRT 鐨� S3 瀹㈡埛绔� --> + <dependency> + <groupId>software.amazon.awssdk.crt</groupId> + <artifactId>aws-crt</artifactId> + <version>${aws.crt.version}</version> + </dependency> + <!-- 鍩轰簬 AWS CRT 鐨� S3 瀹㈡埛绔殑鎬ц兘澧炲己鐨� S3 浼犺緭绠$悊鍣� --> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3-transfer-manager</artifactId> + <version>${aws.sdk.version}</version> </dependency> <!--鐭俊sms4j--> <dependency> @@ -269,16 +296,21 @@ <version>${lock4j.version}</version> </dependency> - <!-- PowerJob --> + <!-- EasyRetry Client --> <dependency> - <groupId>tech.powerjob</groupId> - <artifactId>powerjob-worker-spring-boot-starter</artifactId> - <version>${powerjob.version}</version> + <groupId>com.aizuda</groupId> + <artifactId>easy-retry-client-starter</artifactId> + <version>${easyretry.version}</version> </dependency> <dependency> - <groupId>tech.powerjob</groupId> - <artifactId>powerjob-official-processors</artifactId> - <version>${powerjob.version}</version> + <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> @@ -308,6 +340,12 @@ </dependency> <dependency> + <groupId>com.alibaba</groupId> + <artifactId>fastjson</artifactId> + <version>${fastjson.version}</version> + </dependency> + + <dependency> <groupId>org.dromara</groupId> <artifactId>ruoyi-system</artifactId> <version>${revision}</version> @@ -328,6 +366,13 @@ <dependency> <groupId>org.dromara</groupId> <artifactId>ruoyi-demo</artifactId> + <version>${revision}</version> + </dependency> + + <!-- 宸ヤ綔娴佹ā鍧� --> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-workflow</artifactId> <version>${revision}</version> </dependency> @@ -390,6 +435,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