Merge remote-tracking branch 'origin/jdk17-dev' into jdk17-dev

pig-mesh · Feb 19, 2024 · bc86d5e · bc86d5e
2 parents 50edcbb + 699a2d4
commit bc86d5e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,8 @@
 | Spring Cloud Alibaba        | 2022.0.0.0 |
 | Spring Authorization Server | 1.2.1      |
 | Mybatis Plus                | 3.5.5      |
-| hutool                      | 5.8.23     |
+| Vue                      | 3.4     |
+| Element Plus                      | 2.5     |
 
 ### 模块说明
 

diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
@@ -34,7 +34,7 @@
         <sms.version>3.0.0</sms.version>
         <jaxb.version>2.3.5</jaxb.version>
         <shardingsphere.version>5.4.1</shardingsphere.version>
-        <hutool.version>5.8.23</hutool.version>
+        <hutool.version>5.8.26</hutool.version>
         <sentinel.version>1.8.4</sentinel.version>
         <spring.checkstyle.plugin>0.0.39</spring.checkstyle.plugin>
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>

diff --git a/pig-register/pom.xml b/pig-register/pom.xml
@@ -28,9 +28,9 @@
 
 	<properties>
 		<nacos.version>2.2.4-OEM</nacos.version>
-		<spring-boot-dependencies.version>2.7.16</spring-boot-dependencies.version>
-		<spring-cloud.version>2022.0.4</spring-cloud.version>
-		<spring-boot-admin.version>2.7.11</spring-boot-admin.version>
+		<spring-boot-dependencies.version>2.7.18</spring-boot-dependencies.version>
+		<spring-cloud.version>2022.0.5</spring-cloud.version>
+		<spring-boot-admin.version>2.7.15</spring-boot-admin.version>
 	</properties>
 
 	<dependencies>

diff --git a/...ig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysSystemInfoController.java b/...ig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysSystemInfoController.java
@@ -32,7 +32,7 @@ public class SysSystemInfoController {
 	public R cache() {
 		Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
 		Properties commandStats = (Properties) redisTemplate
-			.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+			.execute((RedisCallback<Object>) connection -> connection.serverCommands().info("commandstats"));
 		Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
 
 		if (commandStats == null) {