diff --git a/app/http/entities/backend/db.go b/app/http/entities/backend/db.go index 50e8f74..6672401 100644 --- a/app/http/entities/backend/db.go +++ b/app/http/entities/backend/db.go @@ -34,7 +34,7 @@ type DbEditRequest struct { DbName string `json:"db_name" validate:"required" form:"db_name" example:""` DbType string `json:"db_type" validate:"required" form:"db_type" example:"mysql"` DbPermission int `json:"db_permission" validate:"required" form:"db_permission" example:"1"` - Source string `json:"source" validate:"required" form:"source" example:""` + Source string `json:"source" form:"source" example:""` Desc string `json:"desc" form:"desc" example:""` Status int `json:"status" form:"status" example:"1"` } diff --git a/app/services/db_service/db_service.go b/app/services/db_service/db_service.go index f820e51..9ee6d30 100644 --- a/app/services/db_service/db_service.go +++ b/app/services/db_service/db_service.go @@ -26,7 +26,7 @@ func DbList(request *backend.DbListRequest, page int, limit int) (count int64, D if request.DbPermission != 0 { session = session.And(builder.Eq{"DbPermission": request.DbPermission}) } - count, err = session.Omit("source", "UpdateTime").FindAndCount(&DbListInfo) + count, err = session.OrderBy("db_id desc").Omit("source", "UpdateTime").FindAndCount(&DbListInfo) if err != nil { return } @@ -42,8 +42,16 @@ func DbAdd(request *backend.DbAddRequest) (err error) { } func DbEdit(request *backend.DbEditRequest) (err error) { + var info crondbmodel.CronDb + flag, _ := crondbmodel.GetInstance().GetDb().ID(request.DbId).Get(&info) + if !flag { + return + } var db crondbmodel.CronDb _ = mapstructure.Decode(request, &db) + if request.Source == "" { + request.Source = info.Source + } _, err = crondbmodel.GetInstance().GetDb().ID(request.DbId).Update(&db) return }