From 94e9dc3adb80baf6e1d7d56e54a93917996bc339 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:21:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/resources/application-prod.yml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rest/src/main/resources/application-prod.yml b/rest/src/main/resources/application-prod.yml
index 0c39a9c..5d45f2e 100644
--- a/rest/src/main/resources/application-prod.yml
+++ b/rest/src/main/resources/application-prod.yml
@@ -2,7 +2,7 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.33:8306/xlzx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://192.168.0.84:8306/xlzx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root
password: Root2024!
@@ -11,7 +11,7 @@
max-pool-prepared-statement-per-connection-size: 100
redis:
- host: 192.168.0.33 #地址
+ host: 192.168.0.84 #地址1.95.42.247
port: 8379 #端口
password: RediS2018
timeout: 10000 # 连接超时时间（毫秒）
@@ -23,3 +23,9 @@
max-idle: 10 # 连接池中的最大空闲连接
min-idle: 0 # 连接池中的最小空闲连接
time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
+
+# 支付环境域名（回调-prod）
+alipay:
+ domain: http://m.xintongtong.cn:8081/rest
+wxpay:
+ domain: http://m.xintongtong.cn:8081/rest
\ No newline at end of file
--
Gitblit v1.7.1