feat: respone cert issue error

pupilcc · Jan 9, 2024 · 4e7a9d3 · 4e7a9d3
1 parent 9482002
commit 4e7a9d3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/middleware/acme.go b/middleware/acme.go
@@ -42,7 +42,7 @@ func email() {
 	}
 }
 
-func Issue(name string) {
+func Issue(name string) error {
 	logger := GetLogger()
 	dns := os.Getenv("ACME_DNS")
 	alias := os.Getenv("ACME_ALIAS")
@@ -53,9 +53,10 @@ func Issue(name string) {
 		logger.Error("Running command failed", zap.String("error:", err.Error()))
 	}
 	fmt.Printf(string(output))
+	return err
 }
 
-func Install(name string, id string) {
+func Install(name string, id string) error {
 	logger := GetLogger()
 
 	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"))
@@ -65,4 +66,5 @@ func Install(name string, id string) {
 		logger.Error("Running command failed", zap.String("error:", err.Error()))
 	}
 	fmt.Printf(string(output))
+	return err
 }
diff --git a/web/ssl.go b/web/ssl.go
@@ -97,9 +97,19 @@ func generate(c echo.Context) error {
 		fmt.Println("错误:", err)
 	}
 
-	middleware.Issue(certCommand.Domain)
-	middleware.Install(certCommand.Domain, id)
+	err = middleware.Issue(certCommand.Domain)
+	if err != nil {
+		return err
+	}
+
+	err = middleware.Install(certCommand.Domain, id)
+	if err != nil {
+		return err
+	}
 	service.SaveUuid(certCommand.Domain, id)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }