yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix test (#1061)

Browse Source 
* fix 腾讯云COS上传配置无效

* Create docker-cicd.yaml

* 修复InitDataFailed 打印bug

Co-authored-by: tesun <36953434+tesun@users.noreply.github.com>
Co-authored-by: task <ms.yangdan@gmail.com>
Co-authored-by: task <121913992@qq.com>
Co-authored-by: tscuite <tscuite@qq.com>
Co-authored-by: tscuite <64051240+tscuite@users.noreply.github.com>
Co-authored-by: wyh <yinhua_wu@arcplus.com.cn>
This commit is contained in:
奇淼（piexlmax
2022-05-10 14:24:36 +08:00
committed by GitHub
co-authored by tesun task task tscuite tscuite wyh
parent 64a525133b
commit f6fa4c3064
10 changed files with 250 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/components/chooseImg/index.vue
+5 -2
View File
@@ -1,5 +1,8 @@
<template>
<el-drawer v-model="drawer" title="媒体库" size="650px">
<warning-bar
title="点击“文件名/备注”可以编辑文件名或者备注内容。"
/>
<div class="gva-btn-list">
<upload-common
v-model:imageCommon="imageCommon"
@@ -61,6 +64,7 @@ import { getFileList, editFileName } from '@/api/fileUploadAndDownload'
import UploadImage from '@/components/upload/image.vue'
import UploadCommon from '@/components/upload/common.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import warningBar from '@/components/warningBar/warningBar.vue'
const imageUrl = ref('')
const imageCommon = ref('')
@@ -69,7 +73,6 @@ const search = ref({})
const page = ref(1)
const total = ref(0)
const pageSize = ref(20)
const keyword = ref('')
// 分页
const handleSizeChange = (val) => {
@@ -128,7 +131,7 @@ const editFileNameFunc = async(row) => {
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '不能为空',
inputValue: row.name
inputValue: row.name
}).then(async({ value }) => {
row.name = value
// console.log(row)
web/src/view/example/upload/upload.vue
+49 -45
View File
@@ -1,24 +1,26 @@
<template>
<div v-loading.fullscreen.lock="fullscreenLoading">
<div class="gva-table-box">
<warning-bar
title="点击“文件名/备注”可以编辑文件名或者备注内容。"
/>
<div class="gva-btn-list">
<upload-common
v-model:imageCommon="imageCommon"
class="upload-btn"
@on-success="getTableData"
v-model:imageCommon="imageCommon"
class="upload-btn"
@on-success="getTableData"
/>
<upload-image
v-model:imageUrl="imageUrl"
:file-size="512"
:max-w-h="1080"
class="upload-btn"
@on-success="getTableData"
v-model:imageUrl="imageUrl"
:file-size="512"
:max-w-h="1080"
class="upload-btn"
@on-success="getTableData"
/>
<el-form ref="searchForm" :inline="true" :model="search">
<el-form-item label="">
<el-input v-model="search.keyword" class="keyword" placeholder="请输入文件名或备注"/>
<el-input v-model="search.keyword" class="keyword" placeholder="请输入文件名或备注" />
</el-form-item>
<el-form-item>
@@ -31,7 +33,7 @@
<el-table :data="tableData">
<el-table-column align="left" label="预览" width="100">
<template #default="scope">
<CustomPic pic-type="file" :pic-src="scope.row.url"/>
<CustomPic pic-type="file" :pic-src="scope.row.url" />
</template>
</el-table-column>
<el-table-column align="left" label="日期" prop="UpdatedAt" width="180">
@@ -41,15 +43,15 @@
</el-table-column>
<el-table-column align="left" label="文件名/备注" prop="name" width="180">
<template #default="scope">
<div class="name" @click="editFileNameFunc(scope.row)">{{scope.row.name}}</div>
<div class="name" @click="editFileNameFunc(scope.row)">{{ scope.row.name }}</div>
</template>
</el-table-column>
<el-table-column align="left" label="链接" prop="url" min-width="300"/>
<el-table-column align="left" label="链接" prop="url" min-width="300" />
<el-table-column align="left" label="标签" prop="tag" width="100">
<template #default="scope">
<el-tag
:type="scope.row.tag === 'jpg' ? 'primary' : 'success'"
disable-transitions
:type="scope.row.tag === 'jpg' ? 'primary' : 'success'"
disable-transitions
>{{ scope.row.tag }}
</el-tag>
</template>
@@ -63,14 +65,14 @@
</el-table>
<div class="gva-pagination">
<el-pagination
:current-page="page"
:page-size="pageSize"
:page-sizes="[10, 30, 50, 100]"
:style="{ float: 'right', padding: '20px' }"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
:current-page="page"
:page-size="pageSize"
:page-sizes="[10, 30, 50, 100]"
:style="{ float: 'right', padding: '20px' }"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
/>
</div>
</div>
@@ -85,6 +87,7 @@ import CustomPic from '@/components/customPic/index.vue'
import UploadImage from '@/components/upload/image.vue'
import UploadCommon from '@/components/upload/common.vue'
import { formatDate } from '@/utils/format'
import warningBar from '@/components/warningBar/warningBar.vue'
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
@@ -130,25 +133,25 @@ const deleteFileFunc = async(row) => {
cancelButtonText: '取消',
type: 'warning',
})
.then(async() => {
const res = await deleteFile(row)
if (res.code === 0) {
ElMessage({
type: 'success',
message: '删除成功!',
})
if (tableData.value.length === 1 && page.value > 1) {
page.value--
}
getTableData()
}
})
.catch(() => {
.then(async() => {
const res = await deleteFile(row)
if (res.code === 0) {
ElMessage({
type: 'info',
message: '已取消删除',
type: 'success',
message: '删除成功!',
})
if (tableData.value.length === 1 && page.value > 1) {
page.value--
}
getTableData()
}
})
.catch(() => {
ElMessage({
type: 'info',
message: '已取消删除',
})
})
}
const downloadFile = (row) => {
@@ -170,10 +173,10 @@ const editFileNameFunc = async(row) => {
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '不能为空',
inputValue: row.name
inputValue: row.name
}).then(async({ value }) => {
row.name = value;
//console.log(row)
row.name = value
// console.log(row)
const res = await editFileName(row)
if (res.code === 0) {
ElMessage({
@@ -186,8 +189,8 @@ const editFileNameFunc = async(row) => {
ElMessage({
type: 'info',
message: '取消修改'
});
});
})
})
}
</script>
@@ -198,9 +201,10 @@ export default {
}
</script>
<style scoped>
.name{
.name {
cursor: pointer;
}
.upload-btn + .upload-btn {
margin-left: 12px;
}
web/src/view/systemTools/system/system.vue
+35 -31
View File
@@ -5,7 +5,11 @@
<el-collapse v-model="activeNames">
<el-collapse-item title="系统配置" name="1">
<el-form-item label="环境值">
<el-input v-model="config.system.env" />
<!-- <el-input v-model="config.system.env" />-->
<el-select v-model="config.system.env" style="width:100%">
<el-option value="public" />
<el-option value="develop" />
</el-select>
</el-form-item>
<el-form-item label="端口值">
<el-input v-model.number="config.system.addr" />
@@ -79,13 +83,13 @@
</el-form-item>
</el-collapse-item>
<el-collapse-item title="Redis admin数据库配置" name="4">
<el-form-item label="db">
<el-form-item label="库">
<el-input v-model="config.redis.db" />
</el-form-item>
<el-form-item label="addr">
<el-form-item label="地址">
<el-input v-model="config.redis.addr" />
</el-form-item>
<el-form-item label="password">
<el-form-item label="密码">
<el-input v-model="config.redis.password" />
</el-form-item>
</el-collapse-item>
@@ -120,28 +124,28 @@
</el-collapse-item>
<el-collapse-item title="验证码配置" name="7">
<el-form-item label="keyLong">
<el-form-item label="字符长度">
<el-input v-model.number="config.captcha['key-long']" />
</el-form-item>
<el-form-item label="imgWidth">
<el-form-item label="平台宽度">
<el-input v-model.number="config.captcha['img-width']" />
</el-form-item>
<el-form-item label="imgHeight">
<el-form-item label="图片高度">
<el-input v-model.number="config.captcha['img-height']" />
</el-form-item>
</el-collapse-item>
<el-collapse-item title="数据库配置" name="9">
<template v-if="config.system['db-type'] === 'mysql'">
<el-form-item label="username">
<el-form-item label="用户名">
<el-input v-model="config.mysql.username" />
</el-form-item>
<el-form-item label="password">
<el-form-item label="密码">
<el-input v-model="config.mysql.password" />
</el-form-item>
<el-form-item label="path">
<el-form-item label="地址">
<el-input v-model="config.mysql.path" />
</el-form-item>
<el-form-item label="dbname">
<el-form-item label="数据库">
<el-input v-model="config.mysql['db-name']" />
</el-form-item>
<el-form-item label="maxIdleConns">
@@ -150,21 +154,21 @@
<el-form-item label="maxOpenConns">
<el-input v-model.number="config.mysql['max-open-conns']" />
</el-form-item>
<el-form-item label="logMode">
<el-form-item label="日志模式">
<el-checkbox v-model="config.mysql['log-mode']" />
</el-form-item>
</template>
<template v-if="config.system.dbType === 'pgsql'">
<el-form-item label="username">
<el-form-item label="用户名">
<el-input v-model="config.pgsql.username" />
</el-form-item>
<el-form-item label="password">
<el-form-item label="密码">
<el-input v-model="config.pgsql.password" />
</el-form-item>
<el-form-item label="path">
<el-form-item label="地址">
<el-input v-model="config.pgsql.path" />
</el-form-item>
<el-form-item label="dbname">
<el-form-item label="数据库">
<el-input v-model="config.pgsql.dbname" />
</el-form-item>
<el-form-item label="maxIdleConns">
@@ -173,7 +177,7 @@
<el-form-item label="maxOpenConns">
<el-input v-model.number="config.pgsql['max-open-conns']" />
</el-form-item>
<el-form-item label="logMode">
<el-form-item label="日志模式">
<el-checkbox v-model="config.pgsql['log-mode']" />
</el-form-item>
</template>
@@ -212,28 +216,28 @@
</template>
<template v-if="config.system['oss-type'] === 'tencent-cos'">
<h2>腾讯云COS上传配置</h2>
<el-form-item label="bucket">
<el-form-item label="存储桶名称">
<el-input v-model="config['tencent-cos']['bucket']" />
</el-form-item>
<el-form-item label="region">
<el-form-item label="所属地域">
<el-input v-model="config['tencent-cos'].region" />
</el-form-item>
<el-form-item label="secretID">
<el-input v-model="config['tencent-cos'].secretID" />
<el-input v-model="config['tencent-cos']['secret-id']" />
</el-form-item>
<el-form-item label="secretKey">
<el-input v-model="config['tencent-cos'].secretKey" />
<el-input v-model="config['tencent-cos']['secret-key']" />
</el-form-item>
<el-form-item label="pathPrefix">
<el-input v-model="config['tencent-cos'].pathPrefix" />
<el-form-item label="路径前缀">
<el-input v-model="config['tencent-cos']['path-prefix']" />
</el-form-item>
<el-form-item label="baseURL">
<el-input v-model="config['tencent-cos'].baseURL" />
<el-form-item label="访问域名">
<el-input v-model="config['tencent-cos']['base-url']" />
</el-form-item>
</template>
<template v-if="config.system['oss-type'] === 'aliyun-oss'">
<h2>阿里云OSS上传配置</h2>
<el-form-item label="endpoint">
<el-form-item label="区域">
<el-input v-model="config['aliyun-oss'].endpoint" />
</el-form-item>
<el-form-item label="accessKeyId">
@@ -242,22 +246,22 @@
<el-form-item label="accessKeySecret">
<el-input v-model="config['aliyun-oss']['access-key-secret']" />
</el-form-item>
<el-form-item label="bucketName">
<el-form-item label="存储桶名称">
<el-input v-model="config['aliyun-oss']['bucket-name']" />
</el-form-item>
<el-form-item label="bucketUrl">
<el-form-item label="访问域名">
<el-input v-model="config['aliyun-oss']['bucket-url']" />
</el-form-item>
</template>
<template v-if="config.system['oss-type'] === 'huawei-obs'">
<h2>华为云Obs上传配置</h2>
<el-form-item label="path">
<el-form-item label="路径">
<el-input v-model="config['hua-wei-obs'].path" />
</el-form-item>
<el-form-item label="bucket">
<el-form-item label="存储桶名称">
<el-input v-model="config['hua-wei-obs'].bucket" />
</el-form-item>
<el-form-item label="endpoint">
<el-form-item label="区域">
<el-input v-model="config['hua-wei-obs'].endpoint" />
</el-form-item>
<el-form-item label="accessKey">