chore: upgrade deps(SpringBoot v3.5.8)

app/build.gradle

@@ -2,6 +2,7 @@ apply plugin: "com.gorylenko.gradle-git-properties"
 
 group = 'com.yiring'
 version = '0.0.1-SNAPSHOT'
+description = 'basic api boot starter'
 
 processResources {
 	// 将 gradle 配置注入配置文件
@@ -22,6 +23,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
 	// Sentry
 	implementation "io.sentry:sentry-spring-boot-starter-jakarta"

app/src/main/resources/application-mock.yml

@@ -53,3 +53,5 @@ logging:
     org.hibernate.type.descriptor.sql.BasicBinder: trace
     # request log
     com.yiring.common.aspect.RequestAspect: info
+  loki:
+    enabled: false

build.gradle

@@ -2,14 +2,14 @@ plugins {
     id 'java'
     id 'java-library'
     // https://start.spring.io
-    id 'org.springframework.boot' version '3.5.5'
+    id 'org.springframework.boot' version '3.5.8'
     id 'org.graalvm.buildtools.native' version '0.10.6'
     // https://plugins.gradle.org/plugin/io.spring.dependency-management
     id 'io.spring.dependency-management' version '1.1.7'
     // https://plugins.gradle.org/plugin/com.diffplug.spotless
-    id "com.diffplug.spotless" version "7.2.1"
+    id "com.diffplug.spotless" version "8.1.0"
     // https://plugins.gradle.org/plugin/com.gorylenko.gradle-git-properties
-    id "com.gorylenko.gradle-git-properties" version "2.5.2"
+    id "com.gorylenko.gradle-git-properties" version "2.5.4"
 }
 
 ext {
@@ -29,43 +29,43 @@ ext {
 
     // SpringBootAdmin
     // https://central.sonatype.com/artifact/de.codecentric/spring-boot-admin-starter-server
-    springBootAdminVersion = '3.5.2'
+    springBootAdminVersion = '3.5.6'
 
     // Sentry
     // https://central.sonatype.com/artifact/io.sentry/sentry-spring-boot-starter-jakarta
-    sentryVersion = '8.20.0'
+    sentryVersion = '8.27.0'
 
     // Dependencies
     // https://central.sonatype.com/artifact/com.github.xiaoymin/knife4j-openapi3-jakarta-spring-boot-starter
     knife4jOpen3Version = '4.5.0'
     // https://central.sonatype.com/artifact/io.swagger.core.v3/swagger-annotations
-    swaggerAnnotationsVersion = '2.2.36'
+    swaggerAnnotationsVersion = '2.2.40'
     // https://central.sonatype.com/artifact/cn.dev33/sa-token-spring-boot3-starter
     saTokenVersion = '1.44.0'
     // https://central.sonatype.com/artifact/cn.hutool/hutool-core
-    hutoolVersion = '5.8.40'
+    hutoolVersion = '5.8.41'
     // https://central.sonatype.com/artifact/com.alibaba.fastjson2/fastjson2
-    fastJsonVersion = '2.0.58'
+    fastJsonVersion = '2.0.60'
     // https://central.sonatype.com/artifact/com.xuxueli/xxl-job-core
     xxlJobVersion = '3.2.0'
     // https://central.sonatype.com/artifact/io.minio/minio
-    minioVersion = '8.5.17'
+    minioVersion = '8.6.0'
     // https://central.sonatype.com/artifact/io.hypersistence/hypersistence-utils-hibernate-63
-    hibernateTypesVersion = '3.10.3'
+    hibernateTypesVersion = '3.12.0'
     // https://central.sonatype.com/artifact/org.hibernate.orm/hibernate-spatial
-    hibernateSpatialVersion = '7.1.0.Final'
+    hibernateSpatialVersion = '7.1.10.Final'
     // https://central.sonatype.com/artifact/org.locationtech.jts/jts-core
     jtsVersion = '1.20.0'
     // https://mvnrepository.com/artifact/org.n52.jackson/jackson-datatype-jts
-    jacksonDatatypeJtsVersion = '1.2.10'
+    jacksonDatatypeJtsVersion = '2.0.0'
     // https://central.sonatype.com/artifact/com.github.liaochong/myexcel
     myexcelVersion = '4.5.6'
     // https://central.sonatype.com/artifact/org.jetbrains/annotations
-    jetbrainsAnnotationsVersion = '26.0.2'
+    jetbrainsAnnotationsVersion = '26.0.2-1'
     // https://central.sonatype.com/artifact/org.apache.pdfbox/pdfbox
-    pdfboxVersion = '3.0.5'
+    pdfboxVersion = '3.0.6'
     // https://central.sonatype.com/artifact/org.lionsoul/ip2region
-    ip2regionVersion = '2.7.0'
+    ip2regionVersion = '3.1.1'
     // https://central.sonatype.com/artifact/com.github.piomin/loki-logging-spring-boot-starter
     lokiLoggingVersion = '2.0.3'
     // https://central.sonatype.com/artifact/com.github.ulisesbocchio/jasypt-spring-boot-starter
@@ -108,6 +108,7 @@ subprojects {
     dependencies {
         implementation 'org.springframework.boot:spring-boot-starter'
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
         compileOnly 'org.projectlombok:lombok'
         annotationProcessor 'org.projectlombok:lombok'
         annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.aliyun.com/gradle/distributions/v8.12.1/gradle-8.12.1-bin.zip
+distributionUrl=https\://mirrors.aliyun.com/gradle/distributions/v8.14.3/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

modules/common/util/src/main/java/com/yiring/common/util/IpUtil.java

@@ -7,7 +7,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.LongByteArray;
 import org.lionsoul.ip2region.xdb.Searcher;
+import org.lionsoul.ip2region.xdb.Version;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.FileCopyUtils;
 
@@ -42,9 +44,9 @@ public class IpUtil {
     static {
         try {
             ClassPathResource resource = new ClassPathResource("ipdb/ip2region.xdb");
-            InputStream inputStream = resource.getInputStream();
-            byte[] bytes = FileCopyUtils.copyToByteArray(inputStream);
-            searcher = Searcher.newWithBuffer(bytes);
+            InputStream is = resource.getInputStream();
+            byte[] bytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
+            searcher = Searcher.newWithBuffer(Version.IPv4, new LongByteArray(bytes));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

modules/websocket/src/main/java/com/yiring/websocket/web/StompReceiver.java

@@ -16,7 +16,6 @@ import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.messaging.simp.annotation.SendToUser;
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.messaging.simp.user.SimpUser;
@@ -37,7 +36,6 @@ import org.springframework.stereotype.Controller;
 public class StompReceiver {
 
     final Auths auths;
-    final SimpMessagingTemplate simpMessagingTemplate;
     final SimpUserRegistry simpUserRegistry;
     final StompUserRegistry stompUserRegistry;
 

settings.gradle

 pluginManagement {
     repositories {
-        maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
-        maven { url "https://maven.aliyun.com/repository/spring-plugin" }
+//        maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
+//        maven { url "https://maven.aliyun.com/repository/spring-plugin" }
         gradlePluginPortal()
     }
 }