mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复上传报错bug

This commit is contained in:
TinyAnts 2022-08-01 16:16:36 +08:00
parent cd7888e591
commit 627c3b27ce
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java
View File

@ -26,24 +26,28 @@ public class StorageServiceImpl implements IStorageService {
List<Map<String, Object>> list = new LinkedList<>();
Map<String, Object> local = new LinkedHashMap<>();
local.put("name", "本地存储");
local.put("alias", "local");
local.put("describe", "存储在本地服务器");
local.put("status", engine.equals("local") ? 1 : 0);
list.add(local);
Map<String, Object> qiniu = new LinkedHashMap<>();
qiniu.put("name", "七牛云存储");
qiniu.put("alias", "qiniu");
qiniu.put("describe", "存储在七牛云，请前往七牛云开通存储服务");
qiniu.put("status", engine.equals("qiniu") ? 1 : 0);
list.add(qiniu);
Map<String, Object> aliyun = new LinkedHashMap<>();
aliyun.put("name", "阿里云才能出");
aliyun.put("alias", "aliyun");
aliyun.put("describe", "存储在阿里云，请前往阿里云开通存储服务");
aliyun.put("status", engine.equals("aliyun") ? 1 : 0);
list.add(aliyun);
Map<String, Object> qcloud = new LinkedHashMap<>();
qcloud.put("name", "腾讯云存储");
qcloud.put("alias", "qcloud");
qcloud.put("describe", "存储在腾讯云，请前往腾讯云开通存储服务");
qcloud.put("status", engine.equals("qcloud") ? 1 : 0);

10
server/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java
View File

@ -7,6 +7,7 @@ import com.hxkj.common.plugin.storage.engine.LocalStorage;
import com.hxkj.common.plugin.storage.engine.QcloudStorage;
import com.hxkj.common.plugin.storage.engine.QiniuStorage;
import com.hxkj.common.utils.ConfigUtil;
import com.hxkj.common.utils.StringUtil;
import com.hxkj.common.utils.TimeUtil;
import com.hxkj.common.utils.UrlUtil;
import org.springframework.web.multipart.MultipartFile;
@ -30,7 +31,14 @@ public class StorageDriver {
*/
public StorageDriver() {
this.engine = ConfigUtil.get("storage", "default", "local");
this.config = ConfigUtil.getMap("storage", this.engine);
Map<String, String> config1;
config1 = ConfigUtil.getMap("storage", this.engine);
if (config1 == null) {
config1 = new HashMap<>();
}
this.config = config1;
}
/**

6
server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java
View File

@ -37,9 +37,9 @@ public class QiniuStorage {
* @return String
*/
public String upToken() {
String accessKey = this.config.get("accessKey");
String secretKey = this.config.get("secretKey");
String bucket = this.config.get("bucket");
String accessKey = this.config.getOrDefault("accessKey", "");
String secretKey = this.config.getOrDefault("secretKey", "");
String bucket = this.config.getOrDefault("bucket", "");
Auth auth = Auth.create(accessKey, secretKey);
return auth.uploadToken(bucket);
}

6
server/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java
View File

@ -97,7 +97,11 @@ public class ConfigUtil {
.eq("type", type)
.eq("name", name));
if (config.getValue().equals("") || config.getValue().equals("[]")) {
if (config == null) {
return null;
}
if (config.getValue().equals("") || config.getValue().equals("[]") || config.getValue().equals("{}")) {
return new LinkedHashMap<>();
}