HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into internal

Browse Source
This commit is contained in:
shanshanzhong
2026-03-19 01:55:01 -07:00
parent 5898b74647 bc721b0ba6
commit e5e9f93f68
101 changed files with 6910 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/logic/admin/server/createNodeLogic.go
+8 -7
View File
@@ -29,13 +29,14 @@ func NewCreateNodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Create
func (l *CreateNodeLogic) CreateNode(req *types.CreateNodeRequest) error {
data := node.Node{
Name: req.Name,
Tags: tool.StringSliceToString(req.Tags),
Enabled: req.Enabled,
Port: req.Port,
Address: req.Address,
ServerId: req.ServerId,
Protocol: req.Protocol,
Name: req.Name,
Tags: tool.StringSliceToString(req.Tags),
Enabled: req.Enabled,
Port: req.Port,
Address: req.Address,
ServerId: req.ServerId,
Protocol: req.Protocol,
NodeGroupIds: node.JSONInt64Slice(req.NodeGroupIds),
}
err := l.svcCtx.NodeModel.InsertNode(l.ctx, &data)
if err != nil {
internal/logic/admin/server/filterNodeListLogic.go
+22 -14
View File
@@ -29,10 +29,17 @@ func NewFilterNodeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Fi
}
func (l *FilterNodeListLogic) FilterNodeList(req *types.FilterNodeListRequest) (resp *types.FilterNodeListResponse, err error) {
// Convert NodeGroupId to []int64 for model
var nodeGroupIds []int64
if req.NodeGroupId != nil {
nodeGroupIds = []int64{*req.NodeGroupId}
}
total, data, err := l.svcCtx.NodeModel.FilterNodeList(l.ctx, &node.FilterNodeParams{
Page: req.Page,
Size: req.Size,
Search: req.Search,
Page: req.Page,
Size: req.Size,
Search: req.Search,
NodeGroupIds: nodeGroupIds,
})
if err != nil {
@@ -43,17 +50,18 @@ func (l *FilterNodeListLogic) FilterNodeList(req *types.FilterNodeListRequest) (
list := make([]types.Node, 0)
for _, datum := range data {
list = append(list, types.Node{
Id: datum.Id,
Name: datum.Name,
Tags: tool.RemoveDuplicateElements(strings.Split(datum.Tags, ",")...),
Port: datum.Port,
Address: datum.Address,
ServerId: datum.ServerId,
Protocol: datum.Protocol,
Enabled: datum.Enabled,
Sort: datum.Sort,
CreatedAt: datum.CreatedAt.UnixMilli(),
UpdatedAt: datum.UpdatedAt.UnixMilli(),
Id: datum.Id,
Name: datum.Name,
Tags: tool.RemoveDuplicateElements(strings.Split(datum.Tags, ",")...),
Port: datum.Port,
Address: datum.Address,
ServerId: datum.ServerId,
Protocol: datum.Protocol,
Enabled: datum.Enabled,
Sort: datum.Sort,
NodeGroupIds: []int64(datum.NodeGroupIds),
CreatedAt: datum.CreatedAt.UnixMilli(),
UpdatedAt: datum.UpdatedAt.UnixMilli(),
})
}
internal/logic/admin/server/updateNodeLogic.go
+1
View File
@@ -40,6 +40,7 @@ func (l *UpdateNodeLogic) UpdateNode(req *types.UpdateNodeRequest) error {
data.Address = req.Address
data.Protocol = req.Protocol
data.Enabled = req.Enabled
data.NodeGroupIds = node.JSONInt64Slice(req.NodeGroupIds)
err = l.svcCtx.NodeModel.UpdateNode(l.ctx, data)
if err != nil {
l.Errorw("[UpdateNode] Update Database Error: ", logger.Field("error", err.Error()))