From 369d5cb00b6c87dbb5e6ea6b3482742e034c27ea Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 24 Apr 2025 10:49:07 +0800
Subject: [PATCH] feat(mall): 更新订单状态逻辑并调整支付相关功能
---
src/main/resources/application-dev.yml | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3f5844d..6f68131 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,28 +15,20 @@
datasource:
# 数据源-1，名称为 base
base:
-# username: ct_test
-# password: 123456
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
- username: db_mall_qianayi
- password: db_mall_qianayi123!@#123
+ username: db_blnka
+ password: blnka!@#123
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://121.37.162.173:3306/db_mall_qianayi?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
-# username: db_mall
-# password: mall!@#123
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://47.111.90.145:3306/db_mall?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://121.37.162.173:3306/db_blnka?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
- database: 8
+ database: 4
# Redis服务器地址
- host: 121.37.162.173
+ host: 120.27.238.55
# Redis服务器连接端口
- port: 6379
+ port: 6479
# Redis 密码
- password: d32ncxe@i3#!dV
+ password: d3y6dsdl;f.327
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -48,12 +40,12 @@
# 连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: 10000
# 连接超时时间（毫秒）
- timeout: 5000
+ timeout: 500000
rabbitmq:
- host: 121.37.162.173
+ host: 120.27.238.55
port: 5672
- username: hibit
- password: hibit123
+ username: ct_rabbit
+ password: 123456
publisher-confirm-type: correlated
pay:
@@ -67,18 +59,32 @@
noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
domain: https://openapi.alipaydev.com/gateway.do
+#xcx:
+# wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+# xcx_appid: wx5cc58f796224af61
+# xcx_secret: 71403646f666f9b9dca308d4f357765c
+# debug: true
+# wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
+# certLocalPath: /home/xuncongCert/apiclient_cert.p12
+# wecharpayMchid: 1605533690
+# wecharpaySecret: CSxc168888CSxc168888CSxc168888xc
xcx:
wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
- xcx_appid: wxfb1acf504eb9d058
- xcx_secret: 7ee226a964b1be7cfb96f5e0dc739c44
+ xcx_appid: wx2948b3b914a9722e
+ xcx_secret: 1685dfd99a43e213ed8be07870b898ba
debug: false
- wecharPaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/wxpayCallback
- wecharRechargePaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/rechargeCallBack
- certLocalPath: /home/qianayiCert/apiclient_cert.p12
- wecharpayMchid: 1638095860
- wecharpaySecret: QIANAYIZONGZI1234567899876543212
+ wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
+ wecharRechargePaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/rechargeCallBack
+ certLocalPath: /home/yyscCert/apiclient_cert.p12
+ wecharpayMchid: 1631084809
+ wecharpaySecret: YYSC13875978057YYSC13875978057SH
gaodeKey: 95ede7157929f5f6b6c758971be924b1
serviceName: yiyuanshucai
+static:
+ resource:
+ url: http://blnka.csxuncong.com/file/
+ path: /mnt/sdc/webresource/file/
+
system:
- job: true
\ No newline at end of file
+ job: false
\ No newline at end of file
--
Gitblit v1.9.1