From aed40b946f0e5de5aa82d4be47595905065770b0 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 30 六月 2023 15:52:29 +0800
Subject: [PATCH] 调整代码
---
webserver/controller.go | 1 +
webserver/router.go | 1 +
main.go | 4 +---
kingdee/cst.go | 20 ++++++++++++--------
nsqclient/client.go | 1 -
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/kingdee/cst.go b/kingdee/cst.go
index 8e3be9f..416d596 100644
--- a/kingdee/cst.go
+++ b/kingdee/cst.go
@@ -5,13 +5,14 @@
"encoding/json"
"fmt"
"io/ioutil"
- "kingdee-dbapi/config"
- "kingdee-dbapi/logger"
- "kingdee-dbapi/nsqclient"
"mime/multipart"
"net/http"
"strconv"
"time"
+
+ "kingdee-dbapi/config"
+ "kingdee-dbapi/logger"
+ "kingdee-dbapi/nsqclient"
)
var JoHeadTemplate = `
@@ -104,7 +105,6 @@
}
func Commit2CSTService(order CSTNsqQuery) (result CSTNsqReply) {
- fmt.Println(order)
result.Code = -1
result.FBillNo = order.FBillNo
result.FNumber = order.FNumber
@@ -128,7 +128,7 @@
int(order.UseAmount), // 瀹屽伐鍏ュ簱涓婇檺
int(order.UseAmount), // 瀹屽伐鍏ュ簱涓嬮檺
)
- fmt.Println(joHead)
+ //fmt.Println(joHead)
params := map[string]string{
"action": "鐢熶骇浠诲姟鍗�.鏂板",
"fuserid": "16394",
@@ -167,7 +167,6 @@
if rspMsg.ErrCode == 0 {
result.Code = 200
result.ICMONo = rspMsg.Data.FBillNo
- result.Message = ""
} else {
result.Code = rspMsg.ErrCode
result.Message = rspMsg.ErrMsg
@@ -179,11 +178,12 @@
func newMultipartRequest(url string, params map[string]string) (*http.Request, error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
+
// 璁剧疆Boundary, 鎺ュ彛楠岃瘉浜嗗叚涓�-
- err := writer.SetBoundary("------basicHttpClient" + strconv.Itoa(int(time.Now().Unix())))
- if err != nil {
+ if err := writer.SetBoundary("------basicHttpClient" + strconv.Itoa(int(time.Now().Unix()))); err != nil {
fmt.Println(err.Error())
}
+
for key, val := range params {
_ = writer.WriteField(key, val)
}
@@ -191,6 +191,10 @@
writer.Close()
req, err := http.NewRequest("POST", url, body)
+ if err != nil {
+ return nil, err
+ }
+
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("User-Agent", "basicHttpClient/0.0.1")
req.Header.Set("Connection", "keep-alive")
diff --git a/main.go b/main.go
index 2cb348c..a98858d 100644
--- a/main.go
+++ b/main.go
@@ -17,9 +17,7 @@
func main() {
logger.InitLog("kingdee-dbapi.log", "debug", 15, false)
- logger.Info("kdingdee-dbapi start!")
-
- os.Setenv("GODEBUG", "tls10default=1")
+ logger.Info("kingdee-dbapi start!")
config.Load()
diff --git a/nsqclient/client.go b/nsqclient/client.go
index 097933f..4bb7944 100644
--- a/nsqclient/client.go
+++ b/nsqclient/client.go
@@ -8,7 +8,6 @@
)
var producerCli Producer
-var consumeCli NsqConsumer
func InitNsqProducer() error {
var err error
diff --git a/webserver/controller.go b/webserver/controller.go
index 171e757..8f346ef 100644
--- a/webserver/controller.go
+++ b/webserver/controller.go
@@ -2,6 +2,7 @@
import (
"fmt"
+
"kingdee-dbapi/kingdee"
"github.com/gin-gonic/gin"
diff --git a/webserver/router.go b/webserver/router.go
index e26a0ff..ba5f7e7 100644
--- a/webserver/router.go
+++ b/webserver/router.go
@@ -4,6 +4,7 @@
"github.com/gin-gonic/gin"
)
+// 娴嬭瘯鐢╳eb鏈嶅姟
func Serve(port string) {
r := gin.Default()
r.GET("/order", OrderList)
--
Gitblit v1.8.0