TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-24 15:30:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化API命名

Browse Source
This commit is contained in:
刘祥超
2021-11-24 12:00:38 +08:00
parent f63c2d867d
commit 99fd015066
7 changed files with 120 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/const/const.go
View File

@@ -1,7 +1,7 @@
package teaconst package teaconst
const ( const (
Version = "0.3.5" Version = "0.3.5.2"
ProductName = "Edge API" ProductName = "Edge API"
ProcessName = "edge-api" ProcessName = "edge-api"
@@ -18,7 +18,7 @@ const (
// 其他节点版本号，用来检测是否有需要升级的节点 // 其他节点版本号，用来检测是否有需要升级的节点
NodeVersion = "0.3.5" NodeVersion = "0.3.5.2"
UserNodeVersion = "0.0.10" UserNodeVersion = "0.0.10"
AuthorityNodeVersion = "0.0.2" AuthorityNodeVersion = "0.0.2"
MonitorNodeVersion = "0.0.3" MonitorNodeVersion = "0.0.3"

16
internal/db/models/http_web_dao.go
View File

@@ -419,6 +419,9 @@ func (this *HTTPWebDAO) ComposeWebConfig(tx *dbs.Tx, webId int64, cacheMap *util
config.RemoteAddr = remoteAddrConfig config.RemoteAddr = remoteAddrConfig
} }
// mergeSlashes
config.MergeSlashes = web.MergeSlashes == 1
if cacheMap != nil { if cacheMap != nil {
cacheMap.Put(cacheKey, config) cacheMap.Put(cacheKey, config)
} }
@@ -1037,6 +1040,8 @@ func (this *HTTPWebDAO) UpdateWebHostRedirects(tx *dbs.Tx, webId int64, hostRedi
return this.NotifyUpdate(tx, webId) return this.NotifyUpdate(tx, webId)
} }
// 通用设置
// FindWebHostRedirects 查找主机跳转 // FindWebHostRedirects 查找主机跳转
func (this *HTTPWebDAO) FindWebHostRedirects(tx *dbs.Tx, webId int64) ([]byte, error) { func (this *HTTPWebDAO) FindWebHostRedirects(tx *dbs.Tx, webId int64) ([]byte, error) {
col, err := this.Query(tx). col, err := this.Query(tx).
@@ -1049,6 +1054,17 @@ func (this *HTTPWebDAO) FindWebHostRedirects(tx *dbs.Tx, webId int64) ([]byte, e
return []byte(col), nil return []byte(col), nil
} }
// UpdateWebCommon 修改通用设置
func (this *HTTPWebDAO) UpdateWebCommon(tx *dbs.Tx, webId int64, mergeSlashes bool) error {
if webId <= 0 {
return errors.New("invalid webId")
}
var op = NewHTTPWebOperator()
op.Id = webId
op.MergeSlashes = mergeSlashes
return this.Save(tx, op)
}
// NotifyUpdate 通知更新 // NotifyUpdate 通知更新
func (this *HTTPWebDAO) NotifyUpdate(tx *dbs.Tx, webId int64) error { func (this *HTTPWebDAO) NotifyUpdate(tx *dbs.Tx, webId int64) error {
// server // server

2
internal/db/models/http_web_model.go
View File

@@ -32,6 +32,7 @@ type HTTPWeb struct {
Auth string `field:"auth"` // 认证策略配置 Auth string `field:"auth"` // 认证策略配置
Webp string `field:"webp"` // WebP配置 Webp string `field:"webp"` // WebP配置
RemoteAddr string `field:"remoteAddr"` // 客户端IP配置 RemoteAddr string `field:"remoteAddr"` // 客户端IP配置
MergeSlashes uint8 `field:"mergeSlashes"` // 是否合并路径中的斜杠
} }
type HTTPWebOperator struct { type HTTPWebOperator struct {
@@ -65,6 +66,7 @@ type HTTPWebOperator struct {
Auth interface{} // 认证策略配置 Auth interface{} // 认证策略配置
Webp interface{} // WebP配置 Webp interface{} // WebP配置
RemoteAddr interface{} // 客户端IP配置 RemoteAddr interface{} // 客户端IP配置
MergeSlashes interface{} // 是否合并路径中的斜杠
} }
func NewHTTPWebOperator() *HTTPWebOperator { func NewHTTPWebOperator() *HTTPWebOperator {

24
internal/rpc/services/service_authority_node.go
View File

@@ -27,7 +27,7 @@ func (this *AuthorityNodeService) CreateAuthorityNode(ctx context.Context, req *
return nil, err return nil, err
} }
return &pb.CreateAuthorityNodeResponse{NodeId: nodeId}, nil return &pb.CreateAuthorityNodeResponse{AuthorityNodeId: nodeId}, nil
} }
// UpdateAuthorityNode 修改认证节点 // UpdateAuthorityNode 修改认证节点
@@ -39,7 +39,7 @@ func (this *AuthorityNodeService) UpdateAuthorityNode(ctx context.Context, req *
tx := this.NullTx() tx := this.NullTx()
err = authority.SharedAuthorityNodeDAO.UpdateAuthorityNode(tx, req.NodeId, req.Name, req.Description, req.IsOn) err = authority.SharedAuthorityNodeDAO.UpdateAuthorityNode(tx, req.AuthorityNodeId, req.Name, req.Description, req.IsOn)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -56,7 +56,7 @@ func (this *AuthorityNodeService) DeleteAuthorityNode(ctx context.Context, req *
tx := this.NullTx() tx := this.NullTx()
err = authority.SharedAuthorityNodeDAO.DisableAuthorityNode(tx, req.NodeId) err = authority.SharedAuthorityNodeDAO.DisableAuthorityNode(tx, req.AuthorityNodeId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -90,7 +90,7 @@ func (this *AuthorityNodeService) FindAllEnabledAuthorityNodes(ctx context.Conte
}) })
} }
return &pb.FindAllEnabledAuthorityNodesResponse{Nodes: result}, nil return &pb.FindAllEnabledAuthorityNodesResponse{AuthorityNodes: result}, nil
} }
// CountAllEnabledAuthorityNodes 计算认证节点数量 // CountAllEnabledAuthorityNodes 计算认证节点数量
@@ -137,7 +137,7 @@ func (this *AuthorityNodeService) ListEnabledAuthorityNodes(ctx context.Context,
}) })
} }
return &pb.ListEnabledAuthorityNodesResponse{Nodes: result}, nil return &pb.ListEnabledAuthorityNodesResponse{AuthorityNodes: result}, nil
} }
// FindEnabledAuthorityNode 根据ID查找节点 // FindEnabledAuthorityNode 根据ID查找节点
@@ -149,13 +149,13 @@ func (this *AuthorityNodeService) FindEnabledAuthorityNode(ctx context.Context,
tx := this.NullTx() tx := this.NullTx()
node, err := authority.SharedAuthorityNodeDAO.FindEnabledAuthorityNode(tx, req.NodeId) node, err := authority.SharedAuthorityNodeDAO.FindEnabledAuthorityNode(tx, req.AuthorityNodeId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if node == nil { if node == nil {
return &pb.FindEnabledAuthorityNodeResponse{Node: nil}, nil return &pb.FindEnabledAuthorityNodeResponse{AuthorityNode: nil}, nil
} }
result := &pb.AuthorityNode{ result := &pb.AuthorityNode{
@@ -166,7 +166,7 @@ func (this *AuthorityNodeService) FindEnabledAuthorityNode(ctx context.Context,
Name: node.Name, Name: node.Name,
Description: node.Description, Description: node.Description,
} }
return &pb.FindEnabledAuthorityNodeResponse{Node: result}, nil return &pb.FindEnabledAuthorityNodeResponse{AuthorityNode: result}, nil
} }
// FindCurrentAuthorityNode 获取当前认证节点的版本 // FindCurrentAuthorityNode 获取当前认证节点的版本
@@ -193,7 +193,7 @@ func (this *AuthorityNodeService) FindCurrentAuthorityNode(ctx context.Context,
} }
if node == nil { if node == nil {
return &pb.FindCurrentAuthorityNodeResponse{Node: nil}, nil return &pb.FindCurrentAuthorityNodeResponse{AuthorityNode: nil}, nil
} }
result := &pb.AuthorityNode{ result := &pb.AuthorityNode{
@@ -204,7 +204,7 @@ func (this *AuthorityNodeService) FindCurrentAuthorityNode(ctx context.Context,
Name: node.Name, Name: node.Name,
Description: node.Description, Description: node.Description,
} }
return &pb.FindCurrentAuthorityNodeResponse{Node: result}, nil return &pb.FindCurrentAuthorityNodeResponse{AuthorityNode: result}, nil
} }
// UpdateAuthorityNodeStatus 更新节点状态 // UpdateAuthorityNodeStatus 更新节点状态
@@ -215,8 +215,8 @@ func (this *AuthorityNodeService) UpdateAuthorityNodeStatus(ctx context.Context,
return nil, err return nil, err
} }
if req.NodeId > 0 { if req.AuthorityNodeId > 0 {
nodeId = req.NodeId nodeId = req.AuthorityNodeId
} }
if nodeId <= 0 { if nodeId <= 0 {

125
internal/rpc/services/service_http_web.go
View File

@@ -29,7 +29,7 @@ func (this *HTTPWebService) CreateHTTPWeb(ctx context.Context, req *pb.CreateHTT
return nil, err return nil, err
} }
return &pb.CreateHTTPWebResponse{WebId: webId}, nil return &pb.CreateHTTPWebResponse{HttpWebId: webId}, nil
} }
// FindEnabledHTTPWeb 查找Web配置 // FindEnabledHTTPWeb 查找Web配置
@@ -42,7 +42,7 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -50,19 +50,19 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find
tx := this.NullTx() tx := this.NullTx()
web, err := models.SharedHTTPWebDAO.FindEnabledHTTPWeb(tx, req.WebId) web, err := models.SharedHTTPWebDAO.FindEnabledHTTPWeb(tx, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if web == nil { if web == nil {
return &pb.FindEnabledHTTPWebResponse{Web: nil}, nil return &pb.FindEnabledHTTPWebResponse{HttpWeb: nil}, nil
} }
result := &pb.HTTPWeb{} result := &pb.HTTPWeb{}
result.Id = int64(web.Id) result.Id = int64(web.Id)
result.IsOn = web.IsOn == 1 result.IsOn = web.IsOn == 1
return &pb.FindEnabledHTTPWebResponse{Web: result}, nil return &pb.FindEnabledHTTPWebResponse{HttpWeb: result}, nil
} }
// FindEnabledHTTPWebConfig 查找Web配置 // FindEnabledHTTPWebConfig 查找Web配置
@@ -75,7 +75,7 @@ func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *p
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -83,7 +83,7 @@ func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *p
tx := this.NullTx() tx := this.NullTx()
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, req.WebId, nil) config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, req.HttpWebId, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -92,7 +92,7 @@ func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *p
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &pb.FindEnabledHTTPWebConfigResponse{WebJSON: configJSON}, nil return &pb.FindEnabledHTTPWebConfigResponse{HttpWebJSON: configJSON}, nil
} }
// UpdateHTTPWeb 修改Web配置 // UpdateHTTPWeb 修改Web配置
@@ -105,7 +105,7 @@ func (this *HTTPWebService) UpdateHTTPWeb(ctx context.Context, req *pb.UpdateHTT
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -113,7 +113,7 @@ func (this *HTTPWebService) UpdateHTTPWeb(ctx context.Context, req *pb.UpdateHTT
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWeb(tx, req.WebId, req.RootJSON) err = models.SharedHTTPWebDAO.UpdateWeb(tx, req.HttpWebId, req.RootJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -131,7 +131,7 @@ func (this *HTTPWebService) UpdateHTTPWebCompression(ctx context.Context, req *p
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -139,7 +139,7 @@ func (this *HTTPWebService) UpdateHTTPWebCompression(ctx context.Context, req *p
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebCompression(tx, req.WebId, req.CompressionJSON) err = models.SharedHTTPWebDAO.UpdateWebCompression(tx, req.HttpWebId, req.CompressionJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -157,7 +157,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebP(ctx context.Context, req *pb.Updat
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -165,7 +165,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebP(ctx context.Context, req *pb.Updat
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebWebP(tx, req.WebId, req.WebpJSON) err = models.SharedHTTPWebDAO.UpdateWebWebP(tx, req.HttpWebId, req.WebpJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -183,14 +183,14 @@ func (this *HTTPWebService) UpdateHTTPWebRemoteAddr(ctx context.Context, req *pb
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
var tx = this.NullTx() var tx = this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebRemoteAddr(tx, req.WebId, req.RemoteAddrJSON) err = models.SharedHTTPWebDAO.UpdateWebRemoteAddr(tx, req.HttpWebId, req.RemoteAddrJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -208,7 +208,7 @@ func (this *HTTPWebService) UpdateHTTPWebCharset(ctx context.Context, req *pb.Up
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -216,7 +216,7 @@ func (this *HTTPWebService) UpdateHTTPWebCharset(ctx context.Context, req *pb.Up
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebCharset(tx, req.WebId, req.CharsetJSON) err = models.SharedHTTPWebDAO.UpdateWebCharset(tx, req.HttpWebId, req.CharsetJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -233,7 +233,7 @@ func (this *HTTPWebService) UpdateHTTPWebRequestHeader(ctx context.Context, req
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -241,7 +241,7 @@ func (this *HTTPWebService) UpdateHTTPWebRequestHeader(ctx context.Context, req
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebRequestHeaderPolicy(tx, req.WebId, req.HeaderJSON) err = models.SharedHTTPWebDAO.UpdateWebRequestHeaderPolicy(tx, req.HttpWebId, req.HeaderJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -259,7 +259,7 @@ func (this *HTTPWebService) UpdateHTTPWebResponseHeader(ctx context.Context, req
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -267,7 +267,7 @@ func (this *HTTPWebService) UpdateHTTPWebResponseHeader(ctx context.Context, req
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebResponseHeaderPolicy(tx, req.WebId, req.HeaderJSON) err = models.SharedHTTPWebDAO.UpdateWebResponseHeaderPolicy(tx, req.HttpWebId, req.HeaderJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -285,7 +285,7 @@ func (this *HTTPWebService) UpdateHTTPWebShutdown(ctx context.Context, req *pb.U
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -293,7 +293,7 @@ func (this *HTTPWebService) UpdateHTTPWebShutdown(ctx context.Context, req *pb.U
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebShutdown(tx, req.WebId, req.ShutdownJSON) err = models.SharedHTTPWebDAO.UpdateWebShutdown(tx, req.HttpWebId, req.ShutdownJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -310,7 +310,7 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -318,7 +318,7 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebPages(tx, req.WebId, req.PagesJSON) err = models.SharedHTTPWebDAO.UpdateWebPages(tx, req.HttpWebId, req.PagesJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -335,7 +335,7 @@ func (this *HTTPWebService) UpdateHTTPWebAccessLog(ctx context.Context, req *pb.
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -343,7 +343,7 @@ func (this *HTTPWebService) UpdateHTTPWebAccessLog(ctx context.Context, req *pb.
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebAccessLogConfig(tx, req.WebId, req.AccessLogJSON) err = models.SharedHTTPWebDAO.UpdateWebAccessLogConfig(tx, req.HttpWebId, req.AccessLogJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -360,7 +360,7 @@ func (this *HTTPWebService) UpdateHTTPWebStat(ctx context.Context, req *pb.Updat
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -368,7 +368,7 @@ func (this *HTTPWebService) UpdateHTTPWebStat(ctx context.Context, req *pb.Updat
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebStat(tx, req.WebId, req.StatJSON) err = models.SharedHTTPWebDAO.UpdateWebStat(tx, req.HttpWebId, req.StatJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -385,7 +385,7 @@ func (this *HTTPWebService) UpdateHTTPWebCache(ctx context.Context, req *pb.Upda
if userId > 0 { if userId > 0 {
// 检查权限 // 检查权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -393,7 +393,7 @@ func (this *HTTPWebService) UpdateHTTPWebCache(ctx context.Context, req *pb.Upda
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebCache(tx, req.WebId, req.CacheJSON) err = models.SharedHTTPWebDAO.UpdateWebCache(tx, req.HttpWebId, req.CacheJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -411,7 +411,7 @@ func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.U
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -419,7 +419,7 @@ func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.U
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebFirewall(tx, req.WebId, req.FirewallJSON) err = models.SharedHTTPWebDAO.UpdateWebFirewall(tx, req.HttpWebId, req.FirewallJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -437,7 +437,7 @@ func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.
if userId > 0 { if userId > 0 {
// 检查用户权限 // 检查用户权限
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -445,7 +445,7 @@ func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebLocations(tx, req.WebId, req.LocationsJSON) err = models.SharedHTTPWebDAO.UpdateWebLocations(tx, req.HttpWebId, req.LocationsJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -463,7 +463,7 @@ func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, re
// 检查权限 // 检查权限
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -471,7 +471,7 @@ func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, re
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebRedirectToHTTPS(tx, req.WebId, req.RedirectToHTTPSJSON) err = models.SharedHTTPWebDAO.UpdateWebRedirectToHTTPS(tx, req.HttpWebId, req.RedirectToHTTPSJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -487,7 +487,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebsocket(ctx context.Context, req *pb.
} }
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -495,7 +495,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebsocket(ctx context.Context, req *pb.
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebsocket(tx, req.WebId, req.WebsocketJSON) err = models.SharedHTTPWebDAO.UpdateWebsocket(tx, req.HttpWebId, req.WebsocketJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -511,7 +511,7 @@ func (this *HTTPWebService) UpdateHTTPWebFastcgi(ctx context.Context, req *pb.Up
} }
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -519,7 +519,7 @@ func (this *HTTPWebService) UpdateHTTPWebFastcgi(ctx context.Context, req *pb.Up
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebFastcgi(tx, req.WebId, req.FastcgiJSON) err = models.SharedHTTPWebDAO.UpdateWebFastcgi(tx, req.HttpWebId, req.FastcgiJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -535,7 +535,7 @@ func (this *HTTPWebService) UpdateHTTPWebRewriteRules(ctx context.Context, req *
} }
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -543,7 +543,7 @@ func (this *HTTPWebService) UpdateHTTPWebRewriteRules(ctx context.Context, req *
tx := this.NullTx() tx := this.NullTx()
err = models.SharedHTTPWebDAO.UpdateWebRewriteRules(tx, req.WebId, req.RewriteRulesJSON) err = models.SharedHTTPWebDAO.UpdateWebRewriteRules(tx, req.HttpWebId, req.RewriteRulesJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -559,7 +559,7 @@ func (this *HTTPWebService) UpdateHTTPWebHostRedirects(ctx context.Context, req
} }
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -583,7 +583,7 @@ func (this *HTTPWebService) UpdateHTTPWebHostRedirects(ctx context.Context, req
} }
var tx *dbs.Tx var tx *dbs.Tx
err = models.SharedHTTPWebDAO.UpdateWebHostRedirects(tx, req.WebId, hostRedirects) err = models.SharedHTTPWebDAO.UpdateWebHostRedirects(tx, req.HttpWebId, hostRedirects)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -599,14 +599,14 @@ func (this *HTTPWebService) FindHTTPWebHostRedirects(ctx context.Context, req *p
} }
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
var tx *dbs.Tx var tx *dbs.Tx
redirectsJSON, err := models.SharedHTTPWebDAO.FindWebHostRedirects(tx, req.WebId) redirectsJSON, err := models.SharedHTTPWebDAO.FindWebHostRedirects(tx, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -622,16 +622,41 @@ func (this *HTTPWebService) UpdateHTTPWebAuth(ctx context.Context, req *pb.Updat
} }
if userId > 0 { if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.WebId) err = models.SharedHTTPWebDAO.CheckUserWeb(nil, userId, req.HttpWebId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
var tx *dbs.Tx var tx *dbs.Tx
err = models.SharedHTTPWebDAO.UpdateWebAuth(tx, req.WebId, req.AuthJSON) err = models.SharedHTTPWebDAO.UpdateWebAuth(tx, req.HttpWebId, req.AuthJSON)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return this.Success() return this.Success()
} }
// UpdateHTTPWebCommon 更改通用设置
func (this *HTTPWebService) UpdateHTTPWebCommon(ctx context.Context, req *pb.UpdateHTTPWebCommonRequest) (*pb.RPCSuccess, error) {
// 校验请求
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
if userId > 0 {
err = models.SharedHTTPWebDAO.CheckUserWeb(tx, userId, req.HttpWebId)
if err != nil {
return nil, err
}
}
err = models.SharedHTTPWebDAO.UpdateWebCommon(tx, req.HttpWebId, req.MergeSlashes)
if err != nil {
return nil, err
}
return this.Success()
}

24
internal/rpc/services/service_monitor_node.go
View File

@@ -27,7 +27,7 @@ func (this *MonitorNodeService) CreateMonitorNode(ctx context.Context, req *pb.C
return nil, err return nil, err
} }
return &pb.CreateMonitorNodeResponse{NodeId: nodeId}, nil return &pb.CreateMonitorNodeResponse{MonitorNodeId: nodeId}, nil
} }
// UpdateMonitorNode 修改监控节点 // UpdateMonitorNode 修改监控节点
@@ -39,7 +39,7 @@ func (this *MonitorNodeService) UpdateMonitorNode(ctx context.Context, req *pb.U
tx := this.NullTx() tx := this.NullTx()
err = models.SharedMonitorNodeDAO.UpdateMonitorNode(tx, req.NodeId, req.Name, req.Description, req.IsOn) err = models.SharedMonitorNodeDAO.UpdateMonitorNode(tx, req.MonitorNodeId, req.Name, req.Description, req.IsOn)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -56,7 +56,7 @@ func (this *MonitorNodeService) DeleteMonitorNode(ctx context.Context, req *pb.D
tx := this.NullTx() tx := this.NullTx()
err = models.SharedMonitorNodeDAO.DisableMonitorNode(tx, req.NodeId) err = models.SharedMonitorNodeDAO.DisableMonitorNode(tx, req.MonitorNodeId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -90,7 +90,7 @@ func (this *MonitorNodeService) FindAllEnabledMonitorNodes(ctx context.Context,
}) })
} }
return &pb.FindAllEnabledMonitorNodesResponse{Nodes: result}, nil return &pb.FindAllEnabledMonitorNodesResponse{MonitorNodes: result}, nil
} }
// CountAllEnabledMonitorNodes 计算监控节点数量 // CountAllEnabledMonitorNodes 计算监控节点数量
@@ -137,7 +137,7 @@ func (this *MonitorNodeService) ListEnabledMonitorNodes(ctx context.Context, req
}) })
} }
return &pb.ListEnabledMonitorNodesResponse{Nodes: result}, nil return &pb.ListEnabledMonitorNodesResponse{MonitorNodes: result}, nil
} }
// FindEnabledMonitorNode 根据ID查找节点 // FindEnabledMonitorNode 根据ID查找节点
@@ -149,13 +149,13 @@ func (this *MonitorNodeService) FindEnabledMonitorNode(ctx context.Context, req
tx := this.NullTx() tx := this.NullTx()
node, err := models.SharedMonitorNodeDAO.FindEnabledMonitorNode(tx, req.NodeId) node, err := models.SharedMonitorNodeDAO.FindEnabledMonitorNode(tx, req.MonitorNodeId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if node == nil { if node == nil {
return &pb.FindEnabledMonitorNodeResponse{Node: nil}, nil return &pb.FindEnabledMonitorNodeResponse{MonitorNode: nil}, nil
} }
result := &pb.MonitorNode{ result := &pb.MonitorNode{
@@ -166,7 +166,7 @@ func (this *MonitorNodeService) FindEnabledMonitorNode(ctx context.Context, req
Name: node.Name, Name: node.Name,
Description: node.Description, Description: node.Description,
} }
return &pb.FindEnabledMonitorNodeResponse{Node: result}, nil return &pb.FindEnabledMonitorNodeResponse{MonitorNode: result}, nil
} }
// FindCurrentMonitorNode 获取当前监控节点的版本 // FindCurrentMonitorNode 获取当前监控节点的版本
@@ -193,7 +193,7 @@ func (this *MonitorNodeService) FindCurrentMonitorNode(ctx context.Context, req
} }
if node == nil { if node == nil {
return &pb.FindCurrentMonitorNodeResponse{Node: nil}, nil return &pb.FindCurrentMonitorNodeResponse{MonitorNode: nil}, nil
} }
result := &pb.MonitorNode{ result := &pb.MonitorNode{
@@ -204,7 +204,7 @@ func (this *MonitorNodeService) FindCurrentMonitorNode(ctx context.Context, req
Name: node.Name, Name: node.Name,
Description: node.Description, Description: node.Description,
} }
return &pb.FindCurrentMonitorNodeResponse{Node: result}, nil return &pb.FindCurrentMonitorNodeResponse{MonitorNode: result}, nil
} }
// UpdateMonitorNodeStatus 更新节点状态 // UpdateMonitorNodeStatus 更新节点状态
@@ -215,8 +215,8 @@ func (this *MonitorNodeService) UpdateMonitorNodeStatus(ctx context.Context, req
return nil, err return nil, err
} }
if req.NodeId > 0 { if req.MonitorNodeId > 0 {
nodeId = req.NodeId nodeId = req.MonitorNodeId
} }
if nodeId <= 0 { if nodeId <= 0 {

2
internal/setup/sql.go
View File

File diff suppressed because one or more lines are too long