diff --git a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java index 477d966..d7c9037 100644 --- a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java @@ -3,7 +3,11 @@ package im.zhaojun.aliyun.service; import cn.hutool.core.util.URLUtil; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.model.*; +import com.aliyun.oss.model.AccessControlList; +import com.aliyun.oss.model.CannedAccessControlList; +import com.aliyun.oss.model.ListObjectsRequest; +import com.aliyun.oss.model.OSSObjectSummary; +import com.aliyun.oss.model.ObjectListing; import im.zhaojun.common.config.ZFileCacheConfiguration; import im.zhaojun.common.model.StorageConfig; import im.zhaojun.common.model.dto.FileItemDTO; diff --git a/src/main/java/im/zhaojun/common/controller/FileController.java b/src/main/java/im/zhaojun/common/controller/FileController.java index 5cf2619..053bdd1 100644 --- a/src/main/java/im/zhaojun/common/controller/FileController.java +++ b/src/main/java/im/zhaojun/common/controller/FileController.java @@ -59,13 +59,12 @@ public class FileController { FileService fileService = systemConfigService.getCurrentFileService(); List fileItemList = fileService.fileList(StringUtils.removeDuplicateSeparator("/" + URLUtil.decode(path) + "/")); for (FileItemDTO fileItemDTO : fileItemList) { - if (ZFileConstant.PASSWORD_FILE_NAME.equals(fileItemDTO.getName())) { - if (!HttpUtil.getTextContent(fileItemDTO.getUrl()).equals(password)) { - if (password != null && !"".equals(password)) { - return ResultBean.error("密码错误."); - } - return ResultBean.error("此文件夹需要密码.", ResultBean.REQUIRED_PASSWORD); + if (ZFileConstant.PASSWORD_FILE_NAME.equals(fileItemDTO.getName()) + && !HttpUtil.getTextContent(fileItemDTO.getUrl()).equals(password)) { + if (password != null && !"".equals(password)) { + return ResultBean.error("密码错误."); } + return ResultBean.error("此文件夹需要密码.", ResultBean.REQUIRED_PASSWORD); } } diff --git a/src/main/java/im/zhaojun/common/model/StorageConfig.java b/src/main/java/im/zhaojun/common/model/StorageConfig.java index 4b69cc0..bd4dd30 100644 --- a/src/main/java/im/zhaojun/common/model/StorageConfig.java +++ b/src/main/java/im/zhaojun/common/model/StorageConfig.java @@ -3,7 +3,11 @@ package im.zhaojun.common.model; import im.zhaojun.common.model.enums.StorageTypeEnum; import lombok.Data; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/model/SystemConfig.java b/src/main/java/im/zhaojun/common/model/SystemConfig.java index c952653..60b0208 100644 --- a/src/main/java/im/zhaojun/common/model/SystemConfig.java +++ b/src/main/java/im/zhaojun/common/model/SystemConfig.java @@ -2,7 +2,11 @@ package im.zhaojun.common.model; import lombok.Data; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java b/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java index f3b9760..7d20635 100644 --- a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java +++ b/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java @@ -20,6 +20,9 @@ public enum StorageTypeEnum { TENCENT("tencent", "腾讯云 COS"), MINIO("minio", "MINIO"); + private String key; + private String description; + private static Map enumMap = new HashMap<>(); static { @@ -33,9 +36,6 @@ public enum StorageTypeEnum { this.description = description; } - private String key; - private String description; - public String getKey() { return key; } diff --git a/src/main/java/im/zhaojun/common/service/SystemConfigService.java b/src/main/java/im/zhaojun/common/service/SystemConfigService.java index f4562d7..79cbbcc 100644 --- a/src/main/java/im/zhaojun/common/service/SystemConfigService.java +++ b/src/main/java/im/zhaojun/common/service/SystemConfigService.java @@ -8,7 +8,6 @@ import im.zhaojun.common.model.dto.SystemConfigDTO; import im.zhaojun.common.model.enums.StorageTypeEnum; import im.zhaojun.common.repository.SystemConfigRepository; import im.zhaojun.common.util.StringUtils; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -109,9 +108,9 @@ public class SystemConfigService { usernameConfig.setValue(username); systemConfigRepository.save(usernameConfig); - password = SecureUtil.md5(password); + String encryptionPassword = SecureUtil.md5(password); SystemConfig systemConfig = systemConfigRepository.findByKey(SystemConfigConstant.PASSWORD); - systemConfig.setValue(password); + systemConfig.setValue(encryptionPassword); systemConfigRepository.save(systemConfig); } diff --git a/src/main/java/im/zhaojun/common/service/SystemService.java b/src/main/java/im/zhaojun/common/service/SystemService.java index e112ef3..e983196 100644 --- a/src/main/java/im/zhaojun/common/service/SystemService.java +++ b/src/main/java/im/zhaojun/common/service/SystemService.java @@ -7,7 +7,6 @@ import im.zhaojun.common.util.HttpUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Iterator; import java.util.List; /** diff --git a/src/main/java/im/zhaojun/common/util/AudioHelper.java b/src/main/java/im/zhaojun/common/util/AudioHelper.java index 72879ed..dce074a 100644 --- a/src/main/java/im/zhaojun/common/util/AudioHelper.java +++ b/src/main/java/im/zhaojun/common/util/AudioHelper.java @@ -5,7 +5,11 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HttpUtil; -import com.mpatric.mp3agic.*; +import com.mpatric.mp3agic.ID3v1; +import com.mpatric.mp3agic.ID3v2; +import com.mpatric.mp3agic.InvalidDataException; +import com.mpatric.mp3agic.Mp3File; +import com.mpatric.mp3agic.UnsupportedTagException; import im.zhaojun.common.model.constant.ZFileConstant; import im.zhaojun.common.model.dto.AudioInfoDTO; import org.slf4j.Logger; diff --git a/src/main/java/im/zhaojun/common/util/FileComparator.java b/src/main/java/im/zhaojun/common/util/FileComparator.java index b34282d..3238329 100644 --- a/src/main/java/im/zhaojun/common/util/FileComparator.java +++ b/src/main/java/im/zhaojun/common/util/FileComparator.java @@ -35,7 +35,7 @@ public class FileComparator implements Comparator { switch (sortBy) { case "time": result = o1.getTime().compareTo(o2.getTime()); break; case "size": result = o1.getSize().compareTo(o2.getSize()); break; - default: result = o1.getName().compareToIgnoreCase(o2.getName()); + default: result = o1.getName().compareToIgnoreCase(o2.getName()); break; } return "asc".equals(order) ? result : -result; } diff --git a/src/main/java/im/zhaojun/common/util/StartupListener.java b/src/main/java/im/zhaojun/common/util/StartupListener.java index 7fde19a..a095452 100644 --- a/src/main/java/im/zhaojun/common/util/StartupListener.java +++ b/src/main/java/im/zhaojun/common/util/StartupListener.java @@ -1,8 +1,7 @@ package im.zhaojun.common.util; +import im.zhaojun.common.exception.InitializeException; import im.zhaojun.common.service.FileAsyncCacheService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.lang.NonNull; @@ -17,8 +16,6 @@ import javax.annotation.Resource; @Component public class StartupListener implements ApplicationListener { - private static final Logger log = LoggerFactory.getLogger(StartupListener.class); - @Resource private FileAsyncCacheService fileAsyncCacheService; @@ -27,7 +24,7 @@ public class StartupListener implements ApplicationListener