Skip to content

Commit f5529ee

Browse files
committed
新增上传七牛服务器区域配置
1 parent 74a98c5 commit f5529ee

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
## 重要更新
2525

26+
- 2022.8.17 新增上传七牛服务器区域配置,现在在 `config/config.ini` 下可以配置七牛对象存储的服务器区域,配置更方便。
27+
2628
- 2022.4.28 取消后台页面新增文章中上传图片为“必填”的限制,避免在配置七牛云上传不成功时报错。
2729

2830
- 2021.3.7 修改了文章阅读页面css样式。
@@ -125,8 +127,9 @@ DbName = ginblog # 数据库名
125127

126128
[qiniu]
127129
# 七牛储存信息
128-
AccessKey = # AK
129-
SecretKey = # SK
130+
Zone = 1 # 1:华东;2:华北;3:华南,不填默认华北。境外服务器特殊使用环境自行配置
131+
AccessKey =
132+
SecretKey =
130133
Bucket =
131134
QiniuSever =
132135
```

config/config.ini

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ DbPassWord =
1313
DbName = ginblog
1414

1515
[qiniu]
16+
Zone = 1 # 1:华东;2:华北;3:华南,不填默认华北。境外服务器特殊使用环境自行配置
1617
AccessKey =
1718
SecretKey =
1819
Bucket =

model/Upload.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"mime/multipart"
1010
)
1111

12+
var Zone = utils.Zone
1213
var AccessKey = utils.AccessKey
1314
var SecretKey = utils.SecretKey
1415
var Bucket = utils.Bucket
@@ -22,7 +23,7 @@ func UpLoadFile(file multipart.File, fileSize int64) (string, int) {
2223
upToken := putPolicy.UploadToken(mac)
2324

2425
cfg := storage.Config{
25-
Zone: &storage.ZoneHuadong,
26+
Zone: selectZone(Zone),
2627
UseCdnDomains: false,
2728
UseHTTPS: false,
2829
}
@@ -40,3 +41,16 @@ func UpLoadFile(file multipart.File, fileSize int64) (string, int) {
4041
return url, errmsg.SUCCSE
4142

4243
}
44+
45+
func selectZone(id int) *storage.Zone {
46+
switch {
47+
case id == 1:
48+
return &storage.ZoneHuadong
49+
case id == 2:
50+
return &storage.ZoneHuabei
51+
case id == 3:
52+
return &storage.ZoneHuanan
53+
default:
54+
return &storage.ZoneHuadong
55+
}
56+
}

utils/setting.go

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ var (
1616
DbPassWord string
1717
DbName string
1818

19+
Zone int
1920
AccessKey string
2021
SecretKey string
2122
Bucket string
@@ -47,6 +48,7 @@ func LoadData(file *ini.File) {
4748
}
4849

4950
func LoadQiniu(file *ini.File) {
51+
Zone = file.Section("qiniu").Key("Zone").MustInt(1)
5052
AccessKey = file.Section("qiniu").Key("AccessKey").String()
5153
SecretKey = file.Section("qiniu").Key("SecretKey").String()
5254
Bucket = file.Section("qiniu").Key("Bucket").String()

0 commit comments

Comments
 (0)