From be3ae54efedb4266935f8005205134c494c44959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Fri, 22 Nov 2024 23:29:49 +0800 Subject: [PATCH] fix: lint --- internal/data/database_server.go | 8 +++----- web/src/api/panel/database/index.ts | 8 +++++--- web/src/views/database/CreateServerModal.vue | 2 +- web/src/views/database/DatabaseListView.vue | 2 +- web/src/views/database/ServerListView.vue | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/data/database_server.go b/internal/data/database_server.go index 6597e23c..3dfaf33a 100644 --- a/internal/data/database_server.go +++ b/internal/data/database_server.go @@ -14,9 +14,7 @@ import ( "github.com/TheTNB/panel/pkg/db" ) -type databaseServerRepo struct { - database biz.DatabaseRepo -} +type databaseServerRepo struct{} func NewDatabaseServerRepo() biz.DatabaseServerRepo { return do.MustInvoke[biz.DatabaseServerRepo](injector) @@ -80,7 +78,7 @@ func (r databaseServerRepo) Create(req *request.DatabaseServerCreate) error { func (r databaseServerRepo) Update(req *request.DatabaseServerUpdate) error { switch biz.DatabaseType(req.Type) { case biz.DatabaseTypeMysql: - if _, err := db.NewMySQL(req.Username, req.Password, fmt.Sprintf("%s:%r", req.Host, req.Port)); err != nil { + if _, err := db.NewMySQL(req.Username, req.Password, fmt.Sprintf("%s:%d", req.Host, req.Port)); err != nil { return err } case biz.DatabaseTypePostgresql: @@ -88,7 +86,7 @@ func (r databaseServerRepo) Update(req *request.DatabaseServerUpdate) error { return err } case biz.DatabaseTypeRedis: - if _, err := db.NewRedis(req.Username, req.Password, fmt.Sprintf("%s:%r", req.Host, req.Port)); err != nil { + if _, err := db.NewRedis(req.Username, req.Password, fmt.Sprintf("%s:%d", req.Host, req.Port)); err != nil { return err } diff --git a/web/src/api/panel/database/index.ts b/web/src/api/panel/database/index.ts index 6b885f0d..635b0b03 100644 --- a/web/src/api/panel/database/index.ts +++ b/web/src/api/panel/database/index.ts @@ -13,9 +13,11 @@ export default { serverList: (page: number, limit: number) => http.Get('/databaseServer', { params: { page, limit } }), // 创建数据库服务器 - createServer: (data: any) => http.Post('/databaseServer', data), + serverCreate: (data: any) => http.Post('/databaseServer', data), // 更新数据库服务器 - updateServer: (id: number, data: any) => http.Put(`/databaseServer/${id}`, data), + serverUpdate: (id: number, data: any) => http.Put(`/databaseServer/${id}`, data), // 删除数据库服务器 - deleteServer: (id: number) => http.Delete(`/databaseServer/${id}`) + serverDelete: (id: number) => http.Delete(`/databaseServer/${id}`), + // 同步数据库 + serverSync: (id: number) => http.Post(`/databaseServer/${id}/sync`) } diff --git a/web/src/views/database/CreateServerModal.vue b/web/src/views/database/CreateServerModal.vue index 10018f01..31027dec 100644 --- a/web/src/views/database/CreateServerModal.vue +++ b/web/src/views/database/CreateServerModal.vue @@ -19,7 +19,7 @@ const databaseType = [ ] const handleCreate = () => { - useRequest(() => database.createServer(createModel.value)).onSuccess(() => { + useRequest(() => database.serverCreate(createModel.value)).onSuccess(() => { show.value = false window.$message.success('添加成功') window.$bus.emit('database:refresh') diff --git a/web/src/views/database/DatabaseListView.vue b/web/src/views/database/DatabaseListView.vue index a0cb7ff9..28d05549 100644 --- a/web/src/views/database/DatabaseListView.vue +++ b/web/src/views/database/DatabaseListView.vue @@ -129,7 +129,7 @@ const { loading, data, page, total, pageSize, pageCount, refresh } = usePaginati ) const handleDelete = async (id: number) => { - await database.deleteServer(id).then(() => { + await database.delete(id).then(() => { window.$message.success('删除成功') refresh() }) diff --git a/web/src/views/database/ServerListView.vue b/web/src/views/database/ServerListView.vue index a0cb7ff9..72e6cef0 100644 --- a/web/src/views/database/ServerListView.vue +++ b/web/src/views/database/ServerListView.vue @@ -129,7 +129,7 @@ const { loading, data, page, total, pageSize, pageCount, refresh } = usePaginati ) const handleDelete = async (id: number) => { - await database.deleteServer(id).then(() => { + await database.serverDelete(id).then(() => { window.$message.success('删除成功') refresh() })