TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2026-04-17 08:35:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码/创建服务的时候可以保存SSL证书信息

Browse Source
This commit is contained in:
GoEdgeLab
2020-12-18 21:18:35 +08:00
parent a208cbaa41
commit 0b8fd77f54
31 changed files with 212 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/web/actions/default/settings/server/updateHTTPSPopup.go
View File

@@ -104,18 +104,18 @@ func (this *UpdateHTTPSPopupAction) RunPost(params struct {
// 保存证书到本地
if len(certIds) > 0 && certIds[0] != 0 {
certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{
CertId: certIds[0],
SslCertId: certIds[0],
})
if err != nil {
this.ErrorPage(err)
return
}
if len(certResp.CertJSON) == 0 {
if len(certResp.SslCertJSON) == 0 {
this.Fail("选择的证书已失效，请换一个")
}
certConfig := &sslconfigs.SSLCertConfig{}
err = json.Unmarshal(certResp.CertJSON, certConfig)
err = json.Unmarshal(certResp.SslCertJSON, certConfig)
if err != nil {
this.ErrorPage(err)
return

2
internal/web/actions/default/settings/user-nodes/node/createPopup.go
View File

@@ -88,7 +88,7 @@ func (this *CreatePopupAction) RunPost(params struct {
// 创建策略
if len(certIds) > 0 {
sslPolicyCreateResp, err := this.RPC().SSLPolicyRPC().CreateSSLPolicy(this.AdminContext(), &pb.CreateSSLPolicyRequest{
CertsJSON: certRefsJSON,
SslCertsJSON: certRefsJSON,
})
if err != nil {
this.ErrorPage(err)

4
internal/web/actions/default/settings/user-nodes/node/update.go
View File

@@ -174,7 +174,7 @@ func (this *UpdateAction) RunPost(params struct {
if sslPolicyId == 0 {
if len(certIds) > 0 {
sslPolicyCreateResp, err := this.RPC().SSLPolicyRPC().CreateSSLPolicy(this.AdminContext(), &pb.CreateSSLPolicyRequest{
CertsJSON: certRefsJSON,
SslCertsJSON: certRefsJSON,
})
if err != nil {
this.ErrorPage(err)
@@ -185,7 +185,7 @@ func (this *UpdateAction) RunPost(params struct {
} else {
_, err = this.RPC().SSLPolicyRPC().UpdateSSLPolicy(this.AdminContext(), &pb.UpdateSSLPolicyRequest{
SslPolicyId: sslPolicyId,
CertsJSON: certRefsJSON,
SslCertsJSON: certRefsJSON,
})
if err != nil {
this.ErrorPage(err)