diff --git a/internal/web/actions/default/servers/certs/delete.go b/internal/web/actions/default/servers/certs/delete.go
index a13d031c..cd6d50eb 100644
--- a/internal/web/actions/default/servers/certs/delete.go
+++ b/internal/web/actions/default/servers/certs/delete.go
@@ -16,7 +16,7 @@ func (this *DeleteAction) RunPost(params struct {
// 创建日志
defer this.CreateLog(oplogs.LevelInfo, "删除SSL证书 %d", params.CertId)
- // 是否正在被使用
+ // 是否正在被服务使用
countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{SslCertId: params.CertId})
if err != nil {
this.ErrorPage(err)
@@ -26,6 +26,26 @@ func (this *DeleteAction) RunPost(params struct {
this.Fail("此证书正在被某些服务引用，请先修改服务后再删除。")
}
+ // 是否正在被API节点使用
+ countResp, err = this.RPC().APINodeRPC().CountAllEnabledAPINodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledAPINodesWithSSLCertIdRequest{SslCertId: params.CertId})
+ if err != nil {
+ this.ErrorPage(err)
+ return
+ }
+ if countResp.Count > 0 {
+ this.Fail("此证书正在被某些API节点引用，请先修改API节点后再删除")
+ }
+
+ // 是否正在被用户节点使用
+ countResp, err = this.RPC().UserNodeRPC().CountAllEnabledUserNodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledUserNodesWithSSLCertIdRequest{SslCertId: params.CertId})
+ if err != nil {
+ this.ErrorPage(err)
+ return
+ }
+ if countResp.Count > 0 {
+ this.Fail("此证书正在被某些用户节点引用，请先修改用户节点后再删除")
+ }
+
_, err = this.RPC().SSLCertRPC().DeleteSSLCert(this.AdminContext(), &pb.DeleteSSLCertRequest{SslCertId: params.CertId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/settings/user-nodes/delete.go b/internal/web/actions/default/settings/user-nodes/delete.go
index 2dfd49ca..88b6980d 100644
--- a/internal/web/actions/default/settings/user-nodes/delete.go
+++ b/internal/web/actions/default/settings/user-nodes/delete.go
@@ -15,7 +15,7 @@ func (this *DeleteAction) RunPost(params struct {
}) {
// TODO 检查权限
- _, err := this.RPC().UserNodeRPC().DeleteUserNode(this.AdminContext(), &pb.DeleteUserNodeRequest{NodeId: params.NodeId})
+ _, err := this.RPC().UserNodeRPC().DeleteUserNode(this.AdminContext(), &pb.DeleteUserNodeRequest{UserNodeId: params.NodeId})
if err != nil {
this.ErrorPage(err)
return
diff --git a/internal/web/actions/default/settings/user-nodes/index.go b/internal/web/actions/default/settings/user-nodes/index.go
index 0ea2467f..6473c4f2 100644
--- a/internal/web/actions/default/settings/user-nodes/index.go
+++ b/internal/web/actions/default/settings/user-nodes/index.go
@@ -46,7 +46,7 @@ func (this *IndexAction) RunGet(params struct{}) {
return
}
- for _, node := range nodesResp.Nodes {
+ for _, node := range nodesResp.UserNodes {
// 状态
status := &nodeconfigs.NodeStatus{}
if len(node.StatusJSON) > 0 {
diff --git a/internal/web/actions/default/settings/user-nodes/node/createPopup.go b/internal/web/actions/default/settings/user-nodes/node/createPopup.go
index 4ef4a04c..57bc8338 100644
--- a/internal/web/actions/default/settings/user-nodes/node/createPopup.go
+++ b/internal/web/actions/default/settings/user-nodes/node/createPopup.go
@@ -137,7 +137,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- defer this.CreateLog(oplogs.LevelInfo, "创建用户节点 %d", createResp.NodeId)
+ defer this.CreateLog(oplogs.LevelInfo, "创建用户节点 %d", createResp.UserNodeId)
this.Success()
}
diff --git a/internal/web/actions/default/settings/user-nodes/node/index.go b/internal/web/actions/default/settings/user-nodes/node/index.go
index ab79fce3..e2bcf07b 100644
--- a/internal/web/actions/default/settings/user-nodes/node/index.go
+++ b/internal/web/actions/default/settings/user-nodes/node/index.go
@@ -20,12 +20,12 @@ func (this *IndexAction) Init() {
func (this *IndexAction) RunGet(params struct {
NodeId int64
}) {
- nodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{NodeId: params.NodeId})
+ nodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{UserNodeId: params.NodeId})
if err != nil {
this.ErrorPage(err)
return
}
- node := nodeResp.Node
+ node := nodeResp.UserNode
if node == nil {
this.NotFound("userNode", params.NodeId)
return
diff --git a/internal/web/actions/default/settings/user-nodes/node/install.go b/internal/web/actions/default/settings/user-nodes/node/install.go
index 4ce8b8ce..695f58a8 100644
--- a/internal/web/actions/default/settings/user-nodes/node/install.go
+++ b/internal/web/actions/default/settings/user-nodes/node/install.go
@@ -19,12 +19,12 @@ func (this *InstallAction) RunGet(params struct {
NodeId int64
}) {
// 用户节点信息
- nodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{NodeId: params.NodeId})
+ nodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{UserNodeId: params.NodeId})
if err != nil {
this.ErrorPage(err)
return
}
- node := nodeResp.Node
+ node := nodeResp.UserNode
if node == nil {
this.NotFound("userNode", params.NodeId)
return
diff --git a/internal/web/actions/default/settings/user-nodes/node/logs.go b/internal/web/actions/default/settings/user-nodes/node/logs.go
index 5336075a..a8b6f677 100644
--- a/internal/web/actions/default/settings/user-nodes/node/logs.go
+++ b/internal/web/actions/default/settings/user-nodes/node/logs.go
@@ -31,12 +31,12 @@ func (this *LogsAction) RunGet(params struct {
this.Data["keyword"] = params.Keyword
this.Data["level"] = params.Level
- userNodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{NodeId: params.NodeId})
+ userNodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{UserNodeId: params.NodeId})
if err != nil {
this.ErrorPage(err)
return
}
- userNode := userNodeResp.Node
+ userNode := userNodeResp.UserNode
if userNode == nil {
this.NotFound("userNode", params.NodeId)
return
diff --git a/internal/web/actions/default/settings/user-nodes/node/update.go b/internal/web/actions/default/settings/user-nodes/node/update.go
index 8a2fea9e..4bbd6821 100644
--- a/internal/web/actions/default/settings/user-nodes/node/update.go
+++ b/internal/web/actions/default/settings/user-nodes/node/update.go
@@ -23,13 +23,13 @@ func (this *UpdateAction) RunGet(params struct {
NodeId int64
}) {
nodeResp, err := this.RPC().UserNodeRPC().FindEnabledUserNode(this.AdminContext(), &pb.FindEnabledUserNodeRequest{
- NodeId: params.NodeId,
+ UserNodeId: params.NodeId,
})
if err != nil {
this.ErrorPage(err)
return
}
- node := nodeResp.Node
+ node := nodeResp.UserNode
if node == nil {
this.WriteString("要操作的节点不存在")
return
@@ -184,8 +184,8 @@ func (this *UpdateAction) RunPost(params struct {
}
} else {
_, err = this.RPC().SSLPolicyRPC().UpdateSSLPolicy(this.AdminContext(), &pb.UpdateSSLPolicyRequest{
- SslPolicyId: sslPolicyId,
- SslCertsJSON: certRefsJSON,
+ SslPolicyId: sslPolicyId,
+ SslCertsJSON: certRefsJSON,
})
if err != nil {
this.ErrorPage(err)
@@ -220,7 +220,7 @@ func (this *UpdateAction) RunPost(params struct {
}
_, err = this.RPC().UserNodeRPC().UpdateUserNode(this.AdminContext(), &pb.UpdateUserNodeRequest{
- NodeId: params.NodeId,
+ UserNodeId: params.NodeId,
Name: params.Name,
Description: params.Description,
HttpJSON: httpJSON,
diff --git a/web/views/@default/settings/user-nodes/node/createPopup.html b/web/views/@default/settings/user-nodes/node/createPopup.html
index e1a1535f..a6b844f7 100644
--- a/web/views/@default/settings/user-nodes/node/createPopup.html
+++ b/web/views/@default/settings/user-nodes/node/createPopup.html
@@ -12,7 +12,7 @@
| 进程监听端口 * |
-
+
|
diff --git a/web/views/@default/settings/user-nodes/node/update.html b/web/views/@default/settings/user-nodes/node/update.html
index 59d5adcb..d63c0d59 100644
--- a/web/views/@default/settings/user-nodes/node/update.html
+++ b/web/views/@default/settings/user-nodes/node/update.html
@@ -15,7 +15,7 @@
| 进程监听端口 * |
-
+
|