gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

fix: 修改远程数据库排序问题 (#5257)

Browse Source
This commit is contained in:
ssongliu 2024-06-03 14:07:44 +08:00 committed by GitHub
parent caee2159a8
commit 32fb7feb44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ type DatabaseCreate struct {
Address string `json:"address"` Address string `json:"address"`
Port uint `json:"port"` Port uint `json:"port"`
Username string `json:"username" validate:"required"` Username string `json:"username" validate:"required"`
Password string `json:"password" validate:"required"` Password string `json:"password"`
SSL bool `json:"ssl"` SSL bool `json:"ssl"`
RootCert string `json:"rootCert"` RootCert string `json:"rootCert"`

1
backend/app/service/database.go
View File

@ -43,6 +43,7 @@ func (u *DatabaseService) SearchWithPage(search dto.DatabaseSearch) (int64, inte
total, dbs, err := databaseRepo.Page(search.Page, search.PageSize, total, dbs, err := databaseRepo.Page(search.Page, search.PageSize,
databaseRepo.WithTypeList(search.Type), databaseRepo.WithTypeList(search.Type),
commonRepo.WithLikeName(search.Info), commonRepo.WithLikeName(search.Info),
commonRepo.WithOrderRuleBy(search.OrderBy, search.Order),
databaseRepo.WithoutByFrom("local"), databaseRepo.WithoutByFrom("local"),
) )
var datas []dto.DatabaseInfo var datas []dto.DatabaseInfo