Skip to content

Commit 80e845f

Browse files
authored
fix: 解决数据库同步后备份路径错误的问题 (#1830)
1 parent d4e6232 commit 80e845f

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

backend/app/service/backup_mysql.go

+1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@ func handleMysqlRecover(req dto.CommonRecover, isRollback bool) error {
176176
}); err != nil {
177177
return err
178178
}
179+
isOk = true
179180
return nil
180181
}

backend/app/service/database_mysql.go

+10
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,15 @@ func (u *MysqlService) LoadFromRemote(from string) error {
143143
return err
144144
}
145145

146+
mysqlName := from
147+
if from == "local" {
148+
app, err := appInstallRepo.LoadBaseInfo("mysql", "")
149+
if err != nil {
150+
return err
151+
}
152+
mysqlName = app.Name
153+
}
154+
146155
databases, err := mysqlRepo.List(remoteDBRepo.WithByFrom(from))
147156
if err != nil {
148157
return err
@@ -164,6 +173,7 @@ func (u *MysqlService) LoadFromRemote(from string) error {
164173
if err := copier.Copy(&createItem, &data); err != nil {
165174
return errors.WithMessage(constant.ErrStructTransform, err.Error())
166175
}
176+
createItem.MysqlName = mysqlName
167177
if err := mysqlRepo.Create(context.Background(), &createItem); err != nil {
168178
return err
169179
}

backend/utils/mysql/client/local.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,9 @@ func (r *Local) SyncDB(version string) ([]SyncDBInfo, error) {
270270
continue
271271
}
272272
dataItem := SyncDBInfo{
273-
Name: parts[0],
274-
From: r.From,
275-
MysqlName: r.From,
276-
Format: parts[1],
273+
Name: parts[0],
274+
From: r.From,
275+
Format: parts[1],
277276
}
278277
userLines, err := r.ExecSQLForRows(fmt.Sprintf("SELECT USER,HOST FROM mysql.DB WHERE DB = '%s'", parts[0]), 300)
279278
if err != nil {

frontend/src/lang/modules/en.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ const message = {
174174
numberRange: 'Number range: {0} - {1}',
175175
paramName: 'Support English, numbers, .- and _, length 2-30',
176176
paramComplexity:
177-
'Support English, numbers, {0}, length 6-30,Special characters cannot be at the beginning and end',
177+
'Support English, numbers, {0}, length 6-128,Special characters cannot be at the beginning and end',
178178
paramUrlAndPort: 'The format is http(s)://(domain name/ip):(port)',
179179
nginxDoc: 'Only supports English case, numbers, and .',
180180
appName: 'Support English, numbers, - and _, length 2-30, and cannot start and end with -_',

frontend/src/views/database/mysql/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ const buttons = [
464464
click: (row: Database.MysqlDBInfo) => {
465465
let params = {
466466
type: 'mysql',
467-
name: mysqlName.value || row.name,
467+
name: row.mysqlName,
468468
detailName: row.name,
469469
};
470470
uploadRef.value!.acceptParams(params);

0 commit comments

Comments
 (0)