From b80e06b0d07c5cc5d287c88d6d4b6d074043cc8b Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Thu, 23 Apr 2026 21:17:24 +0800 Subject: [PATCH] f --- config.yaml | 22 ++------ configs/env.production.yaml | 2 +- internal/config/config.go | 3 - internal/shared/payment/wechatpay.go | 4 +- resources/etc/wxetc_cert/apiclient_cert.p12 | Bin 2766 -> 0 bytes resources/etc/wxetc_cert/apiclient_cert.pem | 25 --------- resources/etc/wxetc_cert/apiclient_key.pem | 52 +++++++++--------- resources/etc/wxetc_cert/pub_key.pem | 14 ++--- .../etc/wxetc_cert/璇佷功浣跨敤璇存槑.txt | 18 ------ 9 files changed, 40 insertions(+), 100 deletions(-) delete mode 100644 resources/etc/wxetc_cert/apiclient_cert.p12 delete mode 100644 resources/etc/wxetc_cert/apiclient_cert.pem delete mode 100644 resources/etc/wxetc_cert/璇佷功浣跨敤璇存槑.txt diff --git a/config.yaml b/config.yaml index 6734423..3428bb2 100644 --- a/config.yaml +++ b/config.yaml @@ -151,7 +151,7 @@ sms: signature_enabled: true # 是否启用签名验证 signature_secret: "HyApi2024SMSSecretKey!@#$%^&*()_+QWERTYUIOP" # 签名密钥（请修改为复杂密钥） # 滑块验证码配置 - captcha_enabled: true # 是否启用滑块验证码 + captcha_enabled: false # 是否启用滑块验证码 captcha_secret: "" # 阿里云验证码密钥（加密模式时需要，可选）EKEY captcha_endpoint: "captcha.cn-shanghai.aliyuncs.com" # 阿里云验证码服务Endpoint scene_id: "wynt39to" # 阿里云验证码场景ID @@ -384,9 +384,6 @@ yushan: # 💰 支付宝支付配置 # =========================================== alipay: - app_id: "2021004181633376" - private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCC2GNEWrQUg6FVHBdlDcgL1SA1KmRI8IHgSJGvXEsgfo3g62aa5usFXHVz5bMzpIcDu0N+jGtZQIBuuq7TxGwhDvWBygEDXN17p00uwqik/3TsyFvJ4FfbkaS7pRIGfeO/cBTzjqznanPUdHJZ9L39QmTqTefIQQvGOCvgntKxPa/LdS24+ZLA2RNh3TsRzbSxOOJPmUrwvCX8U13F9jH250hvf+Tewz4hyG8CkiMM4d1UpGMndQNr8oTY0vwFbWAG0ZDGgkxjg0iRJ02fgxwShQS1TgY5NxPhpKBiN5C/WG15qCqEw0F3GlpfWZwzUhv1uMiy+xbZ2bGLo1YCtwUtAgMBAAECggEAQ8uk25T3u61cWYH9qTGT1nWug32ciqJ7WN+hBLCYiJSqJMEz380INzXp8Ywx5u83ubo8xYQyVwNxyG3YCge7UwGyOXaWQczLQbe06SaZRSzLw6gozxf7zdvP9B4akdyGtfl4EZ56fkmNDKbtXSjPjDrrmO+Wyg7R7/nI2lDQsF6dXTKD0YiHtTKz40amKgbIYX+qc3yVS0slkVjcfnRczr+PKM5RMsV3Jk2pr6IYeq3E24LnbuVtV76priTqJN3hVSy2Y6JqmAYkI0HCoCuaFGE8ud3J859jjMcUXTRFJyDsKKooa+FZCoEx2ToVMqnb4vjfr1gZifUrw4ZNd5cPoQKBgQC4v/fNTXuA21pb+l4fnqK0o3wFhiNJh920yIlF4Vd0Nsi2/TwqFK6cVhrUFAmKr88hTzY1vkOhd/HLlkWjNDR5OGx1K1BKUAZjWIfProv8lDSckADEI29lro9WzFGy0o4szlEJ2uuUfO/j9Qn2lmx5oFPsz0TI+HoSNFE0q/SlxQKBgQC1ToMLuh0OkucZm1SL6xcjudBX7U0ElZ/TIxRzfxQ/sN911/BRlxrSdCcDMXNuuFpV2ACjDNWWLJM1sRVsOWNA/oXzZf6VTvUDIAv8XrNUt/B87genBVuMTZ2RYmMWCrgW0PE1OrpKGuQCKVsn242B2Xpmee9OnHhBF2uTASDASQKBgBALvD38iMl8Q7DRYfNlF8SQnmjsaYwtXLgi4qlLFQlm6K/b9qnA+hlh8RqSUvHUqyy9cHvidoVDoaCJAKtYEWal2+WhSWvq32MpgUIsasQZKyid6TMf0MEIFDL5s+7QEsEZejhc5zESWNN3qNHd5rX5ktBygArkadXC7XqhpLHxAoGBAJ0dJEKNTZDLjKiMCoAVgT/cTcdkRFGst4tn4tkTTqDCzWJ5di++Geg173i86aMQ7ndlb2fcP1qb1hW5Fy9pq7Eu3zVFNZB9k6TZqIlSJ2VK4IPiYY9C/UpgGCNcdzEqqMxc1Cmkcrq1AtE8tVmc0Mutgnw7Pj2JKkx91yLU32TBAoGAKxssUdTLuf5Z5oFgzpoSES9qwc1h6jlMfsouDzHcZf0aYintD6Vby7SVul5540qYkDkNs0YZ3uZu74LHfoBaWJjYIIVAMSMX+3AtBpQUyYluex64V/g60t+0sFuDWqMvSPU7mZcv6+KIP6vW56GeYdhHf4JqttdIHm9SgkoJjjY=" - alipay_public_key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB" is_production: true notify_url: "https://console.haiyudata.com/api/v1/finance/alipay/callback" return_url: "https://console.haiyudata.com/api/v1/finance/alipay/return" @@ -395,24 +392,15 @@ alipay: # 💰 微信支付配置 # =========================================== Wxpay: - app_id: "wxa581992dc74d860e" - mch_id: "1683589176" - mch_certificate_serial_number: "1F4E8B3C39C60035D4CC154F276D03D9CC2C603D" - mch_apiv3_key: "TY8X9nP2qR5tY7uW3zA6bC4dE1flgGJ0" + mch_id: "1111281099" + mch_certificate_serial_number: "5E6FBBCB4C6C5378BEBA85D151A258CE0BE33A77" + mch_apiv3_key: "7s9KpG2tR8aZcX5bN3mQ6wE4dF1hJ7Lq" mch_private_key_path: "resources/etc/wxetc_cert/apiclient_key.pem" - mch_public_key_id: "PUB_KEY_ID_0116835891762025062600211574000800" + mch_public_key_id: "PUB_KEY_ID_0111112810992026042300381743000200" mch_public_key_path: "resources/etc/wxetc_cert/pub_key.pem" notify_url: "https://console.haiyudata.com/api/v1/pay/wechat/callback" refund_notify_url: "https://console.haiyudata.com/api/v1/wechat/refund_callback" -# 微信小程序配置 -WechatMini: - app_id: "wxa581992dc74d860e" - -# 微信H5配置 -WechatH5: - app_id: "wxa581992dc74d860e" - # =========================================== # 🔍 天眼查配置 # =========================================== diff --git a/configs/env.production.yaml b/configs/env.production.yaml index 40c1584..a77afb1 100644 --- a/configs/env.production.yaml +++ b/configs/env.production.yaml @@ -167,6 +167,6 @@ daily_ratelimit: # =========================================== sms: # 滑块验证码配置 - captcha_enabled: true # 是否启用滑块验证码 + captcha_enabled: false # 是否启用滑块验证码 captcha_secret: "" # 阿里云验证码密钥（可选） scene_id: "wynt39to" # 阿里云验证码场景ID diff --git a/internal/config/config.go b/internal/config/config.go index 3475021..e57762a 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -34,8 +34,6 @@ type Config struct { Muzi MuziConfig `mapstructure:"muzi"` AliPay AliPayConfig `mapstructure:"alipay"` Wxpay WxpayConfig `mapstructure:"wxpay"` - WechatMini WechatMiniConfig `mapstructure:"wechat_mini"` - WechatH5 WechatH5Config `mapstructure:"wechat_h5"` Yushan YushanConfig `mapstructure:"yushan"` TianYanCha TianYanChaConfig `mapstructure:"tianyancha"` Alicloud AlicloudConfig `mapstructure:"alicloud"` @@ -506,7 +504,6 @@ type AliPayConfig struct { // WxpayConfig 微信支付配置 type WxpayConfig struct { - AppID string `mapstructure:"app_id"` MchID string `mapstructure:"mch_id"` MchCertificateSerialNumber string `mapstructure:"mch_certificate_serial_number"` MchApiv3Key string `mapstructure:"mch_apiv3_key"` diff --git a/internal/shared/payment/wechatpay.go b/internal/shared/payment/wechatpay.go index ceeac30..1fd5030 100644 --- a/internal/shared/payment/wechatpay.go +++ b/internal/shared/payment/wechatpay.go @@ -3,12 +3,12 @@ package payment import ( "context" "fmt" + "hyapi-server/internal/config" "net/http" "os" "path/filepath" "strconv" "time" - "hyapi-server/internal/config" "github.com/wechatpay-apiv3/wechatpay-go/core" "github.com/wechatpay-apiv3/wechatpay-go/core/auth/verifiers" @@ -230,9 +230,7 @@ func newWechatPayServiceWithWxPayPubKey(c config.Config, logger *zap.Logger) *We // CreateWechatNativeOrder 创建微信Native（扫码）支付订单 func (w *WechatPayService) CreateWechatNativeOrder(ctx context.Context, amount float64, description string, outTradeNo string) (interface{}, error) { totalAmount := ToWechatAmount(amount) - req := native.PrepayRequest{ - Appid: core.String(w.config.Wxpay.AppID), Mchid: core.String(w.config.Wxpay.MchID), Description: core.String(description), OutTradeNo: core.String(outTradeNo), diff --git a/resources/etc/wxetc_cert/apiclient_cert.p12 b/resources/etc/wxetc_cert/apiclient_cert.p12 deleted file mode 100644 index 81e5d95187e7428f0af76c3be234d439f8353049..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2766 zcmY+EX*3j!8pmhG7>qIYU5pa1wXua5%2=|7ERie`vXo`Ul6?@#lF(4HWv!4b5wd09 z#yUobv1ClPvSh#BbMC$Gy&wMPInVF^oaf^YiG%infHX)PG!4Qa@%Z}VJtiO>Fc$}n z0pp;NXE+pz1E2m=L2_~6%`@~91O%LorGFYAQUC(|_Xijdf`o(V{T_3eP9=LVfmxk1+Cu!d1>x-n4*PQRe?Vybo&$(Io^*H zITKcqV#FfuxVCoFqu-q^aQ>F7BL3!KMwz&3BP$d4up)g$>s#`~rr@_S)^LRQBkJqA zP1UU^^}mK_2&rE-2zniRwTlDA4rzB#*%BVA&oP=TZ1~nT7mF{34oh`U%anx=$%)QI zxCu=WHr_3s4Sc&JAPswQH`Cn%HIA7#Ma%doghlpJH1L(2J04k<^d0lQB>DFyEcG^h zsNbg}85Mm18ENO?BDmcXXkE^wfJVPU*&|C@JJZEf;hR7E7NaUQ^A|A1 zEe(VH<#TcI>RXQtQ1c~+#I21|SNqoJvV3NhA+l%cL%VBZKM=8Ek1!_jmX0G$4liK0 z&5Xz5-&AX|_FU0=z?_g$;2Z1*)o%TnEze079~7IIy1mSJ<3k-LuUYaH$3SB#Yjl;I zCv&sVfm~(ec8*M{r@$%wRKqtJRMzIINvww2*82Oz=I_dx7BNnTQ|I1>qg|WDoa`+*(%VU;8U{UYkmS< zTwvx2dT2;`u<=6Q$jM5+0@sm~c~xHPM;sh4rDRG8%+nCWU-9dJOVvb7VoEnJ?Gp!E zUffNx7HfI+;O6YM9u(O>(%kzLsjfA(yP`gfdU(EhJLKyqDz^MjgX)KbTw_}P>3x-u zXIe`A)eU9N8UglbSkm*)I5Ri>l%u||J-2I58xN<8qWn!1KaW#Z#l^`fXG zxw{L@LY(|izhV5kEW##B(A5WWPRBW0Tn^;ab)x<@TL%=7IfO=k{PA(Gv-d5FlGpW$ z-SETjAEUUgB`wr3&*Is>_omtYmHlhEI^|BlK!aFVLbbN@IZ=VNey5__R;E+A&`hg> zV;U^lpl@C`WShA&67a#P;RX9@5L*eK9|y$$+XUyYNjb#@CmT=dw#(>%E@gn(e=RN3 zi!;!Cjxc-8TR!5}QZNdMqxJtE(dFW3UBNh7r!#DSmfH}<|7Z^i1fBVD{Y;Fj|7Sy* zzik*gb8xh16lL?b4Z%2YcW>;UoCG#uhlEyPOz^eg>vbNUS_(v9~+vgG{4W*eq(?|@Ga3%9@IjE_6R5OY^9_?jCh zJ`kg{CMwRi7j2Z9?VnmoS%Z(Zi7aNcst!~)fyRORW}vA+-Uy=+w?c89b7*;PfARr; zNM|?Yeo@^WhCSZ7sz(fu3|^9b)+w@4H5FJ@SPq6||IS%QN}FNJ+TFAzw@MEk z1VR4Ni_YUr;(hnh9x%jhisSp!=iK{fNPGVL0i|&8>il&& zp(C@bP@b%mnR-0dUHY3|DPOTP=H0ypOI2?iJLOtDpDcLm%eLu4Xadkiwsq`te;KHK z*X1)iEU4TEI?7t@)@Vqg724#5>(Nal_u-_IdY%lDZ5=zWt^`*}X=uDQWc~9=6O@vq1B*0RWWv0*{X;oiSJlyyr@OlU%1J9>q1BT7Q zpu_tD<(qW=tJR@Z?O{vZhJV-*=KW+-wCax6dYePy2AAR2KACs2tL2lTtGxn@>K9YJ zA4aM=?iIhBe@hRi}Cvb?GycMTS9PS92an%ELCF zM^Ro_HB_mCQ|P4g2~Tr%dp9GWzJw zQRj)d=+Z#W^I5NRvNjR@Z`qa)u+y;+1?Pc+IM=A!W=y&5lXs{j4O2b+Ay$rWxj$)U zSI&npuOy_yQ6yORQPNzqTz^}9!4!J}?|>mqJ4lwMSX#plUqWg7mf7AuDik4ql|KxQ zADtkMw=y2C