diff --git a/pom.xml b/pom.xml index d0a6e8b..549529a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.6.RELEASE + 2.5.4 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 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 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