build: Spring Boot 升级到 3.4.0

novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java

@@ -5,7 +5,7 @@ import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

novel-common/src/main/java/com/java2nb/novel/core/utils/IpUtil.java

@@ -1,6 +1,6 @@
 package com.java2nb.novel.core.utils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class IpUtil {
 

novel-common/src/main/java/com/java2nb/novel/core/utils/RestTemplates.java

@@ -3,21 +3,21 @@ package com.java2nb.novel.core.utils;
 import com.java2nb.novel.core.config.HttpProxyProperties;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustStrategy;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.ssl.TrustStrategy;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
@@ -45,7 +45,7 @@ public class RestTemplates {
         TrustStrategy acceptingTrustStrategy = (X509Certificate[] chain, String authType) -> true;
 
         //忽略证书
-        SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom()
+        SSLContext sslContext = SSLContexts.custom()
             .loadTrustMaterial(null, acceptingTrustStrategy)
             .build();
 
@@ -69,10 +69,10 @@ public class RestTemplates {
             if (StringUtils.isNotBlank(httpProxyProperties.getUsername()) && StringUtils.isNotBlank(
                 httpProxyProperties.getPassword())) {
                 // 创建CredentialsProvider实例并添加代理认证信息
-                CredentialsProvider provider = new BasicCredentialsProvider();
+                BasicCredentialsProvider provider = new BasicCredentialsProvider();
                 UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
-                    httpProxyProperties.getUsername(), httpProxyProperties.getPassword());
-                provider.setCredentials(AuthScope.ANY, credentials);
+                    httpProxyProperties.getUsername(), httpProxyProperties.getPassword().toCharArray());
+                provider.setCredentials(new AuthScope(null, -1), credentials);
                 clientBuilder.setDefaultCredentialsProvider(provider);
             }
         }

novel-common/src/main/java/com/java2nb/novel/core/utils/SpringUtil.java

@@ -0,0 +1,37 @@
+package com.java2nb.novel.core.utils;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringUtil implements ApplicationContextAware {
+    private static ApplicationContext applicationContext;
+
+    public SpringUtil() {
+    }
+
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        if (SpringUtil.applicationContext == null) {
+            SpringUtil.applicationContext = applicationContext;
+        }
+
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    public static Object getBean(String name) {
+        return getApplicationContext().getBean(name);
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return (T)getApplicationContext().getBean(clazz);
+    }
+
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return (T)getApplicationContext().getBean(name, clazz);
+    }
+}
+

novel-common/src/main/java/com/java2nb/novel/entity/User.java

@@ -2,9 +2,9 @@ package com.java2nb.novel.entity;
 
 import io.github.xxyopen.web.valid.AddGroup;
 import io.github.xxyopen.web.valid.UpdateGroup;
+import jakarta.validation.constraints.*;
 
 import javax.annotation.Generated;
-import javax.validation.constraints.*;
 import java.util.Date;
 
 public class User {

novel-common/src/main/resources/application-common-dev.yml

@@ -1,17 +1,18 @@
 spring:
-  profiles:
-    include: [ common ]
+  config:
+    import: classpath:application-common.yml
   main:
     allow-bean-definition-overriding: true
   #Redis服务器IP
-  redis:
-    host: 127.0.0.1
-    #Redis服务器连接端口
-    port: 6379
-    #Redis服务器连接密码
-    password: test123456
-    #连接超时时间（毫秒）
-    timeout: 10000
+  data:
+    redis:
+      host: 127.0.0.1
+      #Redis服务器连接端口
+      port: 6379
+      #Redis服务器连接密码
+      password: test123456
+      #连接超时时间（毫秒）
+      timeout: 10000
 
 content:
   save:

novel-common/src/main/resources/application-common-prod.yml

@@ -1,6 +1,6 @@
 spring:
-  profiles:
-    include: [ common ]
+  config:
+    import: classpath:application-common.yml
   main:
     allow-bean-definition-overriding: true
   #Redis服务器IP