From 3be7c29c20255e7bc37ee5fd2f1db823be54cb4d Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 23 Jul 2021 14:24:55 +0800
Subject: [PATCH] a
---
platformapi/jdshopapi/store_page_test.go | 14 +++++++++++---
platformapi/jxprintapi/jxprintapi_test.go | 2 +-
platformapi/tibiotapi/tibiotapi.go | 2 +-
platformapi/tonglianpayapi/tonglianpayapi.go | 1 +
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go
index bd7a1847..10cda0c6 100644
--- a/platformapi/jdshopapi/store_page_test.go
+++ b/platformapi/jdshopapi/store_page_test.go
@@ -4,9 +4,10 @@ import (
"bytes"
"crypto/aes"
"crypto/cipher"
- "crypto/sha1"
"encoding/base64"
+ "encoding/json"
"fmt"
+ "git.rosy.net.cn/baseapi/platformapi/alipayapi"
"git.rosy.net.cn/baseapi/utils"
"golang.org/x/text/encoding/simplifiedchinese"
"golang.org/x/text/transform"
@@ -769,8 +770,15 @@ func TestUpdateStatus(t *testing.T) {
//fmt.Println(int2h8l8(int64(len("fd003401005b76325dc8d5d5d5cfe3c2afc9fad7cfd1cca3acd2a3bfb4c6d9b2bcb9d2c7b0b4a8a3acb7c9c1f7d6b1cfc2c8fdc7a7b3dfa3acd2c9cac7d2f8bad3c2e4bec5ccec") / 2)))
//fmt.Println(hex.EncodeToString(data))
//fmt.Println(fmt.Sprintf("%x", len("fd003401005b76325dc8d5d5d5cfe3c2afc9fad7cfd1cca3acd2a3bfb4c6d9b2bcb9d2c7b0b4a8a3acb7c9c1f7d6b1cfc2c8fdc7a7b3dfa3acd2c9cac7d2f8bad3c2e4bec5ccec")/2))
- str := "AA0D5ABE801F11E98489525400AE46A6e10adc3949ba59abbe56e057f20f883e"
- fmt.Println(fmt.Sprintf("%x", sha1.Sum([]byte(str))))
+ mobile := &alipayapi.KeyMobile{}
+ data, _ := base64.StdEncoding.DecodeString("QWja44PbYifX70Y74N3PU2dG2VedZFqqeXJhXV8g9cALnCOyXt25K6z2RQtAXlJR")
+ key, _ := base64.StdEncoding.DecodeString("GHp3ojlVYRRu2XID4FX2ew==")
+ iv := []byte{}
+ iv = append(iv, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+ if result, err := utils.AESCBCDecpryt(data, key, iv); err == nil && result != nil {
+ json.Unmarshal(result, &mobile)
+ }
+ fmt.Println(utils.Format4Output(mobile, true))
}
func sss() (data2 []byte) {
diff --git a/platformapi/jxprintapi/jxprintapi_test.go b/platformapi/jxprintapi/jxprintapi_test.go
index 1a0a5b89..47f4a7cc 100644
--- a/platformapi/jxprintapi/jxprintapi_test.go
+++ b/platformapi/jxprintapi/jxprintapi_test.go
@@ -75,7 +75,7 @@ func TestGetPrinterStatus(t *testing.T) {
}
func TestDoPrint(t *testing.T) {
- result, err := api.DoPrint("20210615000010", "测试一下", 1)
+ result, err := api.DoPrint("20210615000010", "测试一下
", 2)
if err != nil {
t.Fatal(err)
}
diff --git a/platformapi/tibiotapi/tibiotapi.go b/platformapi/tibiotapi/tibiotapi.go
index 9db71a14..46e6e1a4 100644
--- a/platformapi/tibiotapi/tibiotapi.go
+++ b/platformapi/tibiotapi/tibiotapi.go
@@ -148,7 +148,7 @@ func (a *API) BatchQueryCardInfo(pageNum int) (batchQueryCardInfoResult *BatchQu
}
type IotDataResult struct {
- SyncStatus string `json:"sync_status"`
+ SyncStatus string `json:"sync_status"` // 1 未同步， 2已同步
CardFlow string `json:"card_flow"`
CreateTime string `json:"create_time"`
SyncTime string `json:"sync_time"`
diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go
index 3a247751..d8a2dccb 100644
--- a/platformapi/tonglianpayapi/tonglianpayapi.go
+++ b/platformapi/tonglianpayapi/tonglianpayapi.go
@@ -20,6 +20,7 @@ const (
sigKey = "sign"
PayTypeWxXcx = "W06"
+ PayTypeWxCode = "W01"
PayTypeZfbApp = "A03"
PayTypeZfbQrcode = "A01"
PayTypeZfbJS = "A02"