From 5e3231d59b46adfb6e44cd4b4fb17ece12c931a9 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 11 九月 2024 12:02:16 +0800
Subject: [PATCH] !582 优化admin配置文件读取 * update 优化admin监控配置读取名称 * update 优化admin监控配置读取
---
pom.xml | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4b0b6f..e624eeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,45 +13,46 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.2.0-BETA2</revision>
- <spring-boot.version>3.2.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>17</java.version>
<mybatis.version>3.5.16</mybatis.version>
- <springdoc.version>2.5.0</springdoc.version>
+ <springdoc.version>2.6.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
- <poi.version>5.2.3</poi.version>
- <easyexcel.version>3.3.4</easyexcel.version>
+ <easyexcel.version>4.0.2</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.38.0</satoken.version>
+ <satoken.version>1.39.0</satoken.version>
<mybatis-plus.version>3.5.7</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.27</hutool.version>
+ <hutool.version>5.8.31</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
<spring-boot-admin.version>3.2.3</spring-boot-admin.version>
- <redisson.version>3.31.0</redisson.version>
+ <redisson.version>3.34.1</redisson.version>
<lock4j.version>2.2.7</lock4j.version>
<dynamic-ds.version>4.3.1</dynamic-ds.version>
- <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
- <snailjob.version>1.0.1</snailjob.version>
- <mapstruct-plus.version>1.3.6</mapstruct-plus.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.32</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.sdk.version>2.25.15</aws.sdk.version>
<aws.crt.version>0.29.13</aws.crt.version>
<!-- SMS 閰嶇疆 -->
- <sms4j.version>3.2.1</sms4j.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.0</flowable.version>
+ <flowable.version>7.0.1</flowable.version>
<!-- 鎻掍欢鐗堟湰 -->
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@@ -68,6 +69,8 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>info</logging.level>
+ <monitor.username>ruoyi</monitor.username>
+ <monitor.password>123456</monitor.password>
</properties>
</profile>
<profile>
@@ -76,6 +79,8 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>info</logging.level>
+ <monitor.username>ruoyi</monitor.username>
+ <monitor.password>123456</monitor.password>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -87,6 +92,8 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <monitor.username>ruoyi</monitor.username>
+ <monitor.password>123456</monitor.password>
</properties>
</profile>
</profiles>
@@ -156,25 +163,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浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -307,12 +298,6 @@
<version>${snailjob.version}</version>
</dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>transmittable-thread-local</artifactId>
- <version>${alibaba-ttl.version}</version>
- </dependency>
-
<!-- 鍔犲瘑鍖呭紩鍏� -->
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -334,6 +319,28 @@
</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>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.15.0</version>
+ </dependency>
+
+ <dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
--
Gitblit v1.9.3