修改core-fss默认FileService名称改为FileStoreService，避免容易重名

Signed-off-by: luoshi <luoshi@qmth.com.cn>

core-fss/src/main/java/com/qmth/boot/core/fss/config/FssAutoConfiguration.java

@@ -2,9 +2,9 @@ package com.qmth.boot.core.fss.config;
 
 import com.qmth.boot.core.constant.CoreConstant;
 import com.qmth.boot.core.fss.condition.FssCondition;
-import com.qmth.boot.core.fss.service.FileService;
-import com.qmth.boot.core.fss.service.impl.DefaultFileService;
-import com.qmth.boot.core.fss.service.impl.SingletonFileService;
+import com.qmth.boot.core.fss.service.FileStoreService;
+import com.qmth.boot.core.fss.service.impl.DefaultFileStoreService;
+import com.qmth.boot.core.fss.service.impl.SingletonFileStoreService;
 import com.qmth.boot.core.fss.store.FileStore;
 import com.qmth.boot.core.fss.utils.FileStoreBuilder;
 import com.qmth.boot.core.fss.utils.FssUtils;
@@ -52,12 +52,12 @@ public class FssAutoConfiguration {
     }
 
     @Bean(destroyMethod = "close")
-    public FileService fileService(@Nullable FileStore fileStore, @Nullable FileStorePropertyMap fileStorePropertyMap,
-            @NotNull FssSecretProvider fssSecretProvider) {
+    public FileStoreService fileService(@Nullable FileStore fileStore,
+            @Nullable FileStorePropertyMap fileStorePropertyMap, @NotNull FssSecretProvider fssSecretProvider) {
         if (fileStore != null) {
-            return new SingletonFileService(fileStore);
+            return new SingletonFileStoreService(fileStore);
         } else {
-            return new DefaultFileService(fileStorePropertyMap.getFss(), fssSecretProvider);
+            return new DefaultFileStoreService(fileStorePropertyMap.getFss(), fssSecretProvider);
         }
     }
 }

core-fss/src/main/java/com/qmth/boot/core/fss/service/FileService.java → core-fss/src/main/java/com/qmth/boot/core/fss/service/FileStoreService.java

@@ -5,7 +5,7 @@ import com.qmth.boot.core.fss.store.FileStore;
 /**
  * 文件存储服务聚合入口
  */
-public interface FileService {
+public interface FileStoreService {
 
     /**
      * 根据配置文件中预设置的名称，获取实际的文件存储服务<br/>

core-fss/src/main/java/com/qmth/boot/core/fss/service/impl/DefaultFileService.java → core-fss/src/main/java/com/qmth/boot/core/fss/service/impl/DefaultFileStoreService.java

@@ -3,7 +3,7 @@ package com.qmth.boot.core.fss.service.impl;
 import com.qmth.boot.core.constant.CoreConstant;
 import com.qmth.boot.core.fss.config.FileStoreProperty;
 import com.qmth.boot.core.fss.config.FssSecretProvider;
-import com.qmth.boot.core.fss.service.FileService;
+import com.qmth.boot.core.fss.service.FileStoreService;
 import com.qmth.boot.core.fss.store.FileStore;
 import com.qmth.boot.core.fss.utils.FileStoreBuilder;
 import org.slf4j.Logger;
@@ -14,13 +14,13 @@ import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DefaultFileService implements FileService {
+public class DefaultFileStoreService implements FileStoreService {
 
-    private static final Logger log = LoggerFactory.getLogger(DefaultFileService.class);
+    private static final Logger log = LoggerFactory.getLogger(DefaultFileStoreService.class);
 
     private Map<String, FileStore> storeMap;
 
-    public DefaultFileService(Map<String, FileStoreProperty> map, @NotNull FssSecretProvider fssSecretProvider) {
+    public DefaultFileStoreService(Map<String, FileStoreProperty> map, @NotNull FssSecretProvider fssSecretProvider) {
         this.storeMap = new HashMap<>();
         if (map.isEmpty()) {
             log.warn("Property [" + CoreConstant.CONFIG_PREFIX + ".fss] is empty!");

core-fss/src/main/java/com/qmth/boot/core/fss/service/impl/SingletonFileService.java → core-fss/src/main/java/com/qmth/boot/core/fss/service/impl/SingletonFileStoreService.java

@@ -1,16 +1,16 @@
 package com.qmth.boot.core.fss.service.impl;
 
-import com.qmth.boot.core.fss.service.FileService;
+import com.qmth.boot.core.fss.service.FileStoreService;
 import com.qmth.boot.core.fss.store.FileStore;
 
 import javax.annotation.PreDestroy;
 import javax.validation.constraints.NotNull;
 
-public class SingletonFileService implements FileService {
+public class SingletonFileStoreService implements FileStoreService {
 
     private FileStore fileStore;
 
-    public SingletonFileService(@NotNull FileStore fileStore) {
+    public SingletonFileStoreService(@NotNull FileStore fileStore) {
         this.fileStore = fileStore;
     }
 

starter-api/src/main/java/com/qmth/boot/api/controller/FssController.java

@@ -2,7 +2,7 @@ package com.qmth.boot.api.controller;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.fss.service.FileService;
+import com.qmth.boot.core.fss.service.FileStoreService;
 import com.qmth.boot.core.fss.store.FileStore;
 import com.qmth.boot.core.fss.utils.FssUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -24,7 +24,7 @@ import javax.validation.constraints.NotBlank;
 public class FssController {
 
     @Resource
-    private FileService fileService;
+    private FileStoreService fileStoreService;
 
     @GetMapping("/**")
     public ResponseEntity<InputStreamResource> get(HttpServletRequest request,
@@ -32,7 +32,7 @@ public class FssController {
             @RequestParam(name = FssUtils.INNER_ENDPOINT_PARAM_EXPIRE_TIME) @Min(0) Long expireTime,
             @RequestParam(name = FssUtils.INNER_ENDPOINT_PARAM_SIGNATURE) @NotBlank String signature) throws Exception {
         String path = request.getServletPath().substring(FssUtils.INNER_ENDPOINT_PREFIX.length() + 1);
-        FileStore fileStore = fileService.getFileStore(bucket);
+        FileStore fileStore = fileStoreService.getFileStore(bucket);
         if (fileStore == null) {
             throw new ParameterException("bucket not exists: " + bucket);
         }