zhou.xiaoning 2 anos atrás
pai
commit
31f091a36e
2 arquivos alterados com 26 adições e 17 exclusões
  1. 5 5
      config.yaml
  2. 21 12
      service/asign/asign.go

+ 5 - 5
config.yaml

@@ -20,15 +20,15 @@ jwt:
 # redis configuration
 redis:
   db: 0
-  addr: '192.168.31.204:5007'
+  addr: '192.168.31.202:5007'
   password: ''
 
 # system configuration
 system:
   env: 'develop'  # "develop" & "public", Change to "develop" to skip authentication for development mode
   addr: 8888
-  need-quote-publish: true # 是否需要连接行情发布服务
-  quote-publish-addr: '192.168.31.204:5004' # 行情发布服务地址
+  need-quote-publish: false # 是否需要连接行情发布服务
+  quote-publish-addr: '192.168.31.202:5004' # 行情发布服务地址
 
 # local configuration
 local:
@@ -41,14 +41,14 @@ oracle:
   address: '192.168.31.88'
   name: 'orcl'
   port: '1521'
-  user: 'mtp2_test204'
+  user: 'mtp2_test202'
   pwd: 'muchinfo'
   max-idle-conns: 10
   max-open-conns: 100
 
 # rabbitmq configuration
 rabbitmq:
-  url: 'amqp://guest:guest@192.168.31.204:5020/test'
+  url: 'amqp://guest:guest@192.168.31.202:5020/test'
   exchange: 'entry'
 
 # 爱签开放平台配置

+ 21 - 12
service/asign/asign.go

@@ -1,7 +1,9 @@
 package asign
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 	"mtp20access/global"
 	"os/exec"
 	"strings"
@@ -9,9 +11,6 @@ import (
 	"go.uber.org/zap"
 )
 
-var appId = global.M2A_CONFIG.Asign.AppId
-var privateKey = global.M2A_CONFIG.Asign.PrivateKey
-
 // 签名规范:
 //
 //	1、表单提交方式:form-data
@@ -234,8 +233,8 @@ func AddPersonalUserBy(account, name, idCard, mobile string, idCardType *int) (r
 	}
 
 	reqData["api"] = "addPerson"
-	reqData["appId"] = appId
-	reqData["appKey"] = privateKey
+	reqData["appId"] = global.M2A_CONFIG.Asign.AppId
+	reqData["appKey"] = global.M2A_CONFIG.Asign.PrivateKey
 	reqData["apiUrl"] = apiUrl
 
 	// 将请求数据转换为JSON字符串
@@ -248,17 +247,27 @@ func AddPersonalUserBy(account, name, idCard, mobile string, idCardType *int) (r
 	pythonScriptPath := "./py/Enter.py"
 	// 创建一个命令对象
 	cmd := exec.Command("py", pythonScriptPath)
+
 	// 设置标准输入为JSON字符串
 	cmd.Stdin = strings.NewReader(string(reqJSON))
-	// 获取标准输出
-	output, err := cmd.CombinedOutput()
+
+	// 创建一个字节缓冲区来捕获命令的输出
+	var stdoutBuf, stderrBuf bytes.Buffer
+	cmd.Stdout = &stdoutBuf
+	cmd.Stderr = &stderrBuf
+
+	// 执行命令
+	err = cmd.Run()
+	// 输出标准输出和标准错误
+	fmt.Println("标准输出:", stdoutBuf.String())
+	fmt.Println("标准错误:", stderrBuf.String())
 	if err != nil {
 		global.M2A_LOG.Error("[AddPersonalUserBy] 请求失败", zap.Error(err))
 		return
 	}
 
 	// 结果
-	rspBody := string(output)
+	rspBody := stdoutBuf.String()
 	if err = json.Unmarshal([]byte(rspBody), &rspData); err != nil {
 		global.M2A_LOG.Error("[AddPersonalUserBy] 反序列化body失败", zap.Error(err))
 		return
@@ -294,8 +303,8 @@ func CreateContract(contractNo, contractName, templateNo string) (rspData AsignR
 	reqData["notifyUrl"] = ""
 
 	reqData["api"] = "createContract"
-	reqData["appId"] = appId
-	reqData["appKey"] = privateKey
+	reqData["appId"] = global.M2A_CONFIG.Asign.AppId
+	reqData["appKey"] = global.M2A_CONFIG.Asign.PrivateKey
 	reqData["apiUrl"] = apiUrl
 
 	// 将请求数据转换为JSON字符串
@@ -365,8 +374,8 @@ func AddSigner(contractNo, account string) (rspData AsignRsp[AddSignerData], err
 		{"attachNo": 1, "locationMode": 4}}
 
 	reqData["api"] = "addSigner"
-	reqData["appId"] = appId
-	reqData["appKey"] = privateKey
+	reqData["appId"] = global.M2A_CONFIG.Asign.AppId
+	reqData["appKey"] = global.M2A_CONFIG.Asign.PrivateKey
 	reqData["apiUrl"] = apiUrl
 
 	// 将请求数据转换为JSON字符串