diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java b/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java index ff223e7..5b50bf7 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java @@ -10,6 +10,7 @@ package com.yami.shop.common.bean; +import com.yami.shop.common.enums.QiniuZone; import lombok.Data; /** @@ -27,4 +28,5 @@ public class Qiniu { private String resourcesUrl; + private QiniuZone zone; } diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java index 8719116..cee436c 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java @@ -10,6 +10,7 @@ package com.yami.shop.common.config; +import com.yami.shop.common.enums.QiniuZone; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -20,6 +21,8 @@ import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; import com.yami.shop.common.bean.Qiniu; +import java.util.Objects; + /** * 文件上传配置 * @author lgh @@ -27,16 +30,28 @@ import com.yami.shop.common.bean.Qiniu; @Configuration public class FileUploadConfig { - + @Autowired private Qiniu qiniu; - + /** - * 华南机房 + * 根据配置文件选择机房 */ @Bean public com.qiniu.storage.Configuration qiniuConfig() { - return new com.qiniu.storage.Configuration(Zone.zone2()); + Zone zone = null; + if (Objects.equals(qiniu.getZone(), QiniuZone.HUA_BEI)) { + zone = Zone.huabei(); + } else if (Objects.equals(qiniu.getZone(), QiniuZone.HUA_DONG)) { + zone = Zone.huadong(); + } else if (Objects.equals(qiniu.getZone(), QiniuZone.HUA_NAN)) { + zone = Zone.huanan(); + } else if (Objects.equals(qiniu.getZone(), QiniuZone.BEI_MEI)) { + zone = Zone.beimei(); + } else if (Objects.equals(qiniu.getZone(), QiniuZone.XIN_JIA_PO)) { + zone = Zone.xinjiapo(); + } + return new com.qiniu.storage.Configuration(zone); } /** @@ -55,7 +70,7 @@ public class FileUploadConfig { public Auth auth() { return Auth.create(qiniu.getAccessKey(), qiniu.getSecretKey()); } - + /** * 构建七牛空间管理实例 */ diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/enums/QiniuZone.java b/yami-shop-common/src/main/java/com/yami/shop/common/enums/QiniuZone.java new file mode 100644 index 0000000..3219e1d --- /dev/null +++ b/yami-shop-common/src/main/java/com/yami/shop/common/enums/QiniuZone.java @@ -0,0 +1,39 @@ +package com.yami.shop.common.enums; + +/** + * 七牛云zone的选择 + * @author LGH + */ +public enum QiniuZone { + + /** + * 华东机房相关 + */ + HUA_DONG(), + + /** + * 华北机房相关 + */ + HUA_BEI(), + + /** + * 华南机房相关 + */ + HUA_NAN(), + + /** + * 北美机房相关 + */ + BEI_MEI(), + + /** + * 新加坡机房相关 + */ + XIN_JIA_PO(), + + ; + + QiniuZone(){ + + } +} diff --git a/yami-shop-common/src/main/resources/shop.properties b/yami-shop-common/src/main/resources/shop.properties index 9072f9e..0fa1caa 100644 --- a/yami-shop-common/src/main/resources/shop.properties +++ b/yami-shop-common/src/main/resources/shop.properties @@ -2,6 +2,8 @@ shop.qiniu.resourcesUrl=http://img-test.gz-yami.com/ shop.qiniu.accessKey=**** shop.qiniu.secretKey=**** shop.qiniu.bucket=**** +# \u5177\u4F53\u67E5\u770BQiniuZone.java +shop.qiniu.zone=HUA_NAN shop.aLiDaYu.accessKeyId= shop.aLiDaYu.accessKeySecret=