1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-31 03:07:34 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: 限制 mysql 5.6.51 版本的升级 (#1618)

Browse source
This commit is contained in:
zhengkunwang 2023-07-12 14:41:16 +08:00 • committed by GitHub
parent f40b053e5b
commit e6b1ef30a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/app/service/app_utils.go
View file

@ -757,7 +757,7 @@ func handleErr(install model.AppInstall, err error, out string) error {
func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]response.AppInstalledDTO, error) { func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]response.AppInstalledDTO, error) {
var res []response.AppInstalledDTO var res []response.AppInstalledDTO
for _, installed := range appInstallList { for _, installed := range appInstallList {
if updated && (installed.App.Type == "php" || installed.Status == constant.Installing) { if updated && (installed.App.Type == "php" || installed.Status == constant.Installing || (installed.App.Key == constant.AppMysql && installed.Version == "5.6.51")) {
continue continue
} }
installDTO := response.AppInstalledDTO{ installDTO := response.AppInstalledDTO{

1
frontend/src/lang/modules/en.ts
View file

@ -1433,6 +1433,7 @@ const message = {
localSSL: 'Select local file', localSSL: 'Select local file',
privateKeyPath: 'Private key file', privateKeyPath: 'Private key file',
certificatePath: 'Certificate file', certificatePath: 'Certificate file',
ipWhiteListHelper: 'The role of IP whitelist: all rules are invalid for IP whitelist',
}, },
php: { php: {
short_open_tag: 'Short tag support', short_open_tag: 'Short tag support',

1
frontend/src/lang/modules/tw.ts
View file

@ -1364,6 +1364,7 @@ const message = {
localSSL: '選擇本地文件', localSSL: '選擇本地文件',
privateKeyPath: '私鑰文件', privateKeyPath: '私鑰文件',
certificatePath: '證書文件', certificatePath: '證書文件',
ipWhiteListHelper: 'IP白名單的作用：所有規則對IP白名單無效',
}, },
php: { php: {
short_open_tag: '短標簽支持', short_open_tag: '短標簽支持',

1
frontend/src/lang/modules/zh.ts
View file

@ -1370,6 +1370,7 @@ const message = {
localSSL: '选择本地文件', localSSL: '选择本地文件',
privateKeyPath: '私钥文件', privateKeyPath: '私钥文件',
certificatePath: '证书文件', certificatePath: '证书文件',
ipWhiteListHelper: 'IP 白名单的作用：所有规则对IP白名单无效',
}, },
php: { php: {
short_open_tag: '短标签支持', short_open_tag: '短标签支持',

4
frontend/src/views/host/file-management/decompress/index.vue
View file

@ -24,7 +24,9 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('file.deCompressDst')" prop="dst"> <el-form-item :label="$t('file.deCompressDst')" prop="dst">
<el-input v-model="form.dst"> <el-input v-model="form.dst">
<template #prepend><FileList :path="form.dst" @choose="getLinkPath"></FileList></template> <template #prepend>
<FileList :path="form.dst" @choose="getLinkPath" :dir="true"></FileList>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>

8
frontend/src/views/website/website/config/safety/simple-list/index.vue
View file

@ -4,6 +4,14 @@
<el-form-item prop="enable" :label="$t('website.enable')"> <el-form-item prop="enable" :label="$t('website.enable')">
<el-switch v-model="enableUpdate.enable" @change="updateEnable"></el-switch> <el-switch v-model="enableUpdate.enable" @change="updateEnable"></el-switch>
</el-form-item> </el-form-item>
<el-form-item>
<el-alert
type="info"
v-if="rule === 'ip_white'"
:title="$t('website.ipWhiteListHelper')"
:closable="false"
/>
</el-form-item>
<el-form-item :label="$t('website.ipValue')"> <el-form-item :label="$t('website.ipValue')">
<el-input <el-input
type="textarea" type="textarea"