修改工作流主方法，修改证书申请

zhangch-dev · zhangch-dev · commit 6a2d3f98cdae · 2025-06-20T12:02:58.000+08:00
diff --git a/backend/app/api/acme_account.go b/backend/app/api/acme_account.go
@@ -125,3 +125,13 @@ func GetAccountList(c *gin.Context) {
 	}
 	public.SuccessData(c, accounts, total)
 }
+
+func GetCaList(c *gin.Context) {
+	cas, total, err := apply.GetCaList()
+	if err != nil {
+		public.FailMsg(c, err.Error())
+		return
+	}
+	public.SuccessData(c, cas, total)
+
+}
diff --git a/backend/internal/cert/apply/account.go b/backend/internal/cert/apply/account.go
@@ -228,3 +228,34 @@ func GetAccountList(search, ca string, p, limit int64) ([]map[string]interface{}
 
 	return data, int(count), nil
 }
+
+func GetCaList() ([]string, int, error) {
+	db, err := GetSqlite()
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to get sqlite: %w", err)
+	}
+	data, err := db.Field([]string{"type"}).GroupBy("type").Select()
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to get CA list: %w", err)
+	}
+	caList := []string{"letsencrypt", "buypass", "zerossl"}
+	for i := range data {
+		if data[i]["type"] == "Let's Encrypt" {
+			data[i]["type"] = "letsencrypt"
+		}
+		if !containsString(caList, data[i]["type"].(string)) {
+			caList = append(caList, data[i]["type"].(string))
+		}
+	}
+	count := len(caList)
+	return caList, count, nil
+}
+
+func containsString(slice []string, target string) bool {
+	for _, v := range slice {
+		if v == target {
+			return true
+		}
+	}
+	return false
+}
diff --git a/backend/internal/cert/apply/apply.go b/backend/internal/cert/apply/apply.go
@@ -343,8 +343,15 @@ func GetAcmeClient(email, algorithm, eabId, ca string, httpClient *http.Client,
 				}
 			}
 		}
