evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交 1.3.0-beta4

Browse Source
This commit is contained in:
dushixiang
2022-10-29 17:36:24 +08:00
parent f87d44d38b
commit b6150c77f8
15 changed files with 104 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/service/asset.go
View File

@ -7,6 +7,7 @@ import (
"fmt"
"golang.org/x/net/proxy"
"net"
"next-terminal/server/common/maps"
"next-terminal/server/common/nt"
"strconv"
"time"
@ -18,7 +19,6 @@ import (
"next-terminal/server/repository"
"next-terminal/server/utils"
"github.com/labstack/echo/v4"
"gorm.io/gorm"
)
@ -173,22 +173,22 @@ func (s assetService) CheckStatus(asset *model.Asset, ip string, port int) (bool
}
}
func (s assetService) Create(ctx context.Context, m echo.Map) (model.Asset, error) {
func (s assetService) Create(ctx context.Context, m maps.Map) (*model.Asset, error) {
data, err := json.Marshal(m)
if err != nil {
return model.Asset{}, err
return nil, err
}
var item model.Asset
if err := json.Unmarshal(data, &item); err != nil {
return model.Asset{}, err
return nil, err
}
item.ID = utils.UUID()
item.Created = common.NowJsonTime()
item.Active = true
return item, s.Transaction(ctx, func(ctx context.Context) error {
return &item, s.Transaction(ctx, func(ctx context.Context) error {
if err := s.Encrypt(&item, config.GlobalCfg.EncryptionPassword); err != nil {
return err
}
@ -222,7 +222,7 @@ func (s assetService) DeleteById(id string) error {
})
}
func (s assetService) UpdateById(id string, m echo.Map) error {
func (s assetService) UpdateById(id string, m maps.Map) error {
data, err := json.Marshal(m)
if err != nil {
return err

4
server/service/backup.go
View File

@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"errors"
"next-terminal/server/common/maps"
"strings"
"next-terminal/server/common"
@ -15,7 +16,6 @@ import (
"next-terminal/server/repository"
"next-terminal/server/utils"
"github.com/labstack/echo/v4"
"gorm.io/gorm"
)
@ -265,7 +265,7 @@ func (service backupService) Import(backup *dto.Backup) error {
if err != nil {
return err
}
m := echo.Map{}
m := maps.Map{}
if err := json.Unmarshal(data, &m); err != nil {
return err
}