Merge remote-tracking branch 'origin/main' into main-github

This commit is contained in:
Liujian
2024-11-04 11:00:05 +08:00
2 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -75,6 +75,6 @@ require (
gorm.io/driver/mysql v1.5.2 // indirect
)
replace github.com/eolinker/ap-account => ../../eolinker/ap-account
replace github.com/eolinker/ap-account => ../aoaccount
replace github.com/eolinker/go-common => ../../eolinker/go-common
replace github.com/eolinker/go-common => ../go-common
+5 -2
View File
@@ -75,11 +75,14 @@ type App struct {
}
func ToService(model *service.Service) *Service {
prefix := "/"
if model.Prefix != "" {
prefix = model.Prefix
}
s := &Service{
Id: model.Id,
Name: model.Name,
Prefix: model.Prefix,
Prefix: prefix,
Description: model.Description,
Team: auto.UUID(model.Team),
ServiceType: model.ServiceType.String(),