From fac71a479410d5588b9d7b2f0453968540a08dfd Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Wed, 27 Sep 2023 17:19:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=AB=AF=E5=8F=A3=E8=B0=83=E6=95=B4&?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=BC=80=E5=85=B3=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/login/component/AccountLogin.vue | 4 +-- mayfly_go_web/src/views/ops/db/SqlExec.vue | 7 +++- mayfly_go_web/vite.config.ts | 2 +- server/internal/db/application/db.go | 32 ++++++++----------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/mayfly_go_web/src/views/login/component/AccountLogin.vue b/mayfly_go_web/src/views/login/component/AccountLogin.vue index 88de413a..234a71d6 100644 --- a/mayfly_go_web/src/views/login/component/AccountLogin.vue +++ b/mayfly_go_web/src/views/login/component/AccountLogin.vue @@ -405,9 +405,7 @@ const toIndex = async () => { // 关闭 loading state.loading.signIn = true; ElMessage.success(`${currentTimeInfo}，欢迎回来！`); - if (await useWartermark()) { - saveUseWatermark(true); - } + saveUseWatermark(await useWartermark()); }, 300); }; diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index 9c081043..4f773f8f 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -2,7 +2,12 @@
- 新建查询 diff --git a/mayfly_go_web/vite.config.ts b/mayfly_go_web/vite.config.ts index b026b42d..0138d5d4 100644 --- a/mayfly_go_web/vite.config.ts +++ b/mayfly_go_web/vite.config.ts @@ -29,7 +29,7 @@ const viteConfig: UserConfig = { open: VITE_OPEN, proxy: { '/api': { - target: 'http://localhost:8888', + target: 'http://localhost:18888', ws: true, changeOrigin: true, }, diff --git a/server/internal/db/application/db.go b/server/internal/db/application/db.go index dc24f12e..c95a6956 100644 --- a/server/internal/db/application/db.go +++ b/server/internal/db/application/db.go @@ -76,42 +76,36 @@ func (d *dbAppImpl) GetById(id uint64, cols ...string) *entity.Db { } func (d *dbAppImpl) Save(dbEntity *entity.Db) { - // 查找是否存在该库 - oldDb := &entity.Db{Name: dbEntity.Name} + // 查找是否存在 + oldDb := &entity.Db{Name: dbEntity.Name, InstanceId: dbEntity.InstanceId} err := d.GetDbBy(oldDb) if dbEntity.Id == 0 { - biz.IsTrue(err != nil, "该数据库资源已存在") + biz.IsTrue(err != nil, "该实例下数据库名已存在") d.dbRepo.Insert(dbEntity) return } // 如果存在该库，则校验修改的库是否为该库 if err == nil { - biz.IsTrue(oldDb.Id == dbEntity.Id, "该数据库资源已存在") + biz.IsTrue(oldDb.Id == dbEntity.Id, "该实例下数据库名已存在") } dbId := dbEntity.Id old := d.GetById(dbId) - var oldDbs []any - for _, v := range strings.Split(old.Database, " ") { + oldDbs := strings.Split(old.Database, " ") + newDbs := strings.Split(dbEntity.Database, " ") + // 比较新旧数据库列表，需要将移除的数据库相关联的信息删除 + _, delDb, _ := collx.ArrayCompare(newDbs, oldDbs, func(i1, i2 string) bool { + return i1 == i2 + }) + + for _, v := range delDb { // 关闭数据库连接 CloseDb(dbEntity.Id, v) - oldDbs = append(oldDbs, v) - } - - var newDbs []any - for _, v := range strings.Split(dbEntity.Database, " ") { - newDbs = append(newDbs, v) - } - // 比较新旧数据库列表，需要将移除的数据库相关联的信息删除 - _, delDb, _ := collx.ArrayCompare(newDbs, oldDbs, func(i1, i2 any) bool { - return i1.(string) == i2.(string) - }) - for _, v := range delDb { // 删除该库关联的所有sql记录 - d.dbSqlRepo.DeleteBy(&entity.DbSql{DbId: dbId, Db: v.(string)}) + d.dbSqlRepo.DeleteBy(&entity.DbSql{DbId: dbId, Db: v}) } d.dbRepo.Update(dbEntity)