From b8aa5317614e0ed2f8d909af25f0801f49a5a554 Mon Sep 17 00:00:00 2001 From: lychang <632945494@qq.com> Date: Thu, 21 May 2026 03:29:53 +0800 Subject: [PATCH] update --- cmd/main.go | 2 +- internal/api/client.go | 22 +-- internal/api/http.go | 1 + internal/api/tax_health_test.go | 322 +------------------------------- 4 files changed, 17 insertions(+), 330 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index d096e13..42d452c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -127,7 +127,7 @@ func main() { CompanyName: "郑州惠兴", // 可以从数据中提取公司名称 Data: companyData, Period: "Q1", - Year: "2024", + Year: "2022", }, } diff --git a/internal/api/client.go b/internal/api/client.go index 94a633a..61c1e5a 100644 --- a/internal/api/client.go +++ b/internal/api/client.go @@ -182,24 +182,20 @@ func (s *CompanyInfoService) GetCompanyInfo(companyName string, apis []string) ( // EvaluateTaxHealth 执行税务健康测评 func (s *TaxHealthService) EvaluateTaxHealth(request TaxEvalRequest) (*TaxEvalResponse, error) { // 生成随机数和时间戳 - r, _ := rand.Int(rand.Reader, big.NewInt(10000)) - nonce := strconv.FormatInt(r.Int64(), 10) + nonce := "12345" timestamp := strconv.FormatInt(time.Now().Unix()*1000, 10) - fmt.Println(nonce) - fmt.Println(timestamp) apiURL := "https://api.cmdp.cn/v1/eval/tax-risk" - fmt.Println(apiURL) // 序列化请求体 jsonData, err := json.Marshal(request) - fmt.Println(string(jsonData)) + jsonDataStr := string(jsonData) + fmt.Println(jsonDataStr) if err != nil { return nil, fmt.Errorf("序列化请求体失败: %v", err) } // 生成签名 - signData := s.userID + timestamp + nonce + apiURL + string(jsonData) + signData := s.userID + timestamp + nonce + apiURL + jsonDataStr signature, err := s.generateSignature([]byte(signData)) - fmt.Println(signature) if err != nil { return nil, fmt.Errorf("生成签名失败: %v", err) } @@ -214,7 +210,7 @@ func (s *TaxHealthService) EvaluateTaxHealth(request TaxEvalRequest) (*TaxEvalRe "x-gi-timestamp": timestamp, } // 发送POST请求 - response, err := s.httpClient.Post(apiURL, jsonData, "application/json", headers) + response, err := s.httpClient.Post(apiURL, []byte(jsonDataStr), "application/json", headers) fmt.Println(string(response)) if err != nil { return nil, fmt.Errorf("发送请求失败: %v", err) @@ -273,6 +269,7 @@ func (s *CompanyInfoService) generateSignature(plainText []byte) (string, error) return sign(plainText, s.privateKey) } func sign(data []byte, privateKeyHex string) (string, error) { + prvKeyBytes, err := hex.DecodeString(privateKeyHex) if err != nil { return "", fmt.Errorf("failed to decode private key hex: %v", err) @@ -289,11 +286,12 @@ func sign(data []byte, privateKeyHex string) (string, error) { return "", fmt.Errorf("failed to parse private key") } prvKey.PublicKey.Curve = sm2.P256Sm2() - // 使用ScalarBaseMult计算公钥坐标,这是SM2曲线标准做法 - prvKey.PublicKey.X, prvKey.PublicKey.Y = sm2.P256Sm2().ScalarBaseMult(prvKey.D.Bytes()) + prvKey.PublicKey.X, prvKey.PublicKey.Y = prvKey.PublicKey.Curve.ScalarBaseMult(prvKey.D.Bytes()) } - r, s, err := sm2.Sm2Sign(prvKey, data, nil, rand.Reader) + // 使用空 UID + uid := []byte{} + r, s, err := sm2.Sm2Sign(prvKey, data, uid, rand.Reader) if err != nil { return "", fmt.Errorf("sign failed: %v", err) } diff --git a/internal/api/http.go b/internal/api/http.go index 25b91dc..74e1c98 100644 --- a/internal/api/http.go +++ b/internal/api/http.go @@ -62,6 +62,7 @@ func (c *HTTPClient) PostJSON(url string, data interface{}, headers map[string]s // Post 发送POST请求 func (c *HTTPClient) Post(url string, data []byte, contentType string, headers map[string]string) ([]byte, error) { + fmt.Println(string(data)) req, err := http.NewRequest("POST", url, bytes.NewBuffer(data)) if err != nil { return nil, fmt.Errorf("创建POST请求失败: %v", err) diff --git a/internal/api/tax_health_test.go b/internal/api/tax_health_test.go index 4feabc5..43320ec 100644 --- a/internal/api/tax_health_test.go +++ b/internal/api/tax_health_test.go @@ -9,320 +9,7 @@ import ( // TestCreateTaxEvalRequest 测试创建税务评估请求 func TestCreateTaxEvalRequest(t *testing.T) { - parsedJSON := `{ - "LC0000003E_T0I0331": 741213833.14, - "LC0000003E_T0I0101": 578064138.06, - "GC0016669E_T0I0331": 0, - "GC0016669E_T0I0101": 0, - "GC0006222E_T0I0331": 0, - "GC0006222E_T0I0101": 0, - "LC0000005E_T0I0331": 28204209.19, - "LC0000005E_T0I0101": 25024200, - "LC0000006E_T0I0331": 372847956.26, - "LC0000006E_T0I0101": 461664605.22, - "GC0018627E_T0I0331": 0, - "GC0018627E_T0I0101": 0, - "LC0000007E_T0I0331": 13850463.15, - "LC0000007E_T0I0101": 11466957.75, - "LC0000010E_T0I0331": 1279972.41, - "LC0000010E_T0I0101": 2394706.37, - "LC0000011E_T0I0331": 71200, - "LC0000011E_T0I0101": 0, - "GC0016671E_T0I0331": 0, - "GC0016671E_T0I0101": 0, - "GC0007742E_T0I0331": 0, - "GC0007742E_T0I0101": 0, - "LC0000012E_T0I0331": 0, - "LC0000012E_T0I0101": 0, - "LC0000013E_T0I0331": 30401431.89, - "LC0000013E_T0I0101": 31017339.59, - "LC0000014E_T0I0331": 1198146906.32, - "LC0000014E_T0I0101": 1114982561.27, - "GC0016672E_T0I0331": 0, - "GC0016672E_T0I0101": 0, - "GC0016673E_T0I0331": 0, - "GC0016673E_T0I0101": 0, - "LC0000017E_T0I0331": 1410014797.11, - "LC0000017E_T0I0101": 1362056986.2, - "LC0000018E_T0I0331": 40000000, - "LC0000018E_T0I0101": 40000000, - "GC0016674E_T0I0331": 0, - "GC0016674E_T0I0101": 0, - "GC0016675E_T0I0331": 0, - "GC0016675E_T0I0101": 0, - "LC0000019E_T0I0331": 0, - "LC0000019E_T0I0101": 0, - "LC0000020E_T0I0331": 1710521807.17, - "LC0000020E_T0I0101": 1809249671.18, - "LC0000021E_T0I0331": 10670524.65, - "LC0000021E_T0I0101": 12170137.69, - "LC0000024E_T0I0331": 0, - "LC0000024E_T0I0101": 0, - "LC0000025E_T0I0331": 0, - "LC0000025E_T0I0101": 0, - "GC0018492E_T0I0331": 0, - "GC0018492E_T0I0101": 0, - "LC0000026E_T0I0331": 243623902.74, - "LC0000026E_T0I0101": 248385213.62, - "LC0000027E_T0I0331": 22259377.92, - "LC0000027E_T0I0101": 16876375.57, - "LC0000028E_T0I0331": 0, - "LC0000028E_T0I0101": 0, - "LC0000029E_T0I0331": 66195945.84, - "LC0000029E_T0I0101": 63182454.15, - "LC0000030E_T0I0331": 0, - "LC0000030E_T0I0101": 0, - "LC0000031E_T0I0331": 0, - "LC0000031E_T0I0101": 0, - "LC0000032E_T0I0331": 3503286355.43, - "LC0000032E_T0I0101": 3551920838.41, - "LC0000033E_T0I0331": 4701433261.75, - "LC0000033E_T0I0101": 4666903399.68, - "LC0000034E_T0I0331": 0, - "LC0000034E_T0I0101": 0, - "GC0016676E_T0I0331": 0, - "GC0016676E_T0I0101": 0, - "GC0006227E_T0I0331": 0, - "GC0006227E_T0I0101": 0, - "LC0000036E_T0I0331": 327465356.48, - "LC0000036E_T0I0101": 324791092.1, - "LC0000037E_T0I0331": 3987467.19, - "LC0000037E_T0I0101": 24162739.9, - "LC0000038E_T0I0331": 6216843.39, - "LC0000038E_T0I0101": 6107830.87, - "GC0016678E_T0I0331": 0, - "GC0016678E_T0I0101": 0, - "LC0000039E_T0I0331": 0, - "LC0000039E_T0I0101": 0, - "LC0000040E_T0I0331": 22441281.17, - "LC0000040E_T0I0101": 11487537.15, - "LC0000043E_T0I0331": 99859088.81, - "LC0000043E_T0I0101": 66507161.39, - "GC0007743E_T0I0331": 0, - "GC0007743E_T0I0101": 0, - "LC0000044E_T0I0331": 0, - "LC0000044E_T0I0101": 0, - "LC0000045E_T0I0331": 150724.81, - "LC0000045E_T0I0101": 0, - "LC0000046E_T0I0331": 459997495.210001, - "LC0000046E_T0I0101": 433462971.100001, - "LC0000047E_T0I0331": 0, - "LC0000047E_T0I0101": 0, - "LC0000048E_T0I0331": 0, - "LC0000048E_T0I0101": 0, - "GC0007952E_T0I0331": 0, - "GC0007952E_T0I0101": 0, - "GC0007953E_T0I0331": 0, - "GC0007953E_T0I0101": 0, - "GC0018493E_T0I0331": 0, - "GC0018493E_T0I0101": 0, - "LC0000049E_T0I0331": 0, - "LC0000049E_T0I0101": 0, - "LC0000051E_T0I0331": 62303168, - "LC0000051E_T0I0101": 83817131.51, - "GC0007955E_T0I0331": 0, - "GC0007955E_T0I0101": 0, - "LC0000052E_T0I0331": 0, - "LC0000052E_T0I0101": 0, - "LC0000053E_T0I0331": 2204446.46, - "LC0000053E_T0I0101": 1516443.48, - "LC0000054E_T0I0331": 64507614.46, - "LC0000054E_T0I0101": 85333574.99, - "LC0000055E_T0I0331": 524505109.670001, - "LC0000055E_T0I0101": 518796546.090001, - "LC0000056E_T0I0331": 3740951803.56, - "LC0000056E_T0I0101": 3740951803.56, - "GC0007956E_T0I0331": 0, - "GC0007956E_T0I0101": 0, - "GC0007957E_T0I0331": 0, - "GC0007957E_T0I0101": 0, - "GC0007958E_T0I0331": 0, - "GC0007958E_T0I0101": 0, - "LC0000057E_T0I0331": 55443838.1, - "LC0000057E_T0I0101": 55443838.1, - "LC0000058E_T0I0331": 0, - "LC0000058E_T0I0101": 0, - "GC0007750E_T0I0331": 0, - "GC0007750E_T0I0101": 0, - "LC0000059E_T0I0331": 0, - "LC0000059E_T0I0101": 0, - "LC0000060E_T0I0331": 180349254.88, - "LC0000060E_T0I0101": 176067125.03, - "LC0000062E_T0I0331": 200183255.54, - "LC0000062E_T0I0101": 175644086.9, - "LC0000063E_T0I0331": 4176928152.08, - "LC0000063E_T0I0101": 4148106853.59, - "LC0000064E_T0I0331": 4701433261.75, - "LC0000064E_T0I0101": 4666903399.68, - "LC0010003E_T0M0103": 1001498985.16, - "LC0010003E_T-1M0103": 970511823.21, - "LC0010008E_T0M0103": 844977443.69, - "LC0010008E_T-1M0103": 800450961.39, - "LC0010016E_T0M0103": 30422209.55, - "LC0010016E_T-1M0103": 30211704.62, - "LC0010017E_T0M0103": 2985920.84, - "LC0010017E_T-1M0103": 2344075.83, - "LC0010018E_T0M0103": 180378961.52, - "LC0010018E_T-1M0103": 160479498.41, - "GC0016679E_T0M0103": 0, - "GC0016679E_T-1M0103": 0, - "LC0010019E_T0M0103": -2498823.79, - "LC0010019E_T-1M0103": -1463147.42, - "GC0016680E_T0M0103": 0, - "GC0016680E_T-1M0103": 0, - "GC0016681E_T0M0103": 0, - "GC0016681E_T-1M0103": 0, - "GC0014225E_T0M0103": 0, - "GC0014225E_T-1M0103": 0, - "LC0010022E_T0M0103": 36357810.91, - "LC0010022E_T-1M0103": 35468582.16, - "LC0010023E_T0M0103": 0, - "LC0010023E_T-1M0103": 0, - "GC0017132E_T0M0103": 0, - "GC0017132E_T-1M0103": 0, - "GC0016683E_T0M0103": 0, - "GC0016683E_T-1M0103": 0, - "LC0010021E_T0M0103": 0, - "LC0010021E_T-1M0103": 0, - "GC0016682E_T0M0103": 0, - "GC0016682E_T-1M0103": 0, - "LC0010020E_T0M0103": 0, - "LC0010020E_T-1M0103": 0, - "GC0014761E_T0M0103": 0, - "GC0014761E_T-1M0103": 0, - "LC0010025E_T0M0103": -18408915.7400001, - "LC0010025E_T-1M0103": 13957312.54, - "LC0010026E_T0M0103": 62014210.36, - "LC0010026E_T-1M0103": 74680343.91, - "LC0010027E_T0M0103": 95993.15, - "LC0010027E_T-1M0103": 190072.12, - "LC0010029E_T0M0103": 43509301.4699999, - "LC0010029E_T-1M0103": 88447584.33, - "LC0010030E_T0M0103": 688002.98, - "LC0010030E_T-1M0103": 171084.05, - "LC0010031E_T0M0103": 42821298.4899999, - "LC0010031E_T-1M0103": 88276500.28, - "GC0014762E_T0M0103": 0, - "GC0014762E_T-1M0103": 0, - "GC0014763E_T0M0103": 0, - "GC0014763E_T-1M0103": 0, - "LC0010038E_T0M0103": 0, - "LC0010038E_T-1M0103": 0, - "GC0007744E_T0M0103": 0, - "GC0007744E_T-1M0103": 0, - "GC0007960E_T0M0103": 0, - "GC0007960E_T-1M0103": 0, - "GC0007961E_T0M0103": 0, - "GC0007961E_T-1M0103": 0, - "GC0016684E_T0M0103": 0, - "GC0016684E_T-1M0103": 0, - "GC0016685E_T0M0103": 0, - "GC0016685E_T-1M0103": 0, - "GC0016686E_T0M0103": 0, - "GC0016686E_T-1M0103": 0, - "GC0007745E_T0M0103": 0, - "GC0007745E_T-1M0103": 0, - "GC0007962E_T0M0103": 0, - "GC0007962E_T-1M0103": 0, - "GC0016687E_T0M0103": 0, - "GC0016687E_T-1M0103": 0, - "GC0016688E_T0M0103": 0, - "GC0016688E_T-1M0103": 0, - "GC0016689E_T0M0103": 0, - "GC0016689E_T-1M0103": 0, - "GC0016690E_T0M0103": 0, - "GC0016690E_T-1M0103": 0, - "GC0007966E_T0M0103": 0, - "GC0007966E_T-1M0103": 0, - "GC0007967E_T0M0103": 0, - "GC0007967E_T-1M0103": 0, - "LC0010039E_T0M0103": 0, - "LC0010039E_T-1M0103": 0, - "LC0010036E_T0M0103": 0, - "LC0010036E_T-1M0103": 0, - "LC0010037E_T0M0103": 0, - "LC0010037E_T-1M0103": 0, - "LC0020002E_T0M0103": 0, - "LC0020002E_T-1M0103": 0, - "LC0020013E_T0M0103": 46619.83, - "LC0020013E_T-1M0103": 0, - "LC0020014E_T0M0103": 0, - "LC0020014E_T-1M0103": 0, - "LC0020015E_T0M0103": 13566300.1, - "LC0020015E_T-1M0103": 13332652.63, - "LC0020016E_T0M0103": 680142.74, - "LC0020016E_T-1M0103": 1039719.92, - "LC0020022E_T0M0103": 657058.13, - "LC0020022E_T-1M0103": 567405.52, - "LC0020023E_T0M0103": -162817.27, - "LC0020023E_T-1M0103": 250470.71, - "LC0020024E_T0M0103": 0, - "LC0020024E_T-1M0103": 0, - "LC0020025E_T0M0103": -4745909.49, - "LC0020025E_T-1M0103": 2063373.12, - "LC0020026E_T0M0103": 0, - "LC0020026E_T-1M0103": 0, - "LC0020027E_T0M0103": 0, - "LC0020027E_T-1M0103": 0, - "LC0020028E_T0M0103": 0, - "LC0020028E_T-1M0103": 0, - "LC0020029E_T0M0103": 0, - "LC0020029E_T-1M0103": 0, - "LC0020030E_T0M0103": 0, - "LC0020030E_T-1M0103": 0, - "LC0020031E_T0M0103": 0, - "LC0020031E_T-1M0103": 0, - "LC0020032E_T0M0103": 16388.07, - "LC0020032E_T-1M0103": 6007.97, - "LC0020033E_T0M0103": 0, - "LC0020033E_T-1M0103": 0, - "LC0020034E_T0M0103": 0, - "LC0020034E_T-1M0103": 0, - "LC0020036E_T0M0103": 0, - "LC0020036E_T-1M0103": 0, - "LC0020037E_T0M0103": 0, - "LC0020037E_T-1M0103": 0, - "LC0020038E_T0M0103": -16388.07, - "LC0020038E_T-1M0103": -6007.97, - "LC0020039E_T0M0103": 0, - "LC0020039E_T-1M0103": 0, - "LC0020040E_T0M0103": 0, - "LC0020040E_T-1M0103": 0, - "LC0020042E_T0M0103": 0, - "LC0020042E_T-1M0103": 0, - "LC0020044E_T0M0103": 0, - "LC0020044E_T-1M0103": 0, - "LC0020045E_T0M0103": 0, - "LC0020045E_T-1M0103": 0, - "LC0020046E_T0M0103": 0, - "LC0020046E_T-1M0103": 0, - "LC0020047E_T0M0103": 0, - "LC0020047E_T-1M0103": 0, - "LC0020049E_T0M0103": 0, - "LC0020049E_T-1M0103": 0, - "LC0020050E_T0M0103": 0, - "LC0020050E_T-1M0103": 0, - "LC0020051E_T0M0103": 0, - "LC0020051E_T-1M0103": 0, - "LC0020052E_T0M0103": 691605.56, - "LC0020052E_T-1M0103": 2057365.15, - "LC0020053E_T0M0103": 3233993.43, - "LC0020053E_T-1M0103": 6614143.33, - "LC0020054E_T0I0101": 3925598.99, - "LC0020054E_T-1I0101": 8671508.48, - "LC0020054E_T0I0331": 9948154.38, - "LC0020054E_T-1I0331": 17253621.9, - "GE8020001E_T0M0112": 0, - "GE8020001E_T-1M0112": 0, - "GE8020002E_T0M0112": 0, - "GE8020002E_T-1M0112": 0, - "GE8020003E_T0M0112": 0, - "GE8020003E_T-1M0112": 0, - "GE8020004E_T0M0112": 0, - "GE8020004E_T-1M0112": 0, - "GE8000080E": 0, - "GE0000000E": 0 -}` + parsedJSON := "{\"LC0000003E_T0I0331\": 741213833.14, \"LC0000003E_T0I0332\": 741213833.14}" // 创建税务健康服务客户端 // 注意:这里需要替换为实际的用户ID和私钥 taxHealthService := NewTaxHealthService("1554047490758508546", "00d502fcac7a2b0e227751cd6d8b0c725c55f71adcaccc6a50c4d63c73db6c8add") @@ -336,12 +23,13 @@ func TestCreateTaxEvalRequest(t *testing.T) { // 构建税务评估请求 request := TaxEvalRequest{ - ReqNo: fmt.Sprintf("REQ%v", time.Now().Unix()), // 使用时间戳生成请求号 + ReqNo: fmt.Sprintf("%v", time.Now().Unix()), // 使用时间戳生成请求号 Detail: TaxEvalDetail{ - CompanyName: "郑州惠兴", // 可以从数据中提取公司名称 + FileURL: "", Data: companyData, + CompanyName: "顺丰", // 可以从数据中提取公司名称 Period: "Q1", - Year: "2024", + Year: "2023", }, }