v1.4.1

2026-02-26 03:45:37 +08:00 · 2024-07-27 15:42:58 +08:00
parent 7279dc873f
commit d7d0c8fbfe
490 changed files with 2158 additions and 738 deletions
--- a/internal/web/actions/default/servers/certs/acme/create.go
+++ b/internal/web/actions/default/servers/certs/acme/create.go
@@ -1,13 +1,14 @@
 package acme

 import (
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
-	"strings"
 )

 type CreateAction struct {
@@ -119,6 +120,7 @@ func (this *CreateAction) RunPost(params struct {
 			Domains:       realDomains,
 			AutoRenew:     params.AutoRenew,
 			AuthURL:       params.AuthURL,
+			Async:         false,
 		})
 		if err != nil {
 			this.ErrorPage(err)
--- a/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go
+++ b/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go
@@ -2,13 +2,14 @@ package acme

 import (
 	"encoding/json"
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
-	"strings"
 )

 type UpdateTaskPopupAction struct {
--- a/internal/web/actions/default/servers/certs/acme/userOptions.go
+++ b/internal/web/actions/default/servers/certs/acme/userOptions.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package acme

--- a/internal/web/actions/default/servers/certs/certPopup.go
+++ b/internal/web/actions/default/servers/certs/certPopup.go
@@ -2,12 +2,13 @@ package certs

 import (
 	"encoding/json"
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
 )

 type CertPopupAction struct {
--- a/internal/web/actions/default/servers/certs/datajs.go
+++ b/internal/web/actions/default/servers/certs/datajs.go
@@ -2,6 +2,7 @@ package certs

 import (
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 )
--- a/internal/web/actions/default/servers/certs/delete_ext.go
+++ b/internal/web/actions/default/servers/certs/delete_ext.go
@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 //go:build !plus

 package certs
--- a/internal/web/actions/default/servers/certs/downloadCert.go
+++ b/internal/web/actions/default/servers/certs/downloadCert.go
@@ -2,11 +2,12 @@ package certs

 import (
 	"encoding/json"
+	"strconv"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
-	"strconv"
 )

 type DownloadCertAction struct {
--- a/internal/web/actions/default/servers/certs/downloadKey.go
+++ b/internal/web/actions/default/servers/certs/downloadKey.go
@@ -2,11 +2,12 @@ package certs

 import (
 	"encoding/json"
+	"strconv"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
-	"strconv"
 )

 type DownloadKeyAction struct {
--- a/internal/web/actions/default/servers/certs/downloadZip.go
+++ b/internal/web/actions/default/servers/certs/downloadZip.go
@@ -3,11 +3,12 @@ package certs
 import (
 	"archive/zip"
 	"encoding/json"
+	"strconv"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
-	"strconv"
 )

 type DownloadZipAction struct {
--- a/internal/web/actions/default/servers/certs/helper.go
+++ b/internal/web/actions/default/servers/certs/helper.go
@@ -1,6 +1,8 @@
 package certs

 import (
+	"net/http"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -8,7 +10,6 @@ import (
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
-	"net/http"
 )

 type Helper struct {
--- a/internal/web/actions/default/servers/certs/index.go
+++ b/internal/web/actions/default/servers/certs/index.go
@@ -2,12 +2,13 @@ package certs

 import (
 	"encoding/json"
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
 )

 type IndexAction struct {
--- a/internal/web/actions/default/servers/certs/ocsp/index.go
+++ b/internal/web/actions/default/servers/certs/ocsp/index.go
@@ -3,11 +3,12 @@
 package ocsp

 import (
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
 )

 type IndexAction struct {
--- a/internal/web/actions/default/servers/certs/selectPopup.go
+++ b/internal/web/actions/default/servers/certs/selectPopup.go
@@ -3,6 +3,9 @@ package certs
 import (
 	"encoding/json"
 	"errors"
+	"strings"
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -11,8 +14,6 @@ import (
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strings"
-	"time"
 )

 // SelectPopupAction 选择证书
--- a/internal/web/actions/default/servers/certs/updatePopup.go
+++ b/internal/web/actions/default/servers/certs/updatePopup.go
@@ -3,6 +3,7 @@ package certs
 import (
 	"context"
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
--- a/internal/web/actions/default/servers/certs/uploadBatchPopup.go
+++ b/internal/web/actions/default/servers/certs/uploadBatchPopup.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package certs

@@ -6,15 +6,16 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"io"
+	"mime/multipart"
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/types"
-	"io"
-	"mime/multipart"
-	"strings"
 )

 // UploadBatchPopupAction 批量上传证书
--- a/internal/web/actions/default/servers/certs/uploadBatchPopup_ext.go
+++ b/internal/web/actions/default/servers/certs/uploadBatchPopup_ext.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 //go:build !plus

 package certs
--- a/internal/web/actions/default/servers/certs/uploadPopup.go
+++ b/internal/web/actions/default/servers/certs/uploadPopup.go
@@ -3,6 +3,7 @@ package certs
 import (
 	"context"
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
--- a/internal/web/actions/default/servers/certs/viewCert.go
+++ b/internal/web/actions/default/servers/certs/viewCert.go
@@ -2,6 +2,7 @@ package certs

 import (
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
--- a/internal/web/actions/default/servers/certs/viewKey.go
+++ b/internal/web/actions/default/servers/certs/viewKey.go
@@ -2,6 +2,7 @@ package certs

 import (
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"