From 9ddf0c6e7641d8b9f2b8803de7655711575dd8cc Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: 星期日, 07 四月 2024 14:43:40 +0800
Subject: [PATCH] update 补充sql
---
pom.xml | 488 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 376 insertions(+), 112 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc69c11..a6ff2b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,35 +2,96 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>${ruoyi-vue-plus.version}</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>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
- <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
+ <revision>5.2.0-SNAPSHOT</revision>
+ <spring-boot.version>3.2.4</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.1.1</maven-jar-plugin.version>
- <druid.version>1.2.6</druid.version>
- <knife4j.version>3.0.2</knife4j.version>
- <poi.version>4.1.2</poi.version>
- <velocity.version>1.7</velocity.version>
- <jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.3.1</mybatis-plus.version>
- <hutool.version>5.7.1</hutool.version>
- <feign.version>2.2.6.RELEASE</feign.version>
- <feign-okhttp.version>11.0</feign-okhttp.version>
- <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
- <redisson.version>3.15.2</redisson.version>
+ <java.version>17</java.version>
+ <spring-boot.mybatis>3.0.3</spring-boot.mybatis>
+ <springdoc.version>2.4.0</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>
+ <velocity.version>2.3</velocity.version>
+ <satoken.version>1.37.0</satoken.version>
+ <mybatis-plus.version>3.5.5</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.3</spring-boot-admin.version>
+ <redisson.version>3.27.2</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.1</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.76</bouncycastle.version>
+ <justauth.version>1.16.6</justauth.version>
+ <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� -->
+ <ip2region.version>2.7.0</ip2region.version>
+
+ <!-- OSS 閰嶇疆 -->
+ <aws.sdk.version>2.25.15</aws.sdk.version>
+ <aws.crt.version>0.29.13</aws.crt.version>
+ <!-- SMS 閰嶇疆 -->
+ <sms4j.version>3.2.0</sms4j.version>
+ <!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 -->
+ <fastjson.version>1.2.83</fastjson.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>
+
+ <!--宸ヤ綔娴侀厤缃�-->
+ <flowable.version>7.0.0</flowable.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>
@@ -45,66 +106,171 @@
<scope>import</scope>
</dependency>
- <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+ <!-- hutool 鐨勪緷璧栭厤缃�-->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-bom</artifactId>
+ <version>${hutool.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>${knife4j.version}</version>
+ <groupId>org.flowable</groupId>
+ <artifactId>flowable-bom</artifactId>
+ <version>${flowable.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
- <!-- excel宸ュ叿 -->
+ <!-- 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-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>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </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浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
- <!-- Token鐢熸垚涓庤В鏋�-->
+ <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jwt.version}</version>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot3-starter</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+ <!-- Sa-Token 鏁村悎 jwt -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-jwt</artifactId>
+ <version>${satoken.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ </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-boot3-starter</artifactId>
+ <version>${dynamic-ds.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${spring-boot.mybatis}</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>
+
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-extension</artifactId>
+ <artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+
+ <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
<dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>${hutool.version}</version>
+ <groupId>p6spy</groupId>
+ <artifactId>p6spy</artifactId>
+ <version>${p6spy.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- <version>${feign.version}</version>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
</dependency>
+ <!-- AWS SDK for Java 2.x -->
<dependency>
- <groupId>io.github.openfeign</groupId>
- <artifactId>feign-okhttp</artifactId>
- <version>${feign-okhttp.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>
+ <groupId>org.dromara.sms4j</groupId>
+ <artifactId>sms4j-spring-boot-starter</artifactId>
+ <version>${sms4j.version}</version>
</dependency>
<dependency>
@@ -125,46 +291,102 @@
<version>${redisson.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
<dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+ <version>${lock4j.version}</version>
</dependency>
- <!-- 浠ｇ爜鐢熸垚-->
+ <!-- PowerJob -->
<dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <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 -->
<dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-framework</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <groupId>com.aizuda</groupId>
+ <artifactId>easy-retry-client-starter</artifactId>
+ <version>${easyretry.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.ruoyi</groupId>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${alibaba-ttl.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>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
+
+ <dependency>
+ <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>
- <!-- demo妯″潡 -->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-generator</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
+ </dependency>
+
+ <!-- 宸ヤ綔娴佹ā鍧� -->
+ <dependency>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-workflow</artifactId>
+ <version>${revision}</version>
</dependency>
</dependencies>
@@ -172,37 +394,107 @@
<modules>
<module>ruoyi-admin</module>
- <module>ruoyi-framework</module>
- <module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
- <module>ruoyi-demo</module>
+ <module>ruoyi-extend</module>
+ <module>ruoyi-modules</module>
</modules>
<packaging>pom</packaging>
-
-
- <dependencies>
-
- </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>${maven-compiler-plugin.verison}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc-scribe</artifactId>
+ <version>${therapi-javadoc.version}</version>
+ </path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.springframework.boot</groupId>
+ <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>${maven-surefire-plugin.version}</version>
+ <configuration>
+ <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
+ <groups>${profiles.active}</groups>
+ <!-- 鎺掗櫎鏍囩 -->
+ <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>
<resource>
- <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
<directory>src/main/resources</directory>
+ <!-- 鍏抽棴杩囨护 -->
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- 寮曞叆鎵�鏈� 鍖归厤鏂囦欢杩涜杩囨护 -->
+ <includes>
+ <include>application*</include>
+ <include>bootstrap*</include>
+ <include>banner*</include>
+ </includes>
<!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
<filtering>true</filtering>
</resource>
@@ -212,8 +504,8 @@
<repositories>
<repository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -223,8 +515,8 @@
<pluginRepositories>
<pluginRepository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -234,34 +526,6 @@
</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