github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Attempt to resolve issue: #110

pull/137/head
johnniang 2019-03-05 00:33:31 +08:00
parent e4a47147b3
commit 783162ffc9
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java
View File

@ -2,9 +2,9 @@ package cc.ryanc.halo.service.impl;
import cc.ryanc.halo.logging.Logger;
import cc.ryanc.halo.model.domain.Attachment;
import cc.ryanc.halo.model.support.QiNiuPutSet;
import cc.ryanc.halo.model.enums.AttachLocationEnum;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.support.QiNiuPutSet;
import cc.ryanc.halo.repository.AttachmentRepository;
import cc.ryanc.halo.service.AttachmentService;
import cc.ryanc.halo.service.base.AbstractCrudService;
@ -260,8 +260,8 @@ public class AttachmentServiceImpl extends AbstractCrudService<Attachment, Long>
public Map<String, String> attachQiNiuUpload(MultipartFile file, HttpServletRequest request) {
final Map<String, String> resultMap = new HashMap<>(7);
try {
// TODO Dynamically set this zone of qiniuyun (七牛云上传附件失败 #110)
final Configuration cfg = new Configuration(Zone.zone0());
// TODO Wait for testing (七牛云上传附件失败 #110)
final Configuration cfg = new Configuration(HaloUtils.getDefaultQiniuZone());
final String key = Md5Util.getMD5Checksum(file);
final String accessKey = OPTIONS.get("qiniu_access_key");
final String secretKey = OPTIONS.get("qiniu_secret_key");

40
src/main/java/cc/ryanc/halo/utils/HaloUtils.java
View File

@ -1,14 +1,16 @@
package cc.ryanc.halo.utils;
import cc.ryanc.halo.model.support.BackupDto;
import cc.ryanc.halo.model.support.Theme;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.CommonParamsEnum;
import cc.ryanc.halo.model.support.BackupDto;
import cc.ryanc.halo.model.support.Theme;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.StrUtil;
import com.qiniu.common.Zone;
import io.github.biezhi.ome.OhMyEmail;
import lombok.extern.slf4j.Slf4j;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
import org.springframework.util.ResourceUtils;
@ -53,6 +55,40 @@ public class HaloUtils {
return DEFAULT_PAGE_SIZE;
}
/**
* Gets default qiniuyun zone.
*
* @return qiniuyun zone
*/
@NonNull
public static Zone getDefaultQiniuZone() {
Zone zone;
// Get zone from setting
String qiniuZone = OPTIONS.get("qiniu_zone");
switch (qiniuZone) {
case "z0":
zone = Zone.zone0();
break;
case "z1":
zone = Zone.zone1();
break;
case "z2":
zone = Zone.zone2();
break;
case "na0":
zone = Zone.zoneNa0();
break;
case "as0":
zone = Zone.zoneAs0();
break;
default:
// Default is detecting zone automatically
zone = Zone.autoZone();
}
return zone;
}
/**
* 获取备份文件信息
*