From d22e2e872a03234dc1ae1cd77c5ede8a490bb77e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BF=8A?= <873019219@qq.com>
Date: Sun, 19 Sep 2021 09:53:19 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E5=9B=A0=E6=97=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20Spring=20=E7=9A=84=E5=AE=89=E5=85=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=20=E5=8D=87=E7=BA=A7=20Spring=20=E4=B8=BA=202.5.4=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC,=20=E5=85=BC=E5=AE=B9=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 src/main/java/im/zhaojun/zfile/ZfileApplication.java          | 2 ++
 src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java     | 4 ++--
 .../java/im/zhaojun/zfile/model/entity/StorageConfig.java     | 2 ++
 .../java/im/zhaojun/zfile/service/DriveConfigService.java     | 4 ++--
 src/main/resources/application.yml                            | 3 ---
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0a6e8b..549529a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.6.RELEASE</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/src/main/java/im/zhaojun/zfile/ZfileApplication.java b/src/main/java/im/zhaojun/zfile/ZfileApplication.java
index 6476903..e48eb4e 100644
--- a/src/main/java/im/zhaojun/zfile/ZfileApplication.java
+++ b/src/main/java/im/zhaojun/zfile/ZfileApplication.java
@@ -3,6 +3,7 @@ package im.zhaojun.zfile;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
@@ -10,6 +11,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @EnableAsync
 @SpringBootApplication
+@EnableJpaRepositories("im.zhaojun.zfile.repository")
 @EnableAspectJAutoProxy(exposeProxy = true)
 public class ZfileApplication {
 
diff --git a/src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java b/src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java
index 6381f72..86c2ef8 100644
--- a/src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java
+++ b/src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java
@@ -11,7 +11,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.Collections;
-import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author zhaojun
@@ -31,7 +31,7 @@ public class OneDriveConfig {
 
         ClientHttpRequestInterceptor interceptor = (httpRequest, bytes, clientHttpRequestExecution) -> {
             HttpHeaders headers = httpRequest.getHeaders();
-            Integer driveId = Integer.valueOf(((LinkedList)headers.get("driveId")).get(0).toString());
+            Integer driveId = Integer.valueOf(((List)headers.get("driveId")).get(0).toString());
 
             StorageConfig accessTokenConfig =
                     storageConfigService.findByDriveIdAndKey(driveId, StorageConfigConstant.ACCESS_TOKEN_KEY);
diff --git a/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java b/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java
index da69631..0021095 100644
--- a/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java
+++ b/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java
@@ -2,6 +2,7 @@ package im.zhaojun.zfile.model.entity;
 
 import im.zhaojun.zfile.model.enums.StorageTypeEnum;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -15,6 +16,7 @@ import javax.persistence.Lob;
  */
 @Entity(name = "STORAGE_CONFIG")
 @Data
+@NoArgsConstructor
 public class StorageConfig {
 
     @Id
diff --git a/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java b/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java
index 2ae17bd..72fe8c7 100644
--- a/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java
+++ b/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java
@@ -67,7 +67,7 @@ public class DriveConfigService {
      * @return  驱动器列表
      */
     public List<DriveConfig> list() {
-        Sort sort = new Sort(Sort.Direction.ASC,"orderNum");
+        Sort sort = Sort.by(Sort.Direction.ASC,"orderNum");
         return driverConfigRepository.findAll(sort);
     }
 
@@ -81,7 +81,7 @@ public class DriveConfigService {
         DriveConfig driveConfig = new DriveConfig();
         driveConfig.setEnable(true);
         Example<DriveConfig> example = Example.of(driveConfig);
-        Sort sort = new Sort(Sort.Direction.ASC,"orderNum");
+        Sort sort = Sort.by(Sort.Direction.ASC,"orderNum");
         return driverConfigRepository.findAll(example, sort);
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 657d53f..c11a5de 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -75,8 +75,5 @@ spring:
       hibernate:
         format_sql: false
     show-sql: false
-  resources:
-    chain:
-      gzipped: true
   profiles:
     active: prod
\ No newline at end of file