fix: _

controllers/partial/SysWfController.go

@@ -176,7 +176,7 @@ func SysWf_Interrupt(c *entitys.CtrlContext) {
 		return
 	}
 	instanceId := fmt.Sprintf("%v", obj["instance_id"])
-	bytess, err := wfclient.Instance().Interrupt(instanceId, obj, c)
+	bytess, err := wfclient.NewWFClient(c).Interrupt(instanceId, obj, c)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", string(bytess)})
 	} else {

wfclient/client.go

@@ -6,16 +6,11 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-<<<<<<< HEAD
-=======
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/config"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
->>>>>>> b2a2f0295784e7da9317b8929a3c7fbcb11218da
 	"net/http"
 	"strconv"
 	"strings"
 
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/config"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
 )
@@ -42,7 +37,7 @@ type WFClient struct {
 
 var _wfendpoint = ""
 
-func init(){
+func init() {
 	_wfendpoint = config.AppConfig.GetKey("wfendpoint")
 }
 
@@ -494,19 +489,16 @@ func (w *WFClient) Interrupt(definedId string, formData map[string]interface{},
 	if err != nil {
 		return nil, err
 	}
-	callback, ok := w.callbackMap["interrupt"]
-	if ok {
-		callback(CallbackArg{
-			DefineId:     RunRespInfo.DefineId,
-			InstanceId:   definedId,
-			DefineName:   RunRespInfo.DefineName,
-			InstanceName: RunRespInfo.InstanceName,
-			FormData:     formData["form_data"].(string),
-			Executor:     RunRespInfo.Executor,
-			UserId:       w.userId,
-			Context:      c,
-		})
-	}
+	callWFCallback("interrupt", &CallbackArg{
+		DefineId:     RunRespInfo.DefineId,
+		InstanceId:   definedId,
+		DefineName:   RunRespInfo.DefineName,
+		InstanceName: RunRespInfo.InstanceName,
+		FormData:     formData["form_data"].(string),
+		Executor:     RunRespInfo.Executor,
+		UserId:       w.userId,
+		Context:      c,
+	})
 	return bytess, err
 }