TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-28 16:36:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加节点IP地址管理等功能

Browse Source
This commit is contained in:
GoEdgeLab
2020-08-30 16:12:00 +08:00
parent 8fedd221fc
commit f8049b3739
25 changed files with 3945 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
internal/db/models/node_cluster_dao.go
View File

@@ -1,9 +1,11 @@
package models
import (
"errors"
_ "github.com/go-sql-driver/mysql"
"github.com/iwind/TeaGo/Tea"
"github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/types"
)
const (
@@ -27,19 +29,21 @@ func NewNodeClusterDAO() *NodeClusterDAO {
var SharedNodeClusterDAO = NewNodeClusterDAO()
// 启用条目
func (this *NodeClusterDAO) EnableNodeCluster(id uint32) (rowsAffected int64, err error) {
return this.Query().
func (this *NodeClusterDAO) EnableNodeCluster(id int64) error {
_, err := this.Query().
Pk(id).
Set("state", NodeClusterStateEnabled).
Update()
return err
}
// 禁用条目
func (this *NodeClusterDAO) DisableNodeCluster(id uint32) (rowsAffected int64, err error) {
return this.Query().
func (this *NodeClusterDAO) DisableNodeCluster(id int64) error {
_, err := this.Query().
Pk(id).
Set("state", NodeClusterStateDisabled).
Update()
return err
}
// 查找启用中的条目
@@ -72,3 +76,50 @@ func (this *NodeClusterDAO) FindAllEnableClusters() (result []*NodeCluster, err
FindAll()
return
}
// 创建集群
func (this *NodeClusterDAO) CreateCluster(name string, grantId int64, installDir string) (clusterId int64, err error) {
op := NewNodeClusterOperator()
op.Name = name
op.GrantId = grantId
op.InstallDir = installDir
op.State = NodeClusterStateEnabled
_, err = this.Save(op)
if err != nil {
return 0, err
}
return types.Int64(op.Id), nil
}
// 修改集群
func (this *NodeClusterDAO) UpdateCluster(clusterId int64, name string, grantId int64, installDir string) error {
if clusterId <= 0 {
return errors.New("invalid clusterId")
}
op := NewNodeClusterOperator()
op.Id = clusterId
op.Name = name
op.GrantId = grantId
op.InstallDir = installDir
_, err := this.Save(op)
return err
}
// 计算所有集群数量
func (this *NodeClusterDAO) CountAllEnabledClusters() (int64, error) {
return this.Query().
State(NodeClusterStateEnabled).
Count()
}
// 列出单页集群
func (this *NodeClusterDAO) ListEnabledClusters(offset, size int64) (result []*NodeCluster, err error) {
_, err = this.Query().
State(NodeClusterStateEnabled).
Offset(offset).
Limit(size).
Slice(&result).
FindAll()
return
}

24
internal/db/models/node_cluster_model.go
View File

@@ -2,19 +2,23 @@ package models
// 节点集群
type NodeCluster struct {
Id uint32 `field:"id"` // ID
Name string `field:"name"` // 名称
Order uint32 `field:"order"` // 排序
CreatedAt uint32 `field:"createdAt"` // 创建时间
State uint8 `field:"state"` // 状态
Id uint32 `field:"id"` // ID
Name string `field:"name"` // 名称
InstallDir string `field:"installDir"` // 安装目录
GrantId uint32 `field:"grantId"` // 默认认证方式
Order uint32 `field:"order"` // 排序
CreatedAt uint32 `field:"createdAt"` // 创建时间
State uint8 `field:"state"` // 状态
}
type NodeClusterOperator struct {
Id interface{} // ID
Name interface{} // 名称
Order interface{} // 排序
CreatedAt interface{} // 创建时间
State interface{} // 状态
Id interface{} // ID
Name interface{} // 名称
InstallDir interface{} // 安装目录
GrantId interface{} // 默认认证方式
Order interface{} // 排序
CreatedAt interface{} // 创建时间
State interface{} // 状态
}
func NewNodeClusterOperator() *NodeClusterOperator {

23
internal/db/models/node_dao.go
View File

@@ -169,14 +169,19 @@ func (this *NodeDAO) CountAllEnabledNodes() (int64, error) {
}
// 列出单页节点
func (this *NodeDAO) ListEnabledNodes(offset int64, size int64) (result []*Node, err error) {
_, err = this.Query().
func (this *NodeDAO) ListEnabledNodesMatch(offset int64, size int64, clusterId int64) (result []*Node, err error) {
query := this.Query().
State(NodeStateEnabled).
Offset(offset).
Limit(size).
DescPk().
Slice(&result).
FindAll()
Slice(&result)
if clusterId > 0 {
query.Attr("clusterId", clusterId)
}
_, err = query.FindAll()
return
}
@@ -236,6 +241,16 @@ func (this *NodeDAO) FindAllNodeIdsMatch(clusterId int64) (result []int64, err e
return
}
// 计算节点数量
func (this *NodeDAO) CountAllEnabledNodesMatch(clusterId int64) (int64, error) {
query := this.Query()
query.State(NodeStateEnabled)
if clusterId > 0 {
query.Attr("clusterId", clusterId)
}
return query.Count()
}
// 更改节点状态
func (this *NodeDAO) UpdateNodeStatus(nodeId int64, statusJSON []byte) error {
_, err := this.Query().

129
internal/db/models/node_ip_address_dao.go Normal file
View File

@@ -0,0 +1,129 @@
package models
import (
"errors"
_ "github.com/go-sql-driver/mysql"
"github.com/iwind/TeaGo/Tea"
"github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/types"
)
const (
NodeIPAddressStateEnabled = 1 // 已启用
NodeIPAddressStateDisabled = 0 // 已禁用
)
type NodeIPAddressDAO dbs.DAO
func NewNodeIPAddressDAO() *NodeIPAddressDAO {
return dbs.NewDAO(&NodeIPAddressDAO{
DAOObject: dbs.DAOObject{
DB: Tea.Env,
Table: "edgeNodeIPAddresses",
Model: new(NodeIPAddress),
PkName: "id",
},
}).(*NodeIPAddressDAO)
}
var SharedNodeIPAddressDAO = NewNodeIPAddressDAO()
// 启用条目
func (this *NodeIPAddressDAO) EnableAddress(id int64) (err error) {
_, err = this.Query().
Pk(id).
Set("state", NodeIPAddressStateEnabled).
Update()
return err
}
// 禁用IP地址
func (this *NodeIPAddressDAO) DisableAddress(id int64) (err error) {
_, err = this.Query().
Pk(id).
Set("state", NodeIPAddressStateDisabled).
Update()
return err
}
// 禁用节点的所有的IP地址
func (this *NodeIPAddressDAO) DisableAllAddressesWithNodeId(nodeId int64) error {
if nodeId <= 0 {
return errors.New("invalid nodeId")
}
_, err := this.Query().
Attr("nodeId", nodeId).
Set("state", NodeIPAddressStateDisabled).
Update()
return err
}
// 查找启用中的IP地址
func (this *NodeIPAddressDAO) FindEnabledAddress(id int64) (*NodeIPAddress, error) {
result, err := this.Query().
Pk(id).
Attr("state", NodeIPAddressStateEnabled).
Find()
if result == nil {
return nil, err
}
return result.(*NodeIPAddress), err
}
// 根据主键查找名称
func (this *NodeIPAddressDAO) FindAddressName(id int64) (string, error) {
return this.Query().
Pk(id).
Result("name").
FindStringCol("")
}
// 创建IP地址
func (this *NodeIPAddressDAO) CreateAddress(nodeId int64, name string, ip string) (addressId int64, err error) {
op := NewNodeIPAddressOperator()
op.NodeId = nodeId
op.Name = name
op.IP = ip
op.State = NodeIPAddressStateEnabled
_, err = this.Save(op)
if err != nil {
return 0, err
}
return types.Int64(op.Id), nil
}
// 修改IP地址
func (this *NodeIPAddressDAO) UpdateAddress(addressId int64, name string, ip string) (err error) {
if addressId <= 0 {
return errors.New("invalid addressId")
}
op := NewNodeIPAddressOperator()
op.Id = addressId
op.Name = name
op.IP = ip
_, err = this.Save(op)
return err
}
// 修改IP地址所属节点
func (this *NodeIPAddressDAO) UpdateAddressNodeId(addressId int64, nodeId int64) error {
_, err := this.Query().
Pk(addressId).
Set("nodeId", nodeId).
Set("state", NodeIPAddressStateEnabled). // 恢复状态
Update()
return err
}
// 查找某个节点所有的IP地址
func (this *NodeIPAddressDAO) FindAllEnabledAddressesWithNode(nodeId int64) (result []*NodeIPAddress, err error) {
_, err = this.Query().
Attr("nodeId", nodeId).
State(NodeIPAddressStateEnabled).
Desc("order").
AscPk().
Slice(&result).
FindAll()
return
}

5
internal/db/models/node_ip_address_dao_test.go Normal file
View File

@@ -0,0 +1,5 @@
package models
import (
_ "github.com/go-sql-driver/mysql"
)

26
internal/db/models/node_ip_address_model.go Normal file
View File

@@ -0,0 +1,26 @@
package models
//
type NodeIPAddress struct {
Id uint32 `field:"id"` // ID
NodeId uint32 `field:"nodeId"` // 节点ID
Name string `field:"name"` // 名称
IP string `field:"ip"` // IP地址
Description string `field:"description"` // 描述
State uint8 `field:"state"` // 状态
Order uint32 `field:"order"` // 排序
}
type NodeIPAddressOperator struct {
Id interface{} // ID
NodeId interface{} // 节点ID
Name interface{} // 名称
IP interface{} // IP地址
Description interface{} // 描述
State interface{} // 状态
Order interface{} // 排序
}
func NewNodeIPAddressOperator() *NodeIPAddressOperator {
return &NodeIPAddressOperator{}
}

1
internal/db/models/node_ip_address_model_ext.go Normal file
View File

@@ -0,0 +1 @@
package models

4
internal/db/models/node_model.go
View File

@@ -15,6 +15,8 @@ type Node struct {
Status string `field:"status"` // 最新的状态
Version uint32 `field:"version"` // 当前版本号
LatestVersion uint32 `field:"latestVersion"` // 最后版本号
InstallDir string `field:"installDir"` // 安装目录
IsInstalled uint8 `field:"isInstalled"` // 是否已安装
State uint8 `field:"state"` // 状态
}
@@ -32,6 +34,8 @@ type NodeOperator struct {
Status interface{} // 最新的状态
Version interface{} // 当前版本号
LatestVersion interface{} // 最后版本号
InstallDir interface{} // 安装目录
IsInstalled interface{} // 是否已安装
State interface{} // 状态
}