From 097bbb9b55a7c4efa0353f79d3686310889b1599 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Tue, 1 Jul 2025 00:52:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0rabbitmq=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wechat/WechatPayController.java | 14 +++++----- src/main/resources/apiclient_key.pem | 28 +++++++++++++++++++ src/main/resources/application-caozhe.yml | 2 +- src/main/resources/application-dev.yml | 14 ++++++++-- src/main/resources/application-practice.yml | 4 +-- src/main/resources/application-test.yml | 12 ++++---- 6 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/apiclient_key.pem diff --git a/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayController.java b/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayController.java index 131d679..c3fbae0 100644 --- a/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayController.java +++ b/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayController.java @@ -60,10 +60,10 @@ public class WechatPayController { /** - * JSAPI 下单（商品类） + * JSAPI 下单 */ @PostMapping("/payment/create") - @Operation(summary = "JSAPI 下单（商品类）", description = "参数：订单id, 权限：所有人, 方法名：createPayment") + @Operation(summary = "JSAPI 下单", description = "参数：订单id, 权限：所有人, 方法名：createPayment") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) public BaseResponse createPayment(@Valid @RequestBody WechatPayRequest wechatPayRequest, HttpServletRequest request) { @@ -98,11 +98,11 @@ public class WechatPayController { /** - * JSAPI 下单回调（商品类） + * JSAPI 下单回调 */ @Hidden @PostMapping("/payment/callback") - @Operation(summary = "JSAPI 下单回调（商品类）", description = "参数：订单id, 权限：所有人, 方法名：callbackPayment") + @Operation(summary = "JSAPI 下单回调", description = "参数：订单id, 权限：所有人, 方法名：callbackPayment") public synchronized BaseResponse callbackPayment(HttpServletRequest request) throws IOException { // 获取下单信息 Transaction transaction = weChatService.getTransactionInfo(request); @@ -122,11 +122,11 @@ public class WechatPayController { @Operation(summary = "Web管理员部分退款", description = "参数：订单id, 权限：web端管理员, 方法名：createPartRefund") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse createPartRefund(@Valid @RequestBody CommonRequest commonRequest) { - Long courseOrderId = commonRequest.getId(); - CourseOrder courseOrder = courseOrderService.getById(courseOrderId); + Long orderId = commonRequest.getId(); + CourseOrder courseOrder = courseOrderService.getById(orderId); ThrowUtils.throwIf(courseOrder == null, ErrorCode.OPERATION_ERROR, "订单不存在"); - Refund refund = weChatService.refundPartPayment(String.valueOf(courseOrderId), courseOrder.getTotalAmount()); + Refund refund = weChatService.refundPartPayment(String.valueOf(orderId), courseOrder.getTotalAmount()); return ResultUtils.success(refund); } diff --git a/src/main/resources/apiclient_key.pem b/src/main/resources/apiclient_key.pem new file mode 100644 index 0000000..81400ad --- /dev/null +++ b/src/main/resources/apiclient_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDQvDoLQ9+041aV +lLvDgIdhenuq54wx+UeuIWd2Zc4E4Io+47PCr6kzpbkLhq47//dKAG1Fobb2vCRu +HG+CUfhkOzYLxt9qC4k9TOAtQPWp3Hc3dTldw42C/pGzh8aro7rHtpRHDzQYdJgB +w4dPQ0+RoZ2U9meiGWsy2DVOydPVxabxN9gFeeP5FRKjZP2JUAoKJRgWrBD9Fgyn +mX/crOa8z5HTBK/LY+jBy57Bp9ZpUS9nDIpXSgdI7mZn3xvLmGfjki8WG9X8Ad99 +jvyTzD0HDcm7XoGo+Rp2Evh0pqQQf33R/OkH1WIFtcrqfwGUugTLDfIrFvDr3Qgc +KE2Z2U7pAgMBAAECggEAXgIn8iLjgchRmpSd6/LbBh/vyoz2KxumGNqaikxXeQLX +wHM05p3OiqA8suA5YHRrnzyJ+i5XBNC/Z4gPAJaCVEIGmU88F7qSWLVi0X7MJXBR +kPyOlZgZB8I3RLAF3g+jc4bbSRWj1M/OFh1Ft4ENOP2cxxYinnLsQL33ZECp00Cc +IXlX4lqjkoFbBaeCZLEV5tzZ3R/NsYZ5HTtvEh+vX7WdIqmgfL/cndfC+fIlWqbi +kKITyfI//Ik02/07qbFaZOwCLAQccUBT/0K8v7b0rqr0XeiqN3a+lXkVY6DpFxXx +aplsZ8rljBZ51AcAw8bS/JpwMkAQ5tYbgN2luEq3MQKBgQD/x2yk6YECbutRDsFA +EOlZK1cwMbJSkCMgVxIrfzv0Ubj937CCzZ7StxiHCxAa3+Oj8uX3aL57ZEatudyU +PsbZP6WWMqD3HiWUZoD1qcqRbp57FR9a3sFkgXoN9o93xdLiUS8LVAVLaqGSfO76 +o7euReXlK+hNAFmkAwFsPnVdawKBgQDQ6mWSaefUfDVddw8mPdgCtjCIKMBWTNs9 +U0ygVEsDs2FDxcC8175GQBbCNvtgh7DxWfOs847TVjH2CpZk74vSyt0Y59295Xx+ +t4Vn3CHCBxvYGIRCTOXjBRRUOxQLXjb+X6XN3y9pxhkhVdwr5m5q49JIWcNyNuAJ +LTqq6CLl+wKBgAjaAeyDGC/ZXtNjS1TIQQsQ8Od+EMnCqzSHTt2qfYyq91fx0c31 +B7YLGBI0U85aSSp3UXYKbe0fP0Lr17JZqdAC39wezGtA49QK6BOYWKZHybxAsuEW +LGMqB+tLyRNACVhDrvkZY0WE3yqOoEaUO9sQGDCiIFvp0zBV2krArpcZAoGAHiwM +GVY0RireJi6AwJwj61hWsAN6q7wT2cqDAZDK+LDadkhEKsHZ2Bl/b/My4OEX+/Nq +zuqqEPmc45Tp3Y//GKV1wxgRnVBcZ4yntrVDJtuR+Oapi03B0cS1B+k0XuPve1Nj +BdWa6mLS1E6rKqfwAH4Aq7RTFta4Cns+wtod2CsCgYAu7gHrFJfB6C/Dl93ZXTiL +HQdxpk0+L0hmXYaHFVK+0L2lswd7jlx6NLE3CNKEbUVr2fdhi8Qr2PLqiK/sAUCD +yRN6z17oSZ6eUfax5wKO5yXkuKq9DAoWpLitLgQmrxV1xfBx/q8ojVnFAG17q3F+ +lN+FSz/IRCR9pAaVuVKw0w== +-----END PRIVATE KEY----- diff --git a/src/main/resources/application-caozhe.yml b/src/main/resources/application-caozhe.yml index 33bdd20..ba51d0f 100644 --- a/src/main/resources/application-caozhe.yml +++ b/src/main/resources/application-caozhe.yml @@ -19,7 +19,7 @@ spring: data: redis: port: 6379 - host: 27.30.77.229 + host: 160.202.242.36 database: 7 password: Cksys6509 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 73dfe6d..624945b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://27.30.77.229:3306/qingcheng_dev?serverTimezone=Asia/Shanghai + url: jdbc:mysql://160.202.242.36:3306/qingcheng_dev?serverTimezone=Asia/Shanghai username: qingcheng password: Qc@8ls2jf hikari: @@ -9,11 +9,21 @@ spring: max-lifetime: 120000 + rabbitmq: + host: 160.202.242.36 + port: 5672 + username: qingcheng + password: cksys6509 + virtual-host: vhost + listener: + simple: + prefetch: 1 + data: redis: port: 6379 - host: 27.30.77.229 + host: 160.202.242.36 database: 9 password: Cksys6509 diff --git a/src/main/resources/application-practice.yml b/src/main/resources/application-practice.yml index 69d6630..2802fca 100644 --- a/src/main/resources/application-practice.yml +++ b/src/main/resources/application-practice.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://27.30.77.229:3306/qingcheng_practice?serverTimezone=Asia/Shanghai + url: jdbc:mysql://160.202.242.36:3306/qingcheng_practice?serverTimezone=Asia/Shanghai username: yyt&jwh password: Qc@A8k3M5q2 hikari: @@ -13,7 +13,7 @@ spring: data: redis: port: 6379 - host: 27.30.77.229 + host: 160.202.242.36 database: 10 password: Cksys6509 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d8ad409..85e5a46 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://27.30.77.229:3306/qingcheng_test?serverTimezone=Asia/Shanghai + url: jdbc:mysql://160.202.242.36:3306/qingcheng_test?serverTimezone=Asia/Shanghai username: qingcheng password: Qc@8ls2jf hikari: @@ -13,7 +13,7 @@ spring: data: redis: port: 6379 - host: 27.30.77.229 + host: 160.202.242.36 database: 8 password: Cksys6509 @@ -75,12 +75,12 @@ wx: appId: wx61b63e27bddf4ea2 #商户号 merchantId: 1700326544 - # #商户API私钥 - # privateKeyPath: apiclient_key.pem + #商户API私钥 + privateKeyPath: apiclient_key.pem #商户证书序列号 merchantSerialNumber: 6DC8953AB741D309920DA650B92F837BE38A2757 - # #商户APIv3密钥 - # apiV3Key: fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t + #商户APIv3密钥 + apiV3Key: fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t #通知地址 notifyUrl: https://winning-mouse-internally.ngrok-free.app #微信服务器地址