From 4063b0c2ddc13d19f262267a83e1b707af1f2409 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 17:10:39 +0800
Subject: [PATCH] fix 修复 用户注册 用户类型字段书写错误
---
pom.xml | 301 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 206 insertions(+), 95 deletions(-)
diff --git a/pom.xml b/pom.xml
index cf20fa5..3de969c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,36 +2,51 @@
<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>4.4.0</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.7</spring-boot.version>
+ <ruoyi-vue-plus.version>4.4.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.7.6</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>
+ <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+ <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+ <springdoc.version>1.6.13</springdoc.version>
+ <poi.version>5.2.3</poi.version>
+ <easyexcel.version>3.1.3</easyexcel.version>
+ <velocity.version>2.3</velocity.version>
+ <satoken.version>1.33.0</satoken.version>
+ <mybatis-plus.version>3.5.2</mybatis-plus.version>
+ <p6spy.version>3.9.1</p6spy.version>
+ <hutool.version>5.8.10</hutool.version>
+ <okhttp.version>4.10.0</okhttp.version>
+ <spring-boot-admin.version>2.7.7</spring-boot-admin.version>
+ <redisson.version>3.18.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>
+
+ <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
+ <guava.version>31.1-jre</guava.version>
+ <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
+ <snakeyaml.version>1.32</snakeyaml.version>
+
+ <!-- OSS 閰嶇疆 -->
+ <aws-java-sdk-s3.version>1.12.349</aws-java-sdk-s3.version>
+ <!-- SMS 閰嶇疆 -->
+ <aliyun.sms.version>2.0.22</aliyun.sms.version>
+ <tencent.sms.version>3.1.635</tencent.sms.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -47,45 +62,86 @@
<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.springdoc</groupId>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
- <!-- excel宸ュ叿 -->
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-javadoc</artifactId>
+ <version>${springdoc.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-boot-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>
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>${datasource.version}</version>
+ <version>${dynamic-ds.version}</version>
</dependency>
<dependency>
@@ -98,23 +154,35 @@
<artifactId>mybatis-plus-extension</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>
<dependency>
- <groupId>io.github.openfeign</groupId>
- <artifactId>feign-okhttp</artifactId>
- <version>${feign-okhttp.version}</version>
+ <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>
@@ -139,10 +207,38 @@
<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>
+
+ <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 -->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
+ <artifactId>ruoyi-job</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -174,6 +270,20 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
+ <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-oss</artifactId>
+ <version>${ruoyi-vue-plus.version}</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>
@@ -188,35 +298,73 @@
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</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>
</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>3.9.0</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>0.15.0</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>
+ </configuration>
+ </plugin>
+ <!-- 鍗曞厓娴嬭瘯浣跨敤 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ <configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
+ <groups>${profiles.active}</groups>
+ <!-- 鎺掗櫎鏍囩 -->
+ <excludedGroups>exclude</excludedGroups>
</configuration>
</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>
@@ -226,8 +374,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>
@@ -237,8 +385,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>
@@ -276,45 +424,8 @@
<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>
</project>
+
+
--
Gitblit v1.9.3