From 3ab03bf0e7809b9c0b5fc07b4644412086bc9249 Mon Sep 17 00:00:00 2001 From: Michelle.Chung <1242874891@qq.com> Date: 星期四, 23 二月 2023 20:31:57 +0800 Subject: [PATCH] fix 修正创建租户失败时未关闭忽略租户问题 ; --- pom.xml | 683 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 406 insertions(+), 277 deletions(-) diff --git a/pom.xml b/pom.xml index d71181b..3fd70c6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,257 +2,58 @@ <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> <artifactId>ruoyi-vue-plus</artifactId> - <version>2.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> <properties> - <ruoyi-vue-plus.version>2.4.0</ruoyi-vue-plus.version> - <spring-boot.version>2.4.8</spring-boot.version> + <revision>5.0.0-SNAPSHOT</revision> + <spring-boot.version>3.0.2</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.3</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</mybatis-plus.version> - <hutool.version>5.7.3</hutool.version> - <feign.version>3.0.3</feign.version> - <feign-okhttp.version>11.0</feign-okhttp.version> - <spring-boot-admin.version>2.4.3</spring-boot-admin.version> - <redisson.version>3.16.0</redisson.version> - <lock4j.version>2.2.1</lock4j.version> - <datasource.version>3.4.0</datasource.version> + <java.version>17</java.version> + <spring-boot.mybatis>3.0.0</spring-boot.mybatis> + <springdoc.version>2.0.2</springdoc.version> + <therapi-javadoc.version>0.15.0</therapi-javadoc.version> + <poi.version>5.2.3</poi.version> + <easyexcel.version>3.2.0</easyexcel.version> + <velocity.version>2.3</velocity.version> + <satoken.version>1.34.0</satoken.version> + <mybatis-plus.version>3.5.3.1</mybatis-plus.version> + <p6spy.version>3.9.1</p6spy.version> + <hutool.version>5.8.11</hutool.version> + <okhttp.version>4.10.0</okhttp.version> + <spring-boot-admin.version>3.0.0</spring-boot-admin.version> + <redisson.version>3.19.2</redisson.version> + <lock4j.version>2.2.4</lock4j.version> + <dynamic-ds.version>3.6.1</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> + <bouncycastle.version>1.72</bouncycastle.version> - <!-- docker 閰嶇疆 --> - <docker.registry.url>localhost</docker.registry.url> - <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host> - <docker.namespace>ruoyi</docker.namespace> - <docker.plugin.version>1.2.0</docker.plugin.version> + <!-- 涓存椂淇 snakeyaml 婕忔礊 --> + <snakeyaml.version>1.33</snakeyaml.version> + + <!-- OSS 閰嶇疆 --> + <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version> + <!-- SMS 閰嶇疆 --> + <aliyun.sms.version>2.0.23</aliyun.sms.version> + <tencent.sms.version>3.1.687</tencent.sms.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.10.1</maven-compiler-plugin.verison> + <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version> + <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version> </properties> - - <!-- 渚濊禆澹版槑 --> - <dependencyManagement> - <dependencies> - - <!-- SpringBoot鐨勪緷璧栭厤缃�--> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 --> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>druid-spring-boot-starter</artifactId> - <version>${druid.version}</version> - </dependency> - - <dependency> - <groupId>com.github.xiaoymin</groupId> - <artifactId>knife4j-spring-boot-starter</artifactId> - <version>${knife4j.version}</version> - </dependency> - - <!-- excel宸ュ叿 --> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> - </dependency> - - <!-- velocity浠g爜鐢熸垚浣跨敤妯℃澘 --> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>${velocity.version}</version> - </dependency> - - <!-- Token鐢熸垚涓庤В鏋�--> - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt</artifactId> - <version>${jwt.version}</version> - </dependency> - - <!-- dynamic-datasource 澶氭暟鎹簮--> - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>dynamic-datasource-spring-boot-starter</artifactId> - <version>${datasource.version}</version> - </dependency> - - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>mybatis-plus-boot-starter</artifactId> - <version>${mybatis-plus.version}</version> - </dependency> - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>mybatis-plus-extension</artifactId> - <version>${mybatis-plus.version}</version> - </dependency> - - <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-all</artifactId> - <version>${hutool.version}</version> - </dependency> - - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-openfeign</artifactId> - <version>${feign.version}</version> - </dependency> - - <dependency> - <groupId>io.github.openfeign</groupId> - <artifactId>feign-okhttp</artifactId> - <version>${feign-okhttp.version}</version> - </dependency> - - <dependency> - <groupId>de.codecentric</groupId> - <artifactId>spring-boot-admin-starter-server</artifactId> - <version>${spring-boot-admin.version}</version> - </dependency> - <dependency> - <groupId>de.codecentric</groupId> - <artifactId>spring-boot-admin-starter-client</artifactId> - <version>${spring-boot-admin.version}</version> - </dependency> - - <!--redisson--> - <dependency> - <groupId>org.redisson</groupId> - <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> - <!-- 瀹氭椂浠诲姟--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-quartz</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> - <artifactId>ruoyi-system</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - <!-- 閫氱敤宸ュ叿--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-common</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - <!-- demo妯″潡 --> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-demo</artifactId> - <version>${ruoyi-vue-plus.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <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> - </modules> - <packaging>pom</packaging> - - - <dependencies> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>${java.version}</source> - <target>${java.version}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - <resources> - <resource> - <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml --> - <directory>src/main/resources</directory> - <!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� --> - <filtering>true</filtering> - </resource> - </resources> - </build> - - <repositories> - <repository> - <id>public</id> - <name>aliyun nexus</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>public</id> - <name>aliyun nexus</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> <profiles> <profile> @@ -282,45 +83,373 @@ <logging.level>warn</logging.level> </properties> </profile> - - <!-- jdk澶氱増鏈厤缃� --> - <profile> - <id>jdk8</id> - <activation> - <activeByDefault>true</activeByDefault> - <jdk>1.8</jdk> - </activation> - <properties> - <java.version>1.8</java.version> - </properties> - </profile> - <profile> - <id>jdk11</id> - <activation> - <jdk>11</jdk> - </activation> - <properties> - <java.version>11</java.version> - <jaxb.version>3.0.1</jaxb.version> - </properties> - <dependencyManagement> - <dependencies> - <!-- jdk11 缂哄け渚濊禆 jaxb--> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <!--jaxb--> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - </dependencies> - </profile> </profiles> + <!-- 渚濊禆澹版槑 --> + <dependencyManagement> + <dependencies> + + <!-- SpringBoot鐨勪緷璧栭厤缃�--> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- hutool 鐨勪緷璧栭厤缃�--> + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-bom</artifactId> + <version>${hutool.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- common 鐨勪緷璧栭厤缃�--> + <dependency> + <groupId>com.ruoyi</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浠g爜鐢熸垚浣跨敤妯℃澘 --> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-engine-core</artifactId> + <version>${velocity.version}</version> + </dependency> + + <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ --> + <dependency> + <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-boot-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> + <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> + <artifactId>p6spy</artifactId> + <version>${p6spy.version}</version> + </dependency> + + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> + </dependency> + + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> + <version>${aws-java-sdk-s3.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun</groupId> + <artifactId>dysmsapi20170525</artifactId> + <version>${aliyun.sms.version}</version> + </dependency> + + <dependency> + <groupId>com.tencentcloudapi</groupId> + <artifactId>tencentcloud-sdk-java-sms</artifactId> + <version>${tencent.sms.version}</version> + </dependency> + + <dependency> + <groupId>de.codecentric</groupId> + <artifactId>spring-boot-admin-starter-server</artifactId> + <version>${spring-boot-admin.version}</version> + </dependency> + <dependency> + <groupId>de.codecentric</groupId> + <artifactId>spring-boot-admin-starter-client</artifactId> + <version>${spring-boot-admin.version}</version> + </dependency> + + <!--redisson--> + <dependency> + <groupId>org.redisson</groupId> + <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 --> + <dependency> + <groupId>com.xuxueli</groupId> + <artifactId>xxl-job-core</artifactId> + <version>${xxl-job.version}</version> + </dependency> + + <dependency> + <groupId>com.alibaba</groupId> + <artifactId>transmittable-thread-local</artifactId> + <version>${alibaba-ttl.version}</version> + </dependency> + + <!-- 涓存椂淇 snakeyaml 婕忔礊 --> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>${snakeyaml.version}</version> + </dependency> + + <!-- 鍔犲瘑鍖呭紩鍏� --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15to18</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-system</artifactId> + <version>${revision}</version> + </dependency> + + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-job</artifactId> + <version>${revision}</version> + </dependency> + + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-generator</artifactId> + <version>${revision}</version> + </dependency> + + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-demo</artifactId> + <version>${revision}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <modules> + <module>ruoyi-admin</module> + <module>ruoyi-common</module> + <module>ruoyi-extend</module> + <module>ruoyi-modules</module> + </modules> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <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> + </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> + <argLine> + -Dfile.encoding=UTF-8 + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang.invoke=ALL-UNNAMED + </argLine> + <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘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> + <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> + </resources> + </build> + + <repositories> + <repository> + <id>public</id> + <name>aliyun nexus</name> + <url>https://maven.aliyun.com/repository/public/</url> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>public</id> + <name>aliyun nexus</name> + <url>https://maven.aliyun.com/repository/public/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </project> + + -- Gitblit v1.9.3