-		var reg *registration.Resource
+		var (
+			reg              *registration.Resource
+			Kid, HmacEncoded string
+		)
 		if eabData != nil {
+			Kid = eabData["Kid"].(string)
+			HmacEncoded = eabData["HmacEncoded"].(string)
+		}
+		if Kid != "" && HmacEncoded != "" {
 			Kid := eabData["Kid"].(string)
 			HmacEncoded := eabData["HmacEncoded"].(string)
 			reg, err = client.Registration.RegisterWithExternalAccountBinding(registration.RegisterEABOptions{
diff --git a/backend/internal/cert/deploy/plugin/deploy.go b/backend/internal/cert/deploy/plugin/deploy.go
@@ -83,10 +83,10 @@ func Deploy(cfg map[string]any, logger *public.Logger) error {
 	// 调用插件
 	logger.Debug(fmt.Sprintf("调用插件%s:%s", pluginName, action))
 
-	rep, err := CallPlugin(pluginName, action, pluginConfig, logger)
+	_, err = CallPlugin(pluginName, action, pluginConfig, logger)
 	if err != nil {
 		return fmt.Errorf("调用插件失败：%v", err)
 	}
-	fmt.Println(rep)
+	//fmt.Println(rep)
 	return err
 }
diff --git a/backend/internal/workflow/workflow.go b/backend/internal/workflow/workflow.go
@@ -286,6 +286,10 @@ func RunNode(node *WorkflowNode, ctx *ExecutionContext) error {
 	}
 
 	if node.ChildNode != nil {
+		fromNodeData, ok := ctx.GetOutput(node.Id)
+		if ok && fromNodeData != nil && node.ChildNode.Config["fromNodeData"] == nil {
+			node.ChildNode.Config["fromNodeData"] = fromNodeData
+		}
 		return RunNode(node.ChildNode, ctx)
 	}
 	return nil
diff --git a/backend/route/route.go b/backend/route/route.go
@@ -60,6 +60,7 @@ func Register(r *gin.Engine) {
 	acmeAccount := v1.Group("/acme_account")
 	{
 		acmeAccount.POST("/get_list", api.GetAccountList)
+		acmeAccount.POST("/get_ca_list", api.GetCaList)
 		acmeAccount.POST("/add_account", api.AddAccount)
 		acmeAccount.POST("/del_account", api.DelAccount)
 		acmeAccount.POST("/upd_account", api.UpdateAccount)

Original file line number	Diff line number	Diff line change
`@@ -125,3 +125,13 @@ func GetAccountList(c *gin.Context) {`
`125`	`125`	`}`
`126`	`126`	`public.SuccessData(c, accounts, total)`
`127`	`127`	`}`
	`128`	`+`
	`129`	`+func GetCaList(c *gin.Context) {`
	`130`	`+ cas, total, err := apply.GetCaList()`
	`131`	`+ if err != nil {`
	`132`	`+ public.FailMsg(c, err.Error())`
	`133`	`+ return`
	`134`	`+ }`
	`135`	`+ public.SuccessData(c, cas, total)`
	`136`	`+`
	`137`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -343,8 +343,15 @@ func GetAcmeClient(email, algorithm, eabId, ca string, httpClient *http.Client,`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`	`}`
`346`		`- var reg *registration.Resource`
	`346`	`+ var (`
	`347`	`+ reg *registration.Resource`
	`348`	`+ Kid, HmacEncoded string`
	`349`	`+ )`
`347`	`350`	`if eabData != nil {`
	`351`	`+ Kid = eabData["Kid"].(string)`
	`352`	`+ HmacEncoded = eabData["HmacEncoded"].(string)`
	`353`	`+ }`
	`354`	`+ if Kid != "" && HmacEncoded != "" {`
`348`	`355`	`Kid := eabData["Kid"].(string)`
`349`	`356`	`HmacEncoded := eabData["HmacEncoded"].(string)`
`350`	`357`	`reg, err = client.Registration.RegisterWithExternalAccountBinding(registration.RegisterEABOptions{`
Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,10 @@ func Deploy(cfg map[string]any, logger *public.Logger) error {`
`83`	`83`	`// 调用插件`
`84`	`84`	`logger.Debug(fmt.Sprintf("调用插件%s:%s", pluginName, action))`
`85`	`85`
`86`		`- rep, err := CallPlugin(pluginName, action, pluginConfig, logger)`
	`86`	`+ _, err = CallPlugin(pluginName, action, pluginConfig, logger)`
`87`	`87`	`if err != nil {`
`88`	`88`	`return fmt.Errorf("调用插件失败：%v", err)`
`89`	`89`	`}`
`90`		`- fmt.Println(rep)`
	`90`	`+ //fmt.Println(rep)`
`91`	`91`	`return err`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,10 @@ func RunNode(node WorkflowNode, ctx ExecutionContext) error {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`if node.ChildNode != nil {`
	`289`	`+ fromNodeData, ok := ctx.GetOutput(node.Id)`
	`290`	`+ if ok && fromNodeData != nil && node.ChildNode.Config["fromNodeData"] == nil {`
	`291`	`+ node.ChildNode.Config["fromNodeData"] = fromNodeData`
	`292`	`+ }`
`289`	`293`	`return RunNode(node.ChildNode, ctx)`
`290`	`294`	`}`
`291`	`295`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ func Register(r *gin.Engine) {`
`60`	`60`	`acmeAccount := v1.Group("/acme_account")`
`61`	`61`	`{`
`62`	`62`	`acmeAccount.POST("/get_list", api.GetAccountList)`
	`63`	`+ acmeAccount.POST("/get_ca_list", api.GetCaList)`
`63`	`64`	`acmeAccount.POST("/add_account", api.AddAccount)`
`64`	`65`	`acmeAccount.POST("/del_account", api.DelAccount)`
`65`	`66`	`acmeAccount.POST("/upd_account", api.UpdateAccount)`