From 512976c0c2f6983fafdda405d42ba04efad3f361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= Date: Mon, 19 Aug 2024 16:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6-=E5=BE=AE=E4=BF=A1=E7=AB=8B?= =?UTF-8?q?=E5=87=8F=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/weixin_cpn/internal/weixin_cpn_test.go | 1 + utils/weixin/instance.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/weixin_cpn/internal/weixin_cpn_test.go b/plugins/weixin_cpn/internal/weixin_cpn_test.go index 91171ae..93ae531 100644 --- a/plugins/weixin_cpn/internal/weixin_cpn_test.go +++ b/plugins/weixin_cpn/internal/weixin_cpn_test.go @@ -17,6 +17,7 @@ func config() []byte { MchID: "1605446142", MchCertificateSerialNumber: "4D081089DEB385316CBDCB55C070287E4920AC76", MchAPIv3Key: "ChengDuLanSeXiongDi1234567890123", + PrivateKey: "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCyDvodpawS3XDZ\nyGRyhrbQhonxBBLmXgMT5A4zwli2FXFlmHnmeexCjILFMwF2OeRWKhVMbe+6fD0U\n3mXA3bBppqQ65fpra6xjmR7iKUB814RIxbG0SoWhWQJCU/hvGL8m56LQclJo9lyX\nvfxKhi7u4iSbC7E0MiEIFSUCdmNZHX2QmMF1pVXBHOBGpR52PE/i+DijwXuvPczD\nm2DLHCFLdFwUnuEnJbOVY7mc3W01zXeAj89IYp6BZxwCgVM+SFxgaK34lB11lDfW\nzAQgNQbfFdZEKYJgJiTlOpXMYNDaTx6GqkUKXrpRXKoDSSuVeGiCCgh0/RATB6sL\nlYO6+/4VAgMBAAECggEANwUvvleCO3YXuAQXHdiIxxi7qTEEEhE8zDmtNcs5FFK9\n7pHWISTNn6bBheQD8J9k8kcgu7RA3pQjX751HMqkB5GJr/V+kxD7fO9EvsfWeH00\nEDSee8KHVlsluo8t9k5kSsZK5jRdSLfP1sfLHNAn0oMoooxTXnibAl9eR0uD2XYh\n2LTCdbg1Y6UkObf6ikPJI6D6P9F9madzW2zraCXgr42SWYFGEv0iAGXxG9uXc3KU\n81XJa8IIEB4Tlsijx3Zk5ASN/z9K7rJIwciTnHfKJiicTMzjF3CvvhsmrpRVbX4j\nZRPyXgMdGOdCn8u9ZgDnl9A0mnqSQEzLWaAsrbI9hQKBgQDq8B9rhIrEP8J+iD16\nUPpVE224SWlU/2CM1chs/uE6jh3s5XoK+wGoXKjAIEOG9jl2BuUYg0yPsybE8QFc\npAYpz24GGdCxIuQZIL37UoV3CKMeREo7KXG++nmCMQZ3GPPvlXSx3ugDTH76GbRq\nx5uLwbX0L2ewD88IQOvbkpVpdwKBgQDCBXVDWlwgA1mZhOjOp8NO68fDTdhnrKCf\nJS1QmNofCepqSn3s76l19V2F9b888TbIjWQDkmN9BhLisZ/9RqJEb5zrgP+x4DfB\nhKxpsugF4h5/C4ZvpjRGlOu38qQp0k0TuQBjGGHBEZQiE2TgvUx6V4jAHBRpUXh6\nqaZHHJ630wKBgF3h+NxRSdakmAdSUCbp5y9KJUVIaMQjjSSaZY5QyBZLJmA9T2jF\n52KtLG4iNnnfORUWKkSCa3zdHXgDywSHM0NP9eqQNFok1DvKXsDouBbaJ7z3kyZT\nKHYlx5qkFq5PFWO/OLO/nL18ux0cWoF1JI5TqW9b5jZwCs6Eivvidrx/AoGABVTz\nEQPFrleJOc/OOgegNWYDWlmkTc0PqO/zm9hnfhzepUcgyMcZSBWTGWBUfg8+6yn/\nip2WQFRPZo1tER/Ey86paEtmO3Qm9Bl6R3lUKP06y1D8w8q0exASnj57xm5yEc2u\ntgpwfUbHZFxWFFr/ZAlNx8G9ydskTXKmECQ4NGMCgYBvZe4M86EW2j0VBH7f/eUj\nPiCoRGjcM6CMlDArCtcw0d62URr9li8hTtB0aGW0qC1Q/ge+adkw6rhw7WQO7Dag\nOxjaGYcpryIDuiliDG6U0yB8rqA9aW7k3npvivmeX/1mAtGGrliAAX4bb/y3S0nJ\nDwIaCyy1x9BH0libPZpSYA==\n-----END PRIVATE KEY-----\n", PrivateKeyPath: "/Users/lsxd/code/go/other/mq/wx/wechat_private_key.pem", } marshal, _ := json.Marshal(c) diff --git a/utils/weixin/instance.go b/utils/weixin/instance.go index afddb2d..6527ff5 100644 --- a/utils/weixin/instance.go +++ b/utils/weixin/instance.go @@ -13,6 +13,7 @@ type Config struct { MchID string `json:"mch_id"` MchCertificateSerialNumber string `json:"mch_certificate_serial_number"` MchAPIv3Key string `json:"mch_ap_iv_3_key"` + PrivateKey string `json:"private_key"` PrivateKeyPath string `json:"private_key_path"` } @@ -47,7 +48,7 @@ func New(ctx context.Context, c *Config) (*core.Client, error) { } func client(ctx context.Context, c *Config) (*core.Client, error) { - mchPrivateKey, err := utils.LoadPrivateKeyWithPath(c.PrivateKeyPath) + mchPrivateKey, err := utils.LoadPrivateKey(c.PrivateKey) if err != nil { return nil, fmt.Errorf("MchID[%s] load merchant private key error:%v", c.MchID, err) }