diff --git a/src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java b/src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java index bd8f8bc..caf8d98 100644 --- a/src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java +++ b/src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.exception; -import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.model.support.ResultBean; import org.apache.catalina.connector.ClientAbortException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,17 +20,6 @@ public class GlobleExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GlobleExceptionHandler.class); - @ExceptionHandler(SearchDisableException.class) - @ResponseBody - @ResponseStatus(code= HttpStatus.INTERNAL_SERVER_ERROR) - public ResultBean searchDisableExceptionHandler(SearchDisableException e) { - if (log.isDebugEnabled()) { - log.debug(e.getMessage(), e); - } - return ResultBean.error(e.getMessage()); - } - - @ExceptionHandler @ResponseBody @ResponseStatus diff --git a/src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java b/src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java deleted file mode 100644 index 7347561..0000000 --- a/src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java +++ /dev/null @@ -1,26 +0,0 @@ -package im.zhaojun.zfile.exception; - -/** - * @author zhaojun - */ -public class SearchDisableException extends RuntimeException { - - public SearchDisableException() { - } - - public SearchDisableException(String message) { - super(message); - } - - public SearchDisableException(String message, Throwable cause) { - super(message, cause); - } - - public SearchDisableException(Throwable cause) { - super(cause); - } - - public SearchDisableException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} diff --git a/src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java b/src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java deleted file mode 100644 index 394b7b0..0000000 --- a/src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java +++ /dev/null @@ -1,29 +0,0 @@ -package im.zhaojun.zfile.exception; - -/** - * 未知的存储类型异常 - * @author zhaojun - */ -public class UnknownStorageTypeException extends RuntimeException { - - private static final long serialVersionUID = -4853756482605773655L; - - public UnknownStorageTypeException() { - } - - public UnknownStorageTypeException(String message) { - super(message); - } - - public UnknownStorageTypeException(String message, Throwable cause) { - super(message, cause); - } - - public UnknownStorageTypeException(Throwable cause) { - super(cause); - } - - public UnknownStorageTypeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java b/src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java index 417d547..249c698 100644 --- a/src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java +++ b/src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java @@ -23,4 +23,5 @@ public class MyCorsFilter { urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); return new CorsFilter(urlBasedCorsConfigurationSource); } -} + +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java deleted file mode 100644 index 12c6fe1..0000000 --- a/src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package im.zhaojun.zfile.model.dto; - -import lombok.Data; - -import java.util.Date; -import java.util.Set; - -/** - * @author zhaojun - */ -@Data -public class CacheConfigDTO { - private Boolean enableCache; - private Boolean cacheFinish; - private Set cacheKeys; - private Integer cacheDirectoryCount; - private Integer cacheFileCount; - private Date lastCacheAutoRefreshDate; -} diff --git a/src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java deleted file mode 100644 index 1d89be1..0000000 --- a/src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java +++ /dev/null @@ -1,77 +0,0 @@ -package im.zhaojun.zfile.model.dto; - -import im.zhaojun.zfile.model.enums.StorageTypeEnum; - -import java.util.Map; - -/** - * @author zhaojun - */ -public class InstallModelDTO { - private String siteName; - private StorageTypeEnum storageStrategy; - private String username; - private String password; - private String domain; - private Map storageStrategyConfig; - - public String getSiteName() { - return siteName; - } - - public void setSiteName(String siteName) { - this.siteName = siteName; - } - - public StorageTypeEnum getStorageStrategy() { - return storageStrategy; - } - - public void setStorageStrategy(StorageTypeEnum storageStrategy) { - this.storageStrategy = storageStrategy; - } - - public Map getStorageStrategyConfig() { - return storageStrategyConfig; - } - - public void setStorageStrategyConfig(Map storageStrategyConfig) { - this.storageStrategyConfig = storageStrategyConfig; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDomain() { - return domain; - } - - public void setDomain(String domain) { - this.domain = domain; - } - - @Override - public String toString() { - return "InstallModelDTO{" + - "siteName='" + siteName + '\'' + - ", storageStrategy=" + storageStrategy + - ", username='" + username + '\'' + - ", password='" + password + '\'' + - ", domain='" + domain + '\'' + - ", storageStrategyConfig=" + storageStrategyConfig + - '}'; - } -} diff --git a/src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java deleted file mode 100644 index 8d5e895..0000000 --- a/src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -// package im.zhaojun.zfile.model.dto; -// -// import com.fasterxml.jackson.annotation.JsonProperty; -// import lombok.Data; -// import lombok.ToString; -// -// import java.io.Serializable; -// -// /** -// * @author zhaojun -// */ -// @Data -// @ToString -// public class SiteConfigDTO implements Serializable { -// -// private static final long serialVersionUID = 8811196207046121740L; -// -// private String readme; -// -// @JsonProperty("viewConfig") -// private SystemConfigDTO systemConfigDTO; -// -// } diff --git a/src/main/java/im/zhaojun/zfile/model/dto/SystemFrontConfigDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/SystemFrontConfigDTO.java index 37fa2b2..bf71b3d 100644 --- a/src/main/java/im/zhaojun/zfile/model/dto/SystemFrontConfigDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/SystemFrontConfigDTO.java @@ -19,9 +19,6 @@ public class SystemFrontConfigDTO { private Boolean searchEnable; - // @JsonSerialize(using = StorageTypeEnumSerializerConvert.class) - // private StorageTypeEnum storageStrategy; - private String username; private String domain; 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 9c63319..da69631 100644 --- a/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java +++ b/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java @@ -38,43 +38,4 @@ public class StorageConfig { this.title = title; } - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public StorageTypeEnum getType() { - return type; - } - - public void setType(StorageTypeEnum type) { - this.type = type; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java b/src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java index 36335e8..8287080 100644 --- a/src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java +++ b/src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java @@ -28,35 +28,4 @@ public class SystemConfig { private String remark; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } } \ No newline at end of file