diff --git a/src/main/java/cn/celess/blog/controller/CommonController.java b/src/main/java/cn/celess/blog/controller/CommonController.java index 4b42577..12eb980 100644 --- a/src/main/java/cn/celess/blog/controller/CommonController.java +++ b/src/main/java/cn/celess/blog/controller/CommonController.java @@ -5,7 +5,7 @@ import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.QiniuResponse; import cn.celess.blog.exception.MyException; import cn.celess.blog.service.CountService; -import cn.celess.blog.service.interfaces.FileService; +import cn.celess.blog.service.FileService; import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.RedisUserUtil; import cn.celess.blog.util.RedisUtil; diff --git a/src/main/java/cn/celess/blog/service/interfaces/FileManager.java b/src/main/java/cn/celess/blog/service/FileManager.java similarity index 92% rename from src/main/java/cn/celess/blog/service/interfaces/FileManager.java rename to src/main/java/cn/celess/blog/service/FileManager.java index 880c013..01c97b2 100644 --- a/src/main/java/cn/celess/blog/service/interfaces/FileManager.java +++ b/src/main/java/cn/celess/blog/service/FileManager.java @@ -1,4 +1,4 @@ -package cn.celess.blog.service.interfaces; +package cn.celess.blog.service; import cn.celess.blog.entity.model.QiniuResponse; import com.qiniu.storage.model.FileInfo; diff --git a/src/main/java/cn/celess/blog/service/interfaces/FileService.java b/src/main/java/cn/celess/blog/service/FileService.java similarity index 60% rename from src/main/java/cn/celess/blog/service/interfaces/FileService.java rename to src/main/java/cn/celess/blog/service/FileService.java index b163a64..7b2abde 100644 --- a/src/main/java/cn/celess/blog/service/interfaces/FileService.java +++ b/src/main/java/cn/celess/blog/service/FileService.java @@ -1,12 +1,7 @@ -package cn.celess.blog.service.interfaces; +package cn.celess.blog.service; -import cn.celess.blog.entity.model.QiniuResponse; -import com.qiniu.storage.model.FileInfo; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import java.io.InputStream; - /** * @author : xiaohai * @date : 2019/04/25 18:15 diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java b/src/main/java/cn/celess/blog/service/fileserviceimpl/FileServiceImpl.java similarity index 73% rename from src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java rename to src/main/java/cn/celess/blog/service/fileserviceimpl/FileServiceImpl.java index 879e829..143569e 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/fileserviceimpl/FileServiceImpl.java @@ -1,7 +1,7 @@ -package cn.celess.blog.service.serviceimpl; +package cn.celess.blog.service.fileserviceimpl; -import cn.celess.blog.service.interfaces.FileManager; -import cn.celess.blog.service.interfaces.FileService; +import cn.celess.blog.service.FileManager; +import cn.celess.blog.service.FileService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java b/src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java similarity index 94% rename from src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java rename to src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java index beb2633..3f90923 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java @@ -1,8 +1,7 @@ -package cn.celess.blog.service.serviceimpl; +package cn.celess.blog.service.fileserviceimpl; import cn.celess.blog.entity.model.QiniuResponse; -import cn.celess.blog.service.interfaces.FileManager; -import cn.celess.blog.service.interfaces.FileService; +import cn.celess.blog.service.FileManager; import com.qiniu.common.QiniuException; import com.qiniu.common.Zone; import com.qiniu.http.Response; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java index 80d28bd..f28d966 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java @@ -12,7 +12,7 @@ import cn.celess.blog.entity.request.LoginReq; import cn.celess.blog.entity.request.UserReq; import cn.celess.blog.exception.MyException; import cn.celess.blog.mapper.UserMapper; -import cn.celess.blog.service.interfaces.FileService; +import cn.celess.blog.service.FileService; import cn.celess.blog.service.MailService; import cn.celess.blog.service.UserService; import cn.celess.blog.util.*; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3cd2334..6948b85 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ spring.profiles.active=easyDeploy ####七牛的配置 -####cn.celess.blog.service.serviceimpl.QiniuFileServiceImpl +####cn.celess.blog.service.fileserviceimpl.QiniuFileServiceImpl logging.level.cn.celess.blog=debug logging.level.cn.celess.blog.mapper=info diff --git a/src/test/java/cn/celess/blog/BaseTest.java b/src/test/java/cn/celess/blog/BaseTest.java index 9d8ed99..afb96af 100644 --- a/src/test/java/cn/celess/blog/BaseTest.java +++ b/src/test/java/cn/celess/blog/BaseTest.java @@ -6,8 +6,7 @@ import cn.celess.blog.entity.model.QiniuResponse; import cn.celess.blog.entity.model.UserModel; import cn.celess.blog.entity.request.LoginReq; import cn.celess.blog.service.MailService; -import cn.celess.blog.service.interfaces.FileManager; -import cn.celess.blog.service.interfaces.FileService; +import cn.celess.blog.service.FileManager; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/cn/celess/blog/controller/UserControllerTest.java b/src/test/java/cn/celess/blog/controller/UserControllerTest.java index d33868c..b27398f 100644 --- a/src/test/java/cn/celess/blog/controller/UserControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/UserControllerTest.java @@ -9,8 +9,7 @@ import cn.celess.blog.entity.request.LoginReq; import cn.celess.blog.entity.request.UserReq; import cn.celess.blog.mapper.UserMapper; import cn.celess.blog.service.UserService; -import cn.celess.blog.service.interfaces.FileManager; -import cn.celess.blog.service.interfaces.FileService; +import cn.celess.blog.service.FileService; import cn.celess.blog.util.MD5Util; import cn.celess.blog.util.RedisUtil; import com.fasterxml.jackson.core.type.TypeReference;