Bladeren bron

更新 utils 包路径

将 utils 包的导入路径从根目录更新为 src 目录下的 utils,以保持项目结构一致性。同时,修改了相关文件中的引用路径以匹配新的包位置。
SongZihuan 3 maanden geleden
bovenliggende
commit
2593f5955d
4 gewijzigde bestanden met toevoegingen van 10 en 10 verwijderingen
  1. 1 1
      src/certssl/applycert/write.go
  2. 9 9
      src/certssl/main.go
  3. 0 0
      src/utils/string.go
  4. 0 0
      src/utils/x509.go

+ 1 - 1
src/certssl/applycert/write.go

@@ -3,7 +3,7 @@ package applycert
 import (
 	"fmt"
 	"github.com/SongZihuan/Http-Demo/src/certssl/filename"
-	"github.com/SongZihuan/Http-Demo/utils"
+	"github.com/SongZihuan/Http-Demo/src/utils"
 	"github.com/go-acme/lego/v4/certificate"
 	"os"
 	"path"

+ 9 - 9
src/certssl/main.go

@@ -5,7 +5,7 @@ import (
 	"crypto/x509"
 	"fmt"
 	"github.com/SongZihuan/Http-Demo/src/certssl/applycert"
-	"github.com/SongZihuan/Http-Demo/utils"
+	utils2 "github.com/SongZihuan/Http-Demo/src/utils"
 	"time"
 )
 
@@ -14,16 +14,16 @@ func GetCertificateAndPrivateKey(basedir string, email string, httpsAddress stri
 		email = "no-reply@example.com"
 	}
 
-	if !utils.IsValidEmail(email) {
+	if !utils2.IsValidEmail(email) {
 		return nil, nil, fmt.Errorf("not a valid email")
 	}
 
-	if !utils.IsValidDomain(domain) {
+	if !utils2.IsValidDomain(domain) {
 		return nil, nil, fmt.Errorf("not a valid domain")
 	}
 
 	privateKey, cert, err := applycert.ReadLocalCertificateAndPrivateKey(basedir)
-	if err == nil && utils.CheckCertWithDomain(cert, domain) && utils.CheckCertWithTime(cert, 5*24*time.Hour) {
+	if err == nil && utils2.CheckCertWithDomain(cert, domain) && utils2.CheckCertWithTime(cert, 5*24*time.Hour) {
 		return privateKey, cert, nil
 	}
 
@@ -32,7 +32,7 @@ func GetCertificateAndPrivateKey(basedir string, email string, httpsAddress stri
 		return nil, nil, err
 	}
 
-	cert, err = utils.ReadCertificate(resource.Certificate)
+	cert, err = utils2.ReadCertificate(resource.Certificate)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -78,15 +78,15 @@ func watchCertificateAndPrivateKey(dir string, email string, httpsAddress string
 		email = "no-reply@example.com"
 	}
 
-	if !utils.IsValidEmail(email) {
+	if !utils2.IsValidEmail(email) {
 		return nil, nil, fmt.Errorf("not a valid email")
 	}
 
-	if !utils.IsValidDomain(domain) {
+	if !utils2.IsValidDomain(domain) {
 		return nil, nil, fmt.Errorf("not a valid domain")
 	}
 
-	if utils.CheckCertWithDomain(oldCert, domain) && utils.CheckCertWithTime(oldCert, 5*24*time.Hour) {
+	if utils2.CheckCertWithDomain(oldCert, domain) && utils2.CheckCertWithTime(oldCert, 5*24*time.Hour) {
 		return nil, nil, nil
 	}
 
@@ -95,7 +95,7 @@ func watchCertificateAndPrivateKey(dir string, email string, httpsAddress string
 		return nil, nil, err
 	}
 
-	cert, err := utils.ReadCertificate(resource.Certificate)
+	cert, err := utils2.ReadCertificate(resource.Certificate)
 	if err != nil {
 		return nil, nil, err
 	}

+ 0 - 0
utils/string.go → src/utils/string.go


+ 0 - 0
utils/x509.go → src/utils/x509.go