Merge pull request #233 from itning/3.0.0

update spring boot version to 3.0.0
itning · Nov 26, 2022 · b77ae28 · b77ae28
2 parents 19474cf + ef3c362
commit b77ae28
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -56,8 +56,8 @@ docker run --name yunshu-nas -p 8888:8888 -e MYSQL_URL=mysql8 -e MYSQL_PORT=3306
 | nas.basic-auth.password             | basic基础认证密码         | basic基础认证密码，默认空                                                              |
 | nas.basic-auth.ignore-path          | basic基础认证忽略路径       | 多个路径使用英文逗号分隔，默认空                                                             |
 | nas.server-url                      | 服务端地址，用于前端调用后端API地址 | http://127.0.0.1:8888                                                        |
-| ENABLED_ELASTICSEARCH               | 是否开启Elasticsearch   | true                                                                         |
-| ELASTICSEARCH_URI                   | Elasticsearch服务端URL | 空                                                                            |
+| ENABLED_ELASTICSEARCH               | 是否开启Elasticsearch   | false                                                                        |
+| ELASTICSEARCH_URI                   | Elasticsearch服务端URL | http://localhost:9200                                         |
 
 # 启动脚本（aria2c 可以不用）
 

diff --git a/nas-common/src/main/java/top/itning/yunshunas/common/socket/ProgressWebSocket.java b/nas-common/src/main/java/top/itning/yunshunas/common/socket/ProgressWebSocket.java
@@ -4,8 +4,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.*;
+import jakarta.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/nas-common/src/main/java/top/itning/yunshunas/common/util/MultipartFileSender.java b/nas-common/src/main/java/top/itning/yunshunas/common/util/MultipartFileSender.java
@@ -4,9 +4,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/nas-deploy/pom.xml b/nas-deploy/pom.xml
@@ -36,6 +36,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/nas-deploy/src/main/java/top/itning/yunshunas/config/BeanConfig.java b/nas-deploy/src/main/java/top/itning/yunshunas/config/BeanConfig.java
@@ -5,7 +5,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
-import javax.servlet.MultipartConfigElement;
+import jakarta.servlet.MultipartConfigElement;
 
 /**
  * @author itning

diff --git a/nas-deploy/src/main/java/top/itning/yunshunas/config/deploy/CustomWebMvcConfig.java b/nas-deploy/src/main/java/top/itning/yunshunas/config/deploy/CustomWebMvcConfig.java
@@ -15,7 +15,7 @@
 public class CustomWebMvcConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        String[] allMethod = Arrays.stream(HttpMethod.values()).map(Enum::name).toArray(String[]::new);
+        String[] allMethod = Arrays.stream(HttpMethod.values()).map(HttpMethod::name).toArray(String[]::new);
         registry.addMapping("/**")
                 .allowedOriginPatterns("*")
                 .allowCredentials(true)

diff --git a/nas-deploy/src/main/java/top/itning/yunshunas/config/log/LogWebSocket.java b/nas-deploy/src/main/java/top/itning/yunshunas/config/log/LogWebSocket.java
@@ -5,8 +5,8 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.*;
+import jakarta.websocket.server.ServerEndpoint;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/nas-deploy/src/main/java/top/itning/yunshunas/config/security/BasicFilter.java b/nas-deploy/src/main/java/top/itning/yunshunas/config/security/BasicFilter.java
@@ -11,10 +11,10 @@
 import org.springframework.web.filter.OncePerRequestFilter;
 import top.itning.yunshunas.common.config.NasProperties;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;

diff --git a/nas-deploy/src/main/java/top/itning/yunshunas/controller/FrontPageController.java b/nas-deploy/src/main/java/top/itning/yunshunas/controller/FrontPageController.java
@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import top.itning.yunshunas.common.config.NasProperties;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/nas-deploy/src/main/resources/application.properties b/nas-deploy/src/main/resources/application.properties
@@ -17,7 +17,7 @@ spring.datasource.url=jdbc:mysql://${MYSQL_URL:localhost}:${MYSQL_PORT:3306}/yun
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.username=${MYSQL_USERNAME:root}
 spring.datasource.password=${MYSQL_PASSWORD:root}
-spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
+spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
 spring.jpa.show-sql=false
 spring.jpa.open-in-view=false
 spring.jpa.hibernate.ddl-auto=update
@@ -69,5 +69,5 @@ nas.file-data-source.lyric-file-dir=/home/lyric_yunshu
 #           ElasticSearch配置
 #
 ##########################################################
-spring.data.elasticsearch.repositories.enabled=${ENABLED_ELASTICSEARCH:true}
-spring.elasticsearch.uris=${ELASTICSEARCH_URI}
+spring.data.elasticsearch.repositories.enabled=${ENABLED_ELASTICSEARCH:false}
+spring.elasticsearch.uris=${ELASTICSEARCH_URI:http://localhost:9200}
diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/controller/FileController.java b/nas-music/src/main/java/top/itning/yunshunas/music/controller/FileController.java
@@ -6,9 +6,9 @@
 import org.springframework.web.bind.annotation.*;
 import top.itning.yunshunas.music.service.FileService;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 
 /**

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/controller/MusicController.java b/nas-music/src/main/java/top/itning/yunshunas/music/controller/MusicController.java
@@ -21,8 +21,8 @@
 import top.itning.yunshunas.music.service.MusicService;
 import top.itning.yunshunas.music.service.SearchService;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/controller/MusicManageApiController.java b/nas-music/src/main/java/top/itning/yunshunas/music/controller/MusicManageApiController.java
@@ -14,7 +14,7 @@
 import top.itning.yunshunas.music.dto.MusicManageDTO;
 import top.itning.yunshunas.music.service.MusicManageService;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * 音乐管理接口

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/entity/Music.java b/nas-music/src/main/java/top/itning/yunshunas/music/entity/Music.java
@@ -4,7 +4,7 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 /**

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/exception/ExceptionResolver.java b/nas-music/src/main/java/top/itning/yunshunas/music/exception/ExceptionResolver.java
@@ -7,8 +7,8 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import top.itning.yunshunas.common.model.RestModel;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.ConstraintViolationException;
 
 /**
  * @author itning

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/service/FileService.java b/nas-music/src/main/java/top/itning/yunshunas/music/service/FileService.java
@@ -2,8 +2,8 @@
 
 import top.itning.yunshunas.music.dto.MusicMetaInfo;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/service/impl/FileServiceImpl.java b/nas-music/src/main/java/top/itning/yunshunas/music/service/impl/FileServiceImpl.java
@@ -14,9 +14,9 @@
 import top.itning.yunshunas.music.service.FileService;
 import top.itning.yunshunas.music.service.MusicMetaInfoService;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/service/impl/MusicServiceImpl.java b/nas-music/src/main/java/top/itning/yunshunas/music/service/impl/MusicServiceImpl.java
@@ -12,7 +12,7 @@
 import top.itning.yunshunas.music.repository.MusicRepository;
 import top.itning.yunshunas.music.service.MusicService;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 /**
  * @author itning

diff --git a/nas-music/src/main/java/top/itning/yunshunas/music/service/impl/SearchServiceImpl.java b/nas-music/src/main/java/top/itning/yunshunas/music/service/impl/SearchServiceImpl.java
@@ -1,15 +1,19 @@
 package top.itning.yunshunas.music.service.impl;
 
+import co.elastic.clients.elasticsearch._types.query_dsl.MatchPhraseQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.client.elc.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder;
 import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.HighlightQuery;
+import org.springframework.data.elasticsearch.core.query.highlight.Highlight;
+import org.springframework.data.elasticsearch.core.query.highlight.HighlightField;
+import org.springframework.data.elasticsearch.core.query.highlight.HighlightFieldParameters;
 import org.springframework.stereotype.Service;
 import top.itning.yunshunas.music.datasource.CoverDataSource;
 import top.itning.yunshunas.music.datasource.LyricDataSource;
@@ -42,20 +46,25 @@ public class SearchServiceImpl implements SearchService {
     private static final String SEARCH_FILED_FOR_LYRIC = "content";
 
     private final LyricElasticsearchRepository lyricElasticsearchRepository;
-    private final ElasticsearchRestTemplate elasticsearchRestTemplate;
     private final MusicRepository musicRepository;
     private final MusicDataSource musicDataSource;
     private final LyricDataSource lyricDataSource;
     private final CoverDataSource coverDataSource;
+    private final ElasticsearchTemplate elasticsearchTemplate;
 
     @Autowired
-    public SearchServiceImpl(LyricElasticsearchRepository lyricElasticsearchRepository, ElasticsearchRestTemplate elasticsearchRestTemplate, MusicRepository musicRepository, MusicDataSource musicDataSource, LyricDataSource lyricDataSource, CoverDataSource coverDataSource) {
+    public SearchServiceImpl(LyricElasticsearchRepository lyricElasticsearchRepository,
+                             MusicRepository musicRepository,
+                             MusicDataSource musicDataSource,
+                             LyricDataSource lyricDataSource,
+                             CoverDataSource coverDataSource,
+                             ElasticsearchTemplate elasticsearchTemplate) {
         this.lyricElasticsearchRepository = lyricElasticsearchRepository;
-        this.elasticsearchRestTemplate = elasticsearchRestTemplate;
         this.musicRepository = musicRepository;
         this.musicDataSource = musicDataSource;
         this.lyricDataSource = lyricDataSource;
         this.coverDataSource = coverDataSource;
+        this.elasticsearchTemplate = elasticsearchTemplate;
     }
 
     @Override
@@ -96,14 +105,15 @@ public void deleteLyric(String lyricId) {
 
     @Override
     public List<SearchResult> searchLyric(String keyword, Pageable pageable) {
-        SearchHits<Lyric> search = elasticsearchRestTemplate.search(
-                new NativeSearchQueryBuilder()
-                        .withQuery(QueryBuilders.matchPhraseQuery(SEARCH_FILED_FOR_LYRIC, keyword))
-                        .withHighlightBuilder(new HighlightBuilder().field(SEARCH_FILED_FOR_LYRIC, 50, 1))
+        SearchHits<Lyric> search = elasticsearchTemplate.search(
+                new NativeQueryBuilder()
+                        .withQuery(new Query.Builder().matchPhrase(new MatchPhraseQuery.Builder().field(SEARCH_FILED_FOR_LYRIC).query(keyword).build()).build())
+                        .withHighlightQuery(new HighlightQuery(new Highlight(Collections.singletonList(new HighlightField(SEARCH_FILED_FOR_LYRIC, HighlightFieldParameters.builder().withFragmentSize(50).withNumberOfFragments(1).build()))), null))
                         .withPageable(pageable)
-                        .build()
-                , Lyric.class
+                        .build(),
+                Lyric.class
         );
+
         if (!search.hasSearchHits()) {
             return Collections.emptyList();
         }

diff --git a/nas-video/src/main/java/top/itning/yunshunas/video/controller/VideoController.java b/nas-video/src/main/java/top/itning/yunshunas/video/controller/VideoController.java
@@ -9,8 +9,8 @@
 import top.itning.yunshunas.video.service.VideoService;
 import top.itning.yunshunas.video.video.VideoTransformHandler;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

diff --git a/nas-video/src/main/java/top/itning/yunshunas/video/video/VideoRepository.java b/nas-video/src/main/java/top/itning/yunshunas/video/video/VideoRepository.java
@@ -10,7 +10,7 @@
 import top.itning.yunshunas.common.config.NasProperties;
 import top.itning.yunshunas.video.repository.IVideoRepository;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.File;
 
 /**

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.6</version>
+        <version>3.0.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>top.itning.yunshu-nas</groupId>
@@ -100,11 +100,6 @@
             <artifactId>mapstruct-processor</artifactId>
             <scope>compile</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>