From 3c2c87364b89de46d12e95abd5bdf8cbd2c6dbf6 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 12 三月 2025 08:43:23 +0800 Subject: [PATCH] dev-init --- pom.xml | 419 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 259 insertions(+), 160 deletions(-) diff --git a/pom.xml b/pom.xml index 700853e..3824322 100644 --- a/pom.xml +++ b/pom.xml @@ -4,48 +4,93 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.ruoyi</groupId> + <groupId>org.dromara</groupId> <artifactId>ruoyi-vue-plus</artifactId> - <version>4.4.0</version> + <version>${revision}</version> <name>RuoYi-Vue-Plus</name> - <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url> - <description>RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</description> + <url>https://gitee.com/dromara/RuoYi-Vue-Plus</url> + <description>鍏板疂杞﹂棿璐ㄩ噺绠$悊绯荤粺</description> <properties> - <ruoyi-vue-plus.version>4.4.0</ruoyi-vue-plus.version> - <spring-boot.version>2.7.6</spring-boot.version> + <revision>5.2.2</revision> + <spring-boot.version>3.2.9</spring-boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> - <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> - <spring-boot.mybatis>2.2.2</spring-boot.mybatis> - <springdoc.version>1.6.14</springdoc.version> - <poi.version>5.2.3</poi.version> - <easyexcel.version>3.1.3</easyexcel.version> + <java.version>17</java.version> + <mybatis.version>3.5.16</mybatis.version> + <springdoc.version>2.6.0</springdoc.version> + <therapi-javadoc.version>0.15.0</therapi-javadoc.version> + <easyexcel.version>4.0.2</easyexcel.version> <velocity.version>2.3</velocity.version> - <satoken.version>1.33.0</satoken.version> - <mybatis-plus.version>3.5.2</mybatis-plus.version> + <satoken.version>1.38.0</satoken.version> + <mybatis-plus.version>3.5.7</mybatis-plus.version> <p6spy.version>3.9.1</p6spy.version> - <hutool.version>5.8.10</hutool.version> + <hutool.version>5.8.31</hutool.version> <okhttp.version>4.10.0</okhttp.version> - <spring-boot-admin.version>2.7.9</spring-boot-admin.version> - <redisson.version>3.19.0</redisson.version> - <lock4j.version>2.2.3</lock4j.version> - <dynamic-ds.version>3.5.2</dynamic-ds.version> - <alibaba-ttl.version>2.14.2</alibaba-ttl.version> - <xxl-job.version>2.3.1</xxl-job.version> - <lombok.version>1.18.24</lombok.version> - - <!-- 涓存椂淇 snakeyaml 婕忔礊 --> - <snakeyaml.version>1.33</snakeyaml.version> + <spring-boot-admin.version>3.2.3</spring-boot-admin.version> + <redisson.version>3.34.1</redisson.version> + <lock4j.version>2.2.7</lock4j.version> + <dynamic-ds.version>4.3.1</dynamic-ds.version> + <snailjob.version>1.1.2</snailjob.version> + <mapstruct-plus.version>1.4.4</mapstruct-plus.version> + <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version> + <lombok.version>1.18.34</lombok.version> + <bouncycastle.version>1.76</bouncycastle.version> + <justauth.version>1.16.6</justauth.version> + <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� --> + <ip2region.version>2.7.0</ip2region.version> + <undertow.version>2.3.15.Final</undertow.version> <!-- OSS 閰嶇疆 --> - <aws-java-sdk-s3.version>1.12.349</aws-java-sdk-s3.version> + <aws.sdk.version>2.25.15</aws.sdk.version> + <aws.crt.version>0.29.13</aws.crt.version> <!-- SMS 閰嶇疆 --> - <aliyun.sms.version>2.0.22</aliyun.sms.version> - <tencent.sms.version>3.1.635</tencent.sms.version> + <sms4j.version>3.3.2</sms4j.version> + <!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 --> + <fastjson.version>1.2.83</fastjson.version> + <!-- 闈㈠悜杩愯鏃剁殑D-ORM渚濊禆 --> + <anyline.version>8.7.2-20240808</anyline.version> + <!--宸ヤ綔娴侀厤缃�--> + <flowable.version>7.0.1</flowable.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-surefire-plugin.version>3.1.2</maven-surefire-plugin.version> + <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version> </properties> + + <profiles> + <profile> + <id>local</id> + <properties> + <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> + <profiles.active>local</profiles.active> + <logging.level>info</logging.level> + </properties> + </profile> + <profile> + <id>dev</id> + <properties> + <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> + <profiles.active>dev</profiles.active> + <logging.level>info</logging.level> + </properties> + <activation> + <!-- 榛樿鐜 --> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>prod</id> + <properties> + <profiles.active>prod</profiles.active> + <logging.level>warn</logging.level> + </properties> + </profile> + </profiles> <!-- 渚濊禆澹版槑 --> <dependencyManagement> @@ -70,15 +115,39 @@ </dependency> <dependency> - <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-webmvc-core</artifactId> - <version>${springdoc.version}</version> + <groupId>org.flowable</groupId> + <artifactId>flowable-bom</artifactId> + <version>${flowable.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- JustAuth 鐨勪緷璧栭厤缃�--> + <dependency> + <groupId>me.zhyd.oauth</groupId> + <artifactId>JustAuth</artifactId> + <version>${justauth.version}</version> + </dependency> + + <!-- common 鐨勪緷璧栭厤缃�--> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-common-bom</artifactId> + <version>${revision}</version> + <type>pom</type> + <scope>import</scope> </dependency> <dependency> <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-javadoc</artifactId> + <artifactId>springdoc-openapi-starter-webmvc-api</artifactId> <version>${springdoc.version}</version> + </dependency> + + <dependency> + <groupId>com.github.therapi</groupId> + <artifactId>therapi-runtime-javadoc</artifactId> + <version>${therapi-javadoc.version}</version> </dependency> <dependency> @@ -88,25 +157,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爜鐢熸垚浣跨敤妯℃澘 --> @@ -119,7 +172,7 @@ <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ --> <dependency> <groupId>cn.dev33</groupId> - <artifactId>sa-token-spring-boot-starter</artifactId> + <artifactId>sa-token-spring-boot3-starter</artifactId> <version>${satoken.version}</version> </dependency> <!-- Sa-Token 鏁村悎 jwt --> @@ -134,24 +187,37 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>cn.dev33</groupId> + <artifactId>sa-token-core</artifactId> + <version>${satoken.version}</version> + </dependency> <!-- dynamic-datasource 澶氭暟鎹簮--> <dependency> <groupId>com.baomidou</groupId> - <artifactId>dynamic-datasource-spring-boot-starter</artifactId> + <artifactId>dynamic-datasource-spring-boot3-starter</artifactId> <version>${dynamic-ds.version}</version> </dependency> <dependency> - <groupId>com.baomidou</groupId> - <artifactId>mybatis-plus-boot-starter</artifactId> - <version>${mybatis-plus.version}</version> + <groupId>org.mybatis</groupId> + <artifactId>mybatis</artifactId> + <version>${mybatis.version}</version> </dependency> + <dependency> <groupId>com.baomidou</groupId> - <artifactId>mybatis-plus-extension</artifactId> + <artifactId>mybatis-plus-spring-boot3-starter</artifactId> <version>${mybatis-plus.version}</version> </dependency> + + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>mybatis-plus-annotation</artifactId> + <version>${mybatis-plus.version}</version> + </dependency> + <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 --> <dependency> <groupId>p6spy</groupId> @@ -165,22 +231,29 @@ <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>com.aliyun</groupId> - <artifactId>dysmsapi20170525</artifactId> - <version>${aliyun.sms.version}</version> + <groupId>software.amazon.awssdk.crt</groupId> + <artifactId>aws-crt</artifactId> + <version>${aws.crt.version}</version> </dependency> - + <!-- 鍩轰簬 AWS CRT 鐨� S3 瀹㈡埛绔殑鎬ц兘澧炲己鐨� S3 浼犺緭绠$悊鍣� --> <dependency> - <groupId>com.tencentcloudapi</groupId> - <artifactId>tencentcloud-sdk-java-sms</artifactId> - <version>${tencent.sms.version}</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3-transfer-manager</artifactId> + <version>${aws.sdk.version}</version> + </dependency> + <!--鐭俊sms4j--> + <dependency> + <groupId>org.dromara.sms4j</groupId> + <artifactId>sms4j-spring-boot-starter</artifactId> + <version>${sms4j.version}</version> </dependency> <dependency> @@ -200,86 +273,109 @@ <artifactId>redisson-spring-boot-starter</artifactId> <version>${redisson.version}</version> </dependency> + <dependency> <groupId>com.baomidou</groupId> <artifactId>lock4j-redisson-spring-boot-starter</artifactId> <version>${lock4j.version}</version> </dependency> - <!-- xxl-job-core --> + <!-- SnailJob Client --> <dependency> - <groupId>com.xuxueli</groupId> - <artifactId>xxl-job-core</artifactId> - <version>${xxl-job.version}</version> + <groupId>com.aizuda</groupId> + <artifactId>snail-job-client-starter</artifactId> + <version>${snailjob.version}</version> + </dependency> + <dependency> + <groupId>com.aizuda</groupId> + <artifactId>snail-job-client-job-core</artifactId> + <version>${snailjob.version}</version> + </dependency> + + <!-- 鍔犲瘑鍖呭紩鍏� --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15to18</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + + <dependency> + <groupId>io.github.linpeilie</groupId> + <artifactId>mapstruct-plus-spring-boot-starter</artifactId> + <version>${mapstruct-plus.version}</version> + </dependency> + + <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� ip2region --> + <dependency> + <groupId>org.lionsoul</groupId> + <artifactId>ip2region</artifactId> + <version>${ip2region.version}</version> + </dependency> + + <dependency> + <groupId>io.undertow</groupId> + <artifactId>undertow-core</artifactId> + <version>${undertow.version}</version> + </dependency> + <dependency> + <groupId>io.undertow</groupId> + <artifactId>undertow-servlet</artifactId> + <version>${undertow.version}</version> + </dependency> + <dependency> + <groupId>io.undertow</groupId> + <artifactId>undertow-websockets-jsr</artifactId> + <version>${undertow.version}</version> + </dependency> + + <dependency> + <artifactId>commons-compress</artifactId> + <groupId>org.apache.commons</groupId> + <version>1.26.2</version> </dependency> <dependency> <groupId>com.alibaba</groupId> - <artifactId>transmittable-thread-local</artifactId> - <version>${alibaba-ttl.version}</version> + <artifactId>fastjson</artifactId> + <version>${fastjson.version}</version> </dependency> - <!-- 涓存椂淇 snakeyaml 婕忔礊 --> <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>${snakeyaml.version}</version> - </dependency> - - <!-- 瀹氭椂浠诲姟 --> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-job</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - <!-- 浠g爜鐢熸垚--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-generator</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - <!-- 鏍稿績妯″潡--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-framework</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - <!-- 绯荤粺妯″潡--> - <dependency> - <groupId>com.ruoyi</groupId> + <groupId>org.dromara</groupId> <artifactId>ruoyi-system</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> - <!-- 閫氱敤宸ュ叿--> <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-common</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-job</artifactId> + <version>${revision}</version> </dependency> - <!-- OSS瀵硅薄瀛樺偍妯″潡 --> <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-oss</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-generator</artifactId> + <version>${revision}</version> </dependency> - <!-- SMS鐭俊妯″潡 --> <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-sms</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - <!-- demo妯″潡 --> - <dependency> - <groupId>com.ruoyi</groupId> + <groupId>org.dromara</groupId> <artifactId>ruoyi-demo</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> + </dependency> + + <dependency> + <groupId>org.dromara</groupId> + <artifactId>lb-qms</artifactId> + <version>${revision}</version> + </dependency> + + + <!-- 宸ヤ綔娴佹ā鍧� --> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-workflow</artifactId> + <version>${revision}</version> </dependency> </dependencies> @@ -287,15 +383,9 @@ <modules> <module>ruoyi-admin</module> - <module>ruoyi-framework</module> - <module>ruoyi-system</module> - <module>ruoyi-job</module> - <module>ruoyi-generator</module> <module>ruoyi-common</module> - <module>ruoyi-demo</module> <module>ruoyi-extend</module> - <module>ruoyi-oss</module> - <module>ruoyi-sms</module> + <module>ruoyi-modules</module> </modules> <packaging>pom</packaging> @@ -304,7 +394,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.9.0</version> + <version>${maven-compiler-plugin.verison}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> @@ -313,7 +403,7 @@ <path> <groupId>com.github.therapi</groupId> <artifactId>therapi-runtime-javadoc-scribe</artifactId> - <version>0.15.0</version> + <version>${therapi-javadoc.version}</version> </path> <path> <groupId>org.projectlombok</groupId> @@ -325,14 +415,27 @@ <artifactId>spring-boot-configuration-processor</artifactId> <version>${spring-boot.version}</version> </path> + <path> + <groupId>io.github.linpeilie</groupId> + <artifactId>mapstruct-plus-processor</artifactId> + <version>${mapstruct-plus.version}</version> + </path> + <path> + <groupId>org.projectlombok</groupId> + <artifactId>lombok-mapstruct-binding</artifactId> + <version>${mapstruct-plus.lombok.version}</version> + </path> </annotationProcessorPaths> + <compilerArgs> + <arg>-parameters</arg> + </compilerArgs> </configuration> </plugin> <!-- 鍗曞厓娴嬭瘯浣跨敤 --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.2</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <argLine>-Dfile.encoding=UTF-8</argLine> <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 --> @@ -340,6 +443,32 @@ <!-- 鎺掗櫎鏍囩 --> <excludedGroups>exclude</excludedGroups> </configuration> + </plugin> + <!-- 缁熶竴鐗堟湰鍙风鐞� --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>${flatten-maven-plugin.version}</version> + <configuration> + <updatePomFile>true</updatePomFile> + <flattenMode>resolveCiFriendliesOnly</flattenMode> + </configuration> + <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> </plugin> </plugins> <resources> @@ -386,36 +515,6 @@ </snapshots> </pluginRepository> </pluginRepositories> - - <profiles> - <profile> - <id>local</id> - <properties> - <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> - <profiles.active>local</profiles.active> - <logging.level>debug</logging.level> - </properties> - </profile> - <profile> - <id>dev</id> - <properties> - <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 --> - <profiles.active>dev</profiles.active> - <logging.level>debug</logging.level> - </properties> - <activation> - <!-- 榛樿鐜 --> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - <profile> - <id>prod</id> - <properties> - <profiles.active>prod</profiles.active> - <logging.level>warn</logging.level> - </properties> - </profile> - </profiles> </project> -- Gitblit v1.9.3