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

This commit is contained in:
lbw 2024-02-19 16:00:12 +08:00
commit bc86d5e91c
4 changed files with 7 additions and 6 deletions

View File

@ -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 |
### 模块说明

View File

@ -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>

View File

@ -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>

View File

@ -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) {