From ce9e03355131ea7b115e0b442abe1d98660f0fb4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 28 一月 2022 19:57:19 +0800
Subject: [PATCH] update 更新全局异常响应
---
pom.xml | 217 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 122 insertions(+), 95 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd3bf34..f19ff35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,51 +2,57 @@
<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>3.0.0</version>
+ <version>3.5.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>3.0.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.4</spring-boot.version>
+ <ruoyi-vue-plus.version>3.5.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.6.3</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.0</maven-jar-plugin.version>
- <druid.version>1.2.6</druid.version>
+ <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+ <druid.version>1.2.8</druid.version>
<knife4j.version>3.0.3</knife4j.version>
+ <swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version>
- <easyexcel.version>2.2.10</easyexcel.version>
- <velocity.version>1.7</velocity.version>
- <jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.3</mybatis-plus.version>
+ <easyexcel.version>3.0.5</easyexcel.version>
+ <cglib.version>3.3.0</cglib.version>
+ <velocity.version>2.3</velocity.version>
+ <satoken.version>1.28.0</satoken.version>
+ <mybatis-plus.version>3.5.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.11</hutool.version>
- <feign.version>3.0.3</feign.version>
- <feign-okhttp.version>11.6</feign-okhttp.version>
- <okhttp.version>4.9.1</okhttp.version>
- <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
- <redisson.version>3.16.1</redisson.version>
+ <hutool.version>5.7.20</hutool.version>
+ <okhttp.version>4.9.2</okhttp.version>
+ <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
+ <redisson.version>3.16.8</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
- <dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <dynamic-ds.version>3.5.0</dynamic-ds.version>
+ <tlog.version>1.3.6</tlog.version>
+ <xxl-job.version>2.3.0</xxl-job.version>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <jaxb.version>3.0.1</jaxb.version>
<!-- OSS 閰嶇疆 -->
- <qiniu.version>7.8.0</qiniu.version>
- <aliyun.oss.version>3.13.1</aliyun.oss.version>
- <qcloud.cos.version>5.6.51</qcloud.cos.version>
- <minio.version>8.3.0</minio.version>
+ <qiniu.version>7.9.2</qiniu.version>
+ <aliyun.oss.version>3.14.0</aliyun.oss.version>
+ <qcloud.cos.version>5.6.68</qcloud.cos.version>
+ <minio.version>8.3.5</minio.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.2</docker.plugin.version>
+
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -62,6 +68,15 @@
<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>
+
<!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -73,6 +88,18 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>swagger-annotations</artifactId>
+ <groupId>io.swagger</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-annotations.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -86,20 +113,49 @@
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
</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>
+ </dependency>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -124,24 +180,6 @@
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>${p6spy.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>
@@ -172,10 +210,30 @@
<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.yomahub</groupId>
+ <artifactId>tlog-web-spring-boot-starter</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 -->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
+ <artifactId>ruoyi-job</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -207,7 +265,7 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
- <!-- demo妯″潡 -->
+ <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId>
@@ -228,7 +286,7 @@
<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>
@@ -237,17 +295,12 @@
</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>
@@ -257,8 +310,18 @@
</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>
@@ -297,6 +360,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
+ <knife4j.production>false</knife4j.production>
<endpoints.include>'*'</endpoints.include>
</properties>
</profile>
@@ -306,6 +370,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
+ <knife4j.production>false</knife4j.production>
<endpoints.include>'*'</endpoints.include>
</properties>
<activation>
@@ -318,47 +383,9 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
- <endpoints.include>health,info</endpoints.include>
+ <knife4j.production>true</knife4j.production>
+ <endpoints.include>health, info, logfile</endpoints.include>
</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>
--
Gitblit v1.9.3