theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Menethil
2018-07-22 17:10:07 +08:00
parent 4b12f490ae ab45404634
commit bb6760a52d
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
litemall-core/src/main/java/org/linlinjava/litemall/core/storage/StorageService.java
View File

@@ -4,7 +4,6 @@ import org.springframework.core.io.Resource;
import org.springframework.web.multipart.MultipartFile;
import java.nio.file.Path;
import java.util.Map;
import java.util.stream.Stream;
/**
@@ -13,7 +12,6 @@ import java.util.stream.Stream;
public class StorageService {
private String active;
private Storage storage;
private Map<String, Storage> supportedStorage;
public String getActive() {
return active;
@@ -21,15 +19,14 @@ public class StorageService {
public void setActive(String active) {
this.active = active;
this.storage = this.supportedStorage.get(active);
}
public Map<String, Storage> getSupportedStorage() {
return supportedStorage;
public Storage getStorage() {
return storage;
}
public void setSupportedStorage(Map<String, Storage> supportedStorage) {
this.supportedStorage = supportedStorage;
public void setStorage(Storage storage) {
this.storage = storage;
}
/**

17
litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java
View File

@@ -22,12 +22,21 @@ public class StorageAutoConfiguration {
public StorageService storageService() {
StorageService storageService = new StorageService();
Map<String, Storage> supportedStorage = new HashMap<String, Storage>(3);
supportedStorage.put("local", localStorage());
supportedStorage.put("aliyun", aliyunStorage());
supportedStorage.put("tencent", tencentStorage());
storageService.setSupportedStorage(supportedStorage);
String active = this.properties.getActive();
storageService.setActive(active);
if(active.equals("local")){
storageService.setStorage(localStorage());
}
else if(active.equals("aliyun")){
storageService.setStorage(aliyunStorage());
}
else if(active.equals("tencent")){
storageService.setStorage(tencentStorage());
}
else{
throw new RuntimeException("当前存储模式 " + active + " 不支持");
}
return storageService;
}