github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: 同步数据库时标记已删除数据库 (#4185)

Browse Source 
Refs #4165
pull/4190/head
ssongliu 8 months ago committed by GitHub
parent be36103475
commit 0f9b0d5d82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 108 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
backend/app/dto/database.go
Unescape View File

@ -41,7 +41,7 @@ type MysqlDBInfo struct {
Username string `json:"username"`
Password string `json:"password"`
Permission string `json:"permission"`
BackupCount int `json:"backupCount"`
IsDelete bool `json:"isDelete"`
Description string `json:"description"`
}

2
backend/app/dto/database_postgresql.go
Unescape View File

@ -20,7 +20,7 @@ type PostgresqlDBInfo struct {
Username string `json:"username"`
Password string `json:"password"`
SuperUser bool `json:"superUser"`
BackupCount int `json:"backupCount"`
IsDelete bool `json:"isDelete"`
Description string `json:"description"`
}

1
backend/app/model/database_mysql.go
Unescape View File

@ -9,5 +9,6 @@ type DatabaseMysql struct {
Username string `json:"username" gorm:"type:varchar(256);not null"`
Password string `json:"password" gorm:"type:varchar(256);not null"`
Permission string `json:"permission" gorm:"type:varchar(256);not null"`
IsDelete bool `json:"isDelete" gorm:"type:varchar(64)"`
Description string `json:"description" gorm:"type:varchar(256);"`
}

3
backend/app/model/database_postgresql.go
Unescape View File

@ -8,6 +8,7 @@ type DatabasePostgresql struct {
Format string `json:"format" gorm:"type:varchar(64);not null"`
Username string `json:"username" gorm:"type:varchar(256);not null"`
Password string `json:"password" gorm:"type:varchar(256);not null"`
SuperUser bool `json:"superUser" gorm:"type:varchar(64)" `
SuperUser bool `json:"superUser" gorm:"type:varchar(64)"`
IsDelete bool `json:"isDelete" gorm:"type:varchar(64)"`
Description string `json:"description" gorm:"type:varchar(256);"`
}

9
backend/app/service/database_mysql.go
Unescape View File

@ -190,11 +190,13 @@ func (u *MysqlService) LoadFromRemote(req dto.MysqlLoadDB) error {
if err != nil {
return err
}
deleteList := databases
for _, data := range datas {
hasOld := false
for _, oldData := range databases {
if strings.EqualFold(oldData.Name, data.Name) && strings.EqualFold(oldData.MysqlName, data.MysqlName) {
for i := 0; i < len(databases); i++ {
if strings.EqualFold(databases[i].Name, data.Name) && strings.EqualFold(databases[i].MysqlName, data.MysqlName) {
hasOld = true
deleteList = append(deleteList[:i], deleteList[i+1:]...)
break
}
}
@ -208,6 +210,9 @@ func (u *MysqlService) LoadFromRemote(req dto.MysqlLoadDB) error {
}
}
}
for _, delItem := range deleteList {
_ = mysqlRepo.Update(delItem.ID, map[string]interface{}{"is_delete": true})
}
return nil
}

9
backend/app/service/database_postgresql.go
Unescape View File

@ -216,11 +216,13 @@ func (u *PostgresqlService) LoadFromRemote(database string) error {
if err != nil {
return err
}
deleteList := databases
for _, data := range datas {
hasOld := false
for _, oldData := range databases {
if strings.EqualFold(oldData.Name, data.Name) && strings.EqualFold(oldData.PostgresqlName, data.PostgresqlName) {
for i := 0; i < len(databases); i++ {
if strings.EqualFold(databases[i].Name, data.Name) && strings.EqualFold(databases[i].PostgresqlName, data.PostgresqlName) {
hasOld = true
deleteList = append(deleteList[:i], deleteList[i+1:]...)
break
}
}
@ -234,6 +236,9 @@ func (u *PostgresqlService) LoadFromRemote(database string) error {
}
}
}
for _, delItem := range deleteList {
_ = postgresqlRepo.Update(delItem.ID, map[string]interface{}{"is_delete": true})
}
return nil
}

1
backend/init/migration/migrate.go
Unescape View File

@ -74,6 +74,7 @@ func Init() {
migrations.UpdateWebDavConf,
migrations.AddSnapshotIgnore,
migrations.AddDatabaseIsDelete,
})
if err := m.Migrate(); err != nil {
global.LOG.Error(err)

10
backend/init/migration/migrations/v_1_10.go
Unescape View File

@ -15,3 +15,13 @@ var AddSnapshotIgnore = &gormigrate.Migration{
return nil
},
}
var AddDatabaseIsDelete = &gormigrate.Migration{
ID: "20240314-add-database-is-delete",
Migrate: func(tx *gorm.DB) error {
if err := tx.AutoMigrate(&model.DatabaseMysql{}, &model.DatabasePostgresql{}); err != nil {
return err
}
return nil
},
}

3
cmd/server/docs/docs.go
Unescape View File

@ -17818,6 +17818,9 @@ const docTemplate = `{
"sessionTimeout": {
"type": "string"
},
"snapshotIgnore": {
"type": "string"
},
"ssl": {
"type": "string"
},

3
cmd/server/docs/swagger.json
Unescape View File

@ -17811,6 +17811,9 @@
"sessionTimeout": {
"type": "string"
},
"snapshotIgnore": {
"type": "string"
},
"ssl": {
"type": "string"
},

2
cmd/server/docs/swagger.yaml
Unescape View File

@ -2538,6 +2538,8 @@ definitions:
type: string
sessionTimeout:
type: string
snapshotIgnore:
type: string
ssl:
type: string
sslType:

2
frontend/src/api/interface/database.ts
Unescape View File

@ -23,6 +23,7 @@ export namespace Database {
username: string;
password: string;
permission: string;
isDelete: string;
description: string;
}
export interface BaseInfo {
@ -207,6 +208,7 @@ export namespace Database {
username: string;
password: string;
superUser: boolean;
isDelete: string;
description: string;
}
export interface ChangeInfo {

3
frontend/src/lang/modules/en.ts
Unescape View File

@ -364,6 +364,7 @@ const message = {
goUpgrade: 'Go for upgrade',
goInstall: 'Go for install',
source: 'Source',
isDelete: 'Deleted',
permission: 'Permission',
permissionForIP: 'IP',
permissionAll: 'All of them(%)',
@ -388,7 +389,7 @@ const message = {
portHelper:
'This port is the exposed port of the container. You need to save the modification separately and restart the container!',
loadFromRemote: 'Load from server',
loadFromRemote: 'Sync from Server',
userBind: 'Bind User',
pgBindHelper:
'This operation is used to create a new user and bind it to the target database. Currently, selecting users already existing in the database is not supported.',

3
frontend/src/lang/modules/tw.ts
Unescape View File

@ -360,6 +360,7 @@ const message = {
goUpgrade: '去應用商店升級',
goInstall: '去應用商店安裝',
source: '來源',
isDelete: '已刪除',
permission: '權限',
permissionForIP: '指定 IP',
permissionAll: '所有人(%)',
@ -380,7 +381,7 @@ const message = {
confChange: '配置修改',
confNotFound: '未能找到該應用配置文件，請在應用商店升級該應用至最新版本後重試！',
loadFromRemote: '從服務器獲取',
loadFromRemote: '從伺服器同步',
userBind: '綁定使用者',
pgBindHelper: '此操作用於創建新使用者並將其綁定到目標資料庫，暫不支援選擇已存在於資料庫中的使用者。',
pgSuperUser: '超級使用者',

3
frontend/src/lang/modules/zh.ts
Unescape View File

@ -360,6 +360,7 @@ const message = {
goUpgrade: '去应用列表升级',
goInstall: '去应用商店安装',
source: '来源',
isDelete: '已删除',
permission: '权限',
permissionForIP: '指定 IP',
permissionAll: '所有人(%)',
@ -380,7 +381,7 @@ const message = {
confChange: '配置修改',
confNotFound: '未能找到该应用配置文件，请在应用商店升级该应用至最新版本后重试！',
loadFromRemote: '从服务器获取',
loadFromRemote: '从服务器同步',
userBind: '绑定用户',
pgBindHelper: '该操作用于创建新用户并将其绑定到目标数据库，暂不支持选择已存在于数据库中的用户。',
pgSuperUser: '超级用户',

41
frontend/src/views/database/mysql/index.vue
Unescape View File

@ -113,8 +113,19 @@
</template>
<template #main v-if="currentDB">
<ComplexTable :pagination-config="paginationConfig" @sort-change="search" @search="search" :data="data">
<el-table-column :label="$t('commons.table.name')" prop="name" sortable />
<el-table-column :label="$t('commons.login.username')" prop="username">
<el-table-column :label="$t('commons.table.name')" prop="name" sortable min-width="90">
<template #default="{ row }">
<Tooltip v-if="!row.isDelete" :islink="false" :text="row.name" />
<div v-else>
<span v-if="row.name.length < 15">{{ row.name }}</span>
<el-tooltip v-else :content="row.name">{{ row.name.substring(0, 10) }}...</el-tooltip>
<el-tag round type="info" class="ml-1" size="small">
{{ $t('database.isDelete') }}
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('commons.login.username')" show-overflow-tooltip prop="username">
<template #default="{ row }">
<div class="flex items-center" v-if="row.username">
<span>
@ -122,7 +133,13 @@
</span>
</div>
<div v-else>
<el-button style="margin-left: -3px" type="primary" link @click="onBind(row)">
<el-button
:disabled="row.isDelete"
style="margin-left: -3px"
type="primary"
link
@click="onBind(row)"
>
{{ $t('database.userBind') }}
</el-button>
</div>
@ -159,7 +176,13 @@
</div>
</div>
<div v-if="row.password === '' && row.username">
<el-button style="margin-left: -3px" link type="primary" @click="onChangePassword(row)">
<el-button
:disabled="row.isDelete"
style="margin-left: -3px"
link
type="primary"
@click="onChangePassword(row)"
>
{{ $t('database.passwordHelper') }}
</el-button>
</div>
@ -542,7 +565,7 @@ const buttons = [
{
label: i18n.global.t('database.changePassword'),
disabled: (row: Database.MysqlDBInfo) => {
return !row.username;
return !row.username || row.isDelete;
},
click: (row: Database.MysqlDBInfo) => {
onChangePassword(row);
@ -551,7 +574,7 @@ const buttons = [
{
label: i18n.global.t('database.permission'),
disabled: (row: Database.MysqlDBInfo) => {
return !row.password;
return !row.password || row.isDelete;
},
click: (row: Database.MysqlDBInfo) => {
let param = {
@ -576,6 +599,9 @@ const buttons = [
},
{
label: i18n.global.t('database.backupList'),
disabled: (row: Database.MysqlDBInfo) => {
return row.isDelete;
},
click: (row: Database.MysqlDBInfo) => {
let params = {
type: currentDB.value.type,
@ -587,6 +613,9 @@ const buttons = [
},
{
label: i18n.global.t('database.loadBackup'),
disabled: (row: Database.MysqlDBInfo) => {
return row.isDelete;
},
click: (row: Database.MysqlDBInfo) => {
let params = {
type: currentDB.value.type,

31
frontend/src/views/database/postgresql/index.vue
Unescape View File

@ -90,7 +90,18 @@
</template>
<template #main v-if="currentDB">
<ComplexTable :pagination-config="paginationConfig" @sort-change="search" @search="search" :data="data">
<el-table-column :label="$t('commons.table.name')" prop="name" sortable />
<el-table-column :label="$t('commons.table.name')" prop="name" sortable>
<template #default="{ row }">
<Tooltip v-if="!row.isDelete" :islink="false" :text="row.name" />
<div v-else>
<span v-if="row.name.length < 15">{{ row.name }}</span>
<el-tooltip v-else :content="row.name">{{ row.name.substring(0, 10) }}...</el-tooltip>
<el-tag round type="info" class="ml-1" size="small">
{{ $t('database.isDelete') }}
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('commons.login.username')" prop="username">
<template #default="{ row }">
<div class="flex items-center" v-if="row.username">
@ -99,7 +110,13 @@
</span>
</div>
<div v-else>
<el-button style="margin-left: -3px" type="primary" link @click="onBind(row)">
<el-button
:disabled="row.isDelete"
style="margin-left: -3px"
type="primary"
link
@click="onBind(row)"
>
{{ $t('database.userBind') }}
</el-button>
</div>
@ -498,7 +515,7 @@ const buttons = [
{
label: i18n.global.t('database.changePassword'),
disabled: (row: Database.PostgresqlDBInfo) => {
return !row.username;
return !row.username || row.isDelete;
},
click: (row: Database.PostgresqlDBInfo) => {
onChangePassword(row);
@ -507,7 +524,7 @@ const buttons = [
{
label: i18n.global.t('database.permission'),
disabled: (row: Database.PostgresqlDBInfo) => {
return !row.username;
return !row.username || row.isDelete;
},
click: (row: Database.PostgresqlDBInfo) => {
let param = {
@ -521,6 +538,9 @@ const buttons = [
},
{
label: i18n.global.t('database.backupList'),
disabled: (row: Database.PostgresqlDBInfo) => {
return row.isDelete;
},
click: (row: Database.PostgresqlDBInfo) => {
let params = {
type: currentDB.value.type,
@ -532,6 +552,9 @@ const buttons = [
},
{
label: i18n.global.t('database.loadBackup'),
disabled: (row: Database.PostgresqlDBInfo) => {
return row.isDelete;
},
click: (row: Database.PostgresqlDBInfo) => {
let params = {
type: currentDB.value.type,

Write Preview
Loading…
Cancel
Save