diff --git a/src/main/java/cc/ryanc/halo/handler/file/QnYunFileHandler.java b/src/main/java/cc/ryanc/halo/handler/file/QnYunFileHandler.java index 523390edd..a05011182 100644 --- a/src/main/java/cc/ryanc/halo/handler/file/QnYunFileHandler.java +++ b/src/main/java/cc/ryanc/halo/handler/file/QnYunFileHandler.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.handler.file; import cc.ryanc.halo.exception.FileOperationException; import cc.ryanc.halo.model.enums.AttachmentType; -import cc.ryanc.halo.model.enums.QnYunProperties; +import cc.ryanc.halo.model.properties.QnYunProperties; import cc.ryanc.halo.model.support.QiNiuPutSet; import cc.ryanc.halo.model.support.UploadResult; import cc.ryanc.halo.service.OptionService; diff --git a/src/main/java/cc/ryanc/halo/handler/file/UpYunFileHandler.java b/src/main/java/cc/ryanc/halo/handler/file/UpYunFileHandler.java index 47b19446f..a48940195 100644 --- a/src/main/java/cc/ryanc/halo/handler/file/UpYunFileHandler.java +++ b/src/main/java/cc/ryanc/halo/handler/file/UpYunFileHandler.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.handler.file; import cc.ryanc.halo.exception.FileOperationException; import cc.ryanc.halo.model.enums.AttachmentType; -import cc.ryanc.halo.model.enums.UpYunProperties; +import cc.ryanc.halo.model.properties.UpYunProperties; import cc.ryanc.halo.model.support.UploadResult; import cc.ryanc.halo.service.OptionService; import cc.ryanc.halo.utils.FilenameUtils; diff --git a/src/main/java/cc/ryanc/halo/listener/StartedListener.java b/src/main/java/cc/ryanc/halo/listener/StartedListener.java index 858d66b75..f4916fc99 100644 --- a/src/main/java/cc/ryanc/halo/listener/StartedListener.java +++ b/src/main/java/cc/ryanc/halo/listener/StartedListener.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.listener; import cc.ryanc.halo.config.properties.HaloProperties; import cc.ryanc.halo.model.entity.User; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.params.UserParam; import cc.ryanc.halo.model.support.HaloConst; import cc.ryanc.halo.model.support.Theme; diff --git a/src/main/java/cc/ryanc/halo/model/enums/converter/AbstractConverter.java b/src/main/java/cc/ryanc/halo/model/enums/converter/AbstractConverter.java index 0a31c0a80..3dd34d14b 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/converter/AbstractConverter.java +++ b/src/main/java/cc/ryanc/halo/model/enums/converter/AbstractConverter.java @@ -1,7 +1,6 @@ package cc.ryanc.halo.model.enums.converter; import cc.ryanc.halo.model.enums.ValueEnum; -import lombok.extern.slf4j.Slf4j; import javax.persistence.AttributeConverter; @@ -13,7 +12,6 @@ import javax.persistence.AttributeConverter; * @author johnniang * @date 12/6/18 */ -@Slf4j public abstract class AbstractConverter, V> implements AttributeConverter { private final Class clazz; @@ -24,13 +22,11 @@ public abstract class AbstractConverter, V> implements At @Override public V convertToDatabaseColumn(E attribute) { - log.debug("Convert to database column: [{}], class type: [{}]", attribute, clazz.getSimpleName()); return attribute == null ? null : attribute.getValue(); } @Override public E convertToEntityAttribute(V dbData) { - log.debug("Convert to entity attribute: [{}], class type: [{}]", dbData, clazz.getSimpleName()); return dbData == null ? null : ValueEnum.valueToEnum(clazz, dbData); } } diff --git a/src/main/java/cc/ryanc/halo/model/enums/BlogProperties.java b/src/main/java/cc/ryanc/halo/model/properties/BlogProperties.java similarity index 97% rename from src/main/java/cc/ryanc/halo/model/enums/BlogProperties.java rename to src/main/java/cc/ryanc/halo/model/properties/BlogProperties.java index e529cccc5..73f62d5c8 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/BlogProperties.java +++ b/src/main/java/cc/ryanc/halo/model/properties/BlogProperties.java @@ -1,4 +1,4 @@ -package cc.ryanc.halo.model.enums; +package cc.ryanc.halo.model.properties; /** * @author : RYAN0UP @@ -99,7 +99,7 @@ public enum BlogProperties implements PropertyEnum { /** * 站点描述 */ - SEO_DESC("seo_desc", String.class), + SEO_DESCRIPTION("seo_description", String.class), /** * 博客主题 diff --git a/src/main/java/cc/ryanc/halo/model/enums/EmailProperties.java b/src/main/java/cc/ryanc/halo/model/properties/EmailProperties.java similarity index 96% rename from src/main/java/cc/ryanc/halo/model/enums/EmailProperties.java rename to src/main/java/cc/ryanc/halo/model/properties/EmailProperties.java index e079814cb..3b91be6ff 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/EmailProperties.java +++ b/src/main/java/cc/ryanc/halo/model/properties/EmailProperties.java @@ -1,4 +1,4 @@ -package cc.ryanc.halo.model.enums; +package cc.ryanc.halo.model.properties; /** * Email properties. diff --git a/src/main/java/cc/ryanc/halo/model/enums/PropertyEnum.java b/src/main/java/cc/ryanc/halo/model/properties/PropertyEnum.java similarity index 97% rename from src/main/java/cc/ryanc/halo/model/enums/PropertyEnum.java rename to src/main/java/cc/ryanc/halo/model/properties/PropertyEnum.java index 30eacd1c8..8328ede93 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/PropertyEnum.java +++ b/src/main/java/cc/ryanc/halo/model/properties/PropertyEnum.java @@ -1,5 +1,6 @@ -package cc.ryanc.halo.model.enums; +package cc.ryanc.halo.model.properties; +import cc.ryanc.halo.model.enums.ValueEnum; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/src/main/java/cc/ryanc/halo/model/enums/QnYunProperties.java b/src/main/java/cc/ryanc/halo/model/properties/QnYunProperties.java similarity index 95% rename from src/main/java/cc/ryanc/halo/model/enums/QnYunProperties.java rename to src/main/java/cc/ryanc/halo/model/properties/QnYunProperties.java index 07eda4139..24e1ac12a 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/QnYunProperties.java +++ b/src/main/java/cc/ryanc/halo/model/properties/QnYunProperties.java @@ -1,4 +1,4 @@ -package cc.ryanc.halo.model.enums; +package cc.ryanc.halo.model.properties; /** * Qi niu yun properties. diff --git a/src/main/java/cc/ryanc/halo/model/enums/UpYunProperties.java b/src/main/java/cc/ryanc/halo/model/properties/UpYunProperties.java similarity index 95% rename from src/main/java/cc/ryanc/halo/model/enums/UpYunProperties.java rename to src/main/java/cc/ryanc/halo/model/properties/UpYunProperties.java index b7d697adf..f074523d4 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/UpYunProperties.java +++ b/src/main/java/cc/ryanc/halo/model/properties/UpYunProperties.java @@ -1,4 +1,4 @@ -package cc.ryanc.halo.model.enums; +package cc.ryanc.halo.model.properties; /** * You pai yun properties. diff --git a/src/main/java/cc/ryanc/halo/service/OptionService.java b/src/main/java/cc/ryanc/halo/service/OptionService.java index 7d419e63a..688b92170 100755 --- a/src/main/java/cc/ryanc/halo/service/OptionService.java +++ b/src/main/java/cc/ryanc/halo/service/OptionService.java @@ -4,7 +4,7 @@ import cc.ryanc.halo.exception.MissingPropertyException; import cc.ryanc.halo.model.dto.OptionOutputDTO; import cc.ryanc.halo.model.entity.Option; import cc.ryanc.halo.model.enums.OptionSource; -import cc.ryanc.halo.model.enums.PropertyEnum; +import cc.ryanc.halo.model.properties.PropertyEnum; import cc.ryanc.halo.model.enums.ValueEnum; import cc.ryanc.halo.model.params.OptionParam; import cc.ryanc.halo.service.base.CrudService; diff --git a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java index 84ee5c492..cdf99a466 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java @@ -4,7 +4,7 @@ import cc.ryanc.halo.handler.file.FileHandlers; import cc.ryanc.halo.model.dto.AttachmentOutputDTO; import cc.ryanc.halo.model.entity.Attachment; import cc.ryanc.halo.model.enums.AttachmentType; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.support.UploadResult; import cc.ryanc.halo.repository.AttachmentRepository; import cc.ryanc.halo.service.AttachmentService; diff --git a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java index 9d28eea46..26a86e26a 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.service.impl; import cc.ryanc.halo.model.dto.post.PostMinimalOutputDTO; import cc.ryanc.halo.model.entity.Comment; import cc.ryanc.halo.model.entity.Post; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.enums.CommentStatus; import cc.ryanc.halo.model.projection.CommentCountProjection; import cc.ryanc.halo.model.support.CommentPage; diff --git a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java index 865162dfe..67babc01d 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java @@ -1,8 +1,8 @@ package cc.ryanc.halo.service.impl; import cc.ryanc.halo.exception.ServiceException; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.EmailProperties; +import cc.ryanc.halo.model.properties.BlogProperties; +import cc.ryanc.halo.model.properties.EmailProperties; import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.OptionService; import cn.hutool.core.text.StrBuilder; diff --git a/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java index 6b1227161..c57cbace8 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java @@ -5,6 +5,9 @@ import cc.ryanc.halo.model.dto.OptionOutputDTO; import cc.ryanc.halo.model.entity.Option; import cc.ryanc.halo.model.enums.*; import cc.ryanc.halo.model.params.OptionParam; +import cc.ryanc.halo.model.properties.BlogProperties; +import cc.ryanc.halo.model.properties.PropertyEnum; +import cc.ryanc.halo.model.properties.QnYunProperties; import cc.ryanc.halo.repository.OptionRepository; import cc.ryanc.halo.service.OptionService; import cc.ryanc.halo.service.base.AbstractCrudService; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/api/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/api/AdminController.java index 5ad7fbbe7..06806008d 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/api/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/api/AdminController.java @@ -4,7 +4,7 @@ import cc.ryanc.halo.cache.lock.CacheLock; import cc.ryanc.halo.exception.BadRequestException; import cc.ryanc.halo.model.dto.CountOutputDTO; import cc.ryanc.halo.model.dto.UserOutputDTO; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.enums.PostStatus; import cc.ryanc.halo.model.params.LoginParam; import cc.ryanc.halo.security.context.SecurityContextHolder; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java index 55a27b81a..fea7e32eb 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.admin.api; import cc.ryanc.halo.model.dto.CommentOutputDTO; import cc.ryanc.halo.model.entity.Comment; import cc.ryanc.halo.model.entity.User; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.enums.CommentStatus; import cc.ryanc.halo.model.params.CommentParam; import cc.ryanc.halo.model.vo.CommentWithPostVO; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java index 18a8c86d1..5366afb0d 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java @@ -1,6 +1,6 @@ package cc.ryanc.halo.web.controller.admin.api; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.enums.OptionSource; import cc.ryanc.halo.model.support.Theme; import cc.ryanc.halo.service.OptionService; diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java index 9f3e4ede7..a69f47fc9 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.core; import cc.ryanc.halo.exception.BadRequestException; import cc.ryanc.halo.model.entity.*; import cc.ryanc.halo.model.enums.AttachmentType; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.properties.BlogProperties; import cc.ryanc.halo.model.enums.OptionSource; import cc.ryanc.halo.model.params.InstallParam; import cc.ryanc.halo.model.support.BaseResponse; diff --git a/src/test/java/cc/ryanc/halo/service/impl/OptionServiceImplTest.java b/src/test/java/cc/ryanc/halo/service/impl/OptionServiceImplTest.java index d40cefb03..47400c43b 100644 --- a/src/test/java/cc/ryanc/halo/service/impl/OptionServiceImplTest.java +++ b/src/test/java/cc/ryanc/halo/service/impl/OptionServiceImplTest.java @@ -1,7 +1,7 @@ package cc.ryanc.halo.service.impl; import cc.ryanc.halo.model.entity.Option; -import cc.ryanc.halo.model.enums.QnYunProperties; +import cc.ryanc.halo.model.properties.QnYunProperties; import cc.ryanc.halo.repository.OptionRepository; import com.qiniu.common.Zone; import org.junit.Test;