Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GVA - 2021/03/07版本合并 #1

Merged
merged 27 commits into from
Mar 7, 2021
Merged

GVA - 2021/03/07版本合并 #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
43fae5f
add TencentCOS support to OSS
Feb 22, 2021
8cfb4c6
add aliyun oss support
Feb 24, 2021
b494f66
更新了某些文本 让提示更加友好
piexlmax Feb 26, 2021
4b03d2c
Merge pull request #381 from MUHM/develop
piexlmax Feb 27, 2021
9fc2472
Merge branch 'develop' into develop
piexlmax Feb 27, 2021
ac8b8cd
Merge pull request #384 from lauyang/develop
piexlmax Feb 27, 2021
e36e9a1
更新了某些文本 让提示更加友好
piexlmax Feb 26, 2021
625ff31
对合并代码进行微调
piexlmax Feb 27, 2021
d5221a6
前端系统配置增加 tencent-cos aliyun-oss 配置
piexlmax Feb 27, 2021
f42e3a2
新增api重启系统（支持非windows）
songzhibin97 Feb 27, 2021
1e9baff
Update sys_system.go
songzhibin97 Feb 27, 2021
e8dcaba
Merge pull request #386 from songzhibin97/gva_gormv2_dev
piexlmax Feb 27, 2021
a8bf931
字典样式修改
piexlmax Feb 27, 2021
ae42da9
新增功能-api生成数据库并初始化回写配置
songzhibin97 Feb 27, 2021
8b27c39
Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gi…
piexlmax Mar 1, 2021
ddd802f
订正了swagger
songzhibin97 Mar 2, 2021
1e271b1
补充修改
songzhibin97 Mar 2, 2021
da27c85
补充修改
songzhibin97 Mar 2, 2021
ded39b9
Merge pull request #387 from songzhibin97/gva_gormv2_dev
piexlmax Mar 2, 2021
7363fa5
包位置调整
piexlmax Mar 2, 2021
18ef727
自动初始化数据库功能后端部分完成
piexlmax Mar 4, 2021
517e057
cmd剔除 初始数据结构转移 修复初始携带apibug
piexlmax Mar 4, 2021
d9a9b4e
修复初始apibug
piexlmax Mar 4, 2021
9b23ef9
自动初始化整体调试完成
piexlmax Mar 4, 2021
ceee5a8
自动初始化中间件拦截 防止误操作无法进入初始化功能
piexlmax Mar 4, 2021
431e0d6
版本号更改提交
piexlmax Mar 5, 2021
890862c
Merge remote-tracking branch 'origin/master'
piexlmax Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
前端系统配置增加 tencent-cos aliyun-oss 配置
  • Loading branch information
pixel committed Feb 27, 2021
commit d5221a6988e174a9c8b7d94777718bcdfc452e9c
2 changes: 1 addition & 1 deletion server/utils/upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func NewOss() OSS {
return &Qiniu{}
case "tencent-cos":
return &TencentCOS{}
case "aliyun-cos":
case "aliyun-oss":
return &AliyunOSS{}
default:
return &Local{}
Expand Down
43 changes: 43 additions & 0 deletions web/src/view/systemTools/system/system.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<el-select v-model="config.system.ossType">
<el-option value="local"></el-option>
<el-option value="qiniu"></el-option>
<el-option value="tencent-cos"></el-option>
<el-option value="aliyun-oss"></el-option>
</el-select>
</el-form-item>
<el-form-item label="配置文件环境变量名">
Expand Down Expand Up @@ -256,6 +258,45 @@
<el-form-item label="上传是否使用CDN上传加速">
<el-checkbox v-model="config.qiniu.useCdnDomains">开启</el-checkbox>
</el-form-item>
</template>
<template v-if="config.system.ossType == 'tencent-cos'">
<h2>腾讯云COS上传配置</h2>
<el-form-item label="bucket">
<el-input v-model="config.tencentCOS.bucket"></el-input>
</el-form-item>
<el-form-item label="region">
<el-input v-model="config.tencentCOS.region"></el-input>
</el-form-item>
<el-form-item label="secretID">
<el-input v-model="config.tencentCOS.secretID"></el-input>
</el-form-item>
<el-form-item label="secretKey">
<el-input v-model="config.tencentCOS.secretKey"></el-input>
</el-form-item>
<el-form-item label="pathPrefix">
<el-input v-model="config.tencentCOS.pathPrefix"></el-input>
</el-form-item>
<el-form-item label="baseURL">
<el-input v-model="config.tencentCOS.baseURL"></el-input>
</el-form-item>
</template>
<template v-if="config.system.ossType == 'aliyun-oss'">
<h2>阿里云OSS上传配置</h2>
<el-form-item label="endpoint">
<el-input v-model="config.aliyunOSS.endpoint"></el-input>
</el-form-item>
<el-form-item label="accessKeyId">
<el-input v-model="config.aliyunOSS.accessKeyId"></el-input>
</el-form-item>
<el-form-item label="accessKeySecret">
<el-input v-model="config.aliyunOSS.accessKeySecret"></el-input>
</el-form-item>
<el-form-item label="bucketName">
<el-input v-model="config.aliyunOSS.bucketName"></el-input>
</el-form-item>
<el-form-item label="bucketUrl">
<el-input v-model="config.aliyunOSS.bucketUrl"></el-input>
</el-form-item>
</template>
<!-- ossType end -->

Expand All @@ -282,6 +323,8 @@ export default {
sqlite: {},
redis: {},
qiniu: {},
tencentCOS:{},
aliyunOSS:{},
captcha: {},
zap: {},
local: {},
Expand Down