Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	src/main/java/cn/somkit/fmt/action/DownloadAction.java
#	src/main/java/cn/somkit/fmt/action/UploadAction.java
#	src/main/java/cn/somkit/fmt/config/LogSocketConfig.java
#	src/main/java/cn/somkit/fmt/config/RocksDBConfig.java
#	src/main/java/cn/somkit/fmt/utils/LogSocketUtils.java
#	src/main/java/cn/somkit/fmt/utils/RocksDBUtils.java
#	src/main/resources/application.yml
#	src/main/resources/templates/logging.html
This commit is contained in:
2025-07-18 15:00:42 +08:00
30 changed files with 841 additions and 1221 deletions

38
pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.1</version>
<version>3.5.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>cn.somkit</groupId>
@@ -14,44 +14,42 @@
<name>fmt</name>
<description>fmt</description>
<properties>
<java.version>17</java.version>
<java.version>21</java.version>
</properties>
<repositories>
<repository>
<id>metona-maven</id>
<url>https://gitee.com/thzxx/maven/raw/master</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.7</version>
</dependency>
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
<version>8.3.2</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-json</artifactId>
<version>5.8.21</version>
<version>5.8.25</version>
</dependency>
<dependency>
<groupId>cn.metona</groupId>
<artifactId>metona-cache-spring-boot-starter</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>