fix: import cycle

pupilcc · Jul 30, 2024 · e715106 · e715106
1 parent 0a80a2a
commit e715106
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/domain/service/cert_service.go b/domain/service/cert_service.go
@@ -15,8 +15,6 @@ import (
 	"path/filepath"
 )
 
-var CertPath = "./data/cert"
-
 func ExistCert(domain string) bool {
 	repo := &repository.CertRepo{
 		Db: database.Init(),
@@ -30,7 +28,7 @@ func ExistCert(domain string) bool {
 }
 
 func CreateCert(domain string, code string) error {
-	err := os.MkdirAll(CertPath, 0755)
+	err := os.MkdirAll(acme.CertPath, 0755)
 	if err != nil {
 		return err
 	}
@@ -135,8 +133,8 @@ func Etag(filePath string) (string, error) {
 }
 
 func deleteFiles(code string) error {
-	certPath := filepath.Join(CertPath, code+".crt")
-	keyPath := filepath.Join(CertPath, code+".key")
+	certPath := filepath.Join(acme.CertPath, code+".crt")
+	keyPath := filepath.Join(acme.CertPath, code+".key")
 
 	filePaths := []string{certPath, keyPath}
 
@@ -162,14 +160,14 @@ func uploadFile(code string, certFile *multipart.FileHeader, keyFile *multipart.
 	}
 	defer keySrc.Close()
 
-	_ = os.MkdirAll(CertPath, 0755)
-	certDst, err := os.Create(filepath.Join(CertPath, code+".crt"))
+	_ = os.MkdirAll(acme.CertPath, 0755)
+	certDst, err := os.Create(filepath.Join(acme.CertPath, code+".crt"))
 	if err != nil {
 		return err
 	}
 	defer certDst.Close()
 
-	keyDst, err := os.Create(filepath.Join(CertPath, code+".key"))
+	keyDst, err := os.Create(filepath.Join(acme.CertPath, code+".key"))
 	if err != nil {
 		return err
 	}

diff --git a/infrastructure/acme/issue.go b/infrastructure/acme/issue.go
@@ -1,7 +1,6 @@
 package acme
 
 import (
-	"autossl/domain/service"
 	"fmt"
 	"go.uber.org/zap"
 	"os"
@@ -10,6 +9,8 @@ import (
 	"strings"
 )
 
+var CertPath = "./data/cert"
+
 func Issue(name string) error {
 	dns := os.Getenv("ACME_DNS")
 	alias := os.Getenv("ACME_ALIAS")
@@ -19,7 +20,7 @@ func Issue(name string) error {
 }
 
 func Install(name string, id string) error {
-	cmd := exec.Command(filepath.Join(usr.HomeDir, ".acme.sh/acme.sh"), "--install-cert", "-d", name, "--key-file", filepath.Join(service.CertPath, id+".key"), "--fullchain-file", filepath.Join(service.CertPath, id+".crt"))
+	cmd := exec.Command(filepath.Join(usr.HomeDir, ".acme.sh/acme.sh"), "--install-cert", "-d", name, "--key-file", filepath.Join(CertPath, id+".key"), "--fullchain-file", filepath.Join(CertPath, id+".crt"))
 	logger.Info("command", zap.String("Running command:", strings.Join(cmd.Args, " ")))
 	return execIssue(cmd)
 }