From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/resources/application-dev.yml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 2a663c3..6da9eb5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,10 +15,14 @@
datasource:
# 数据源-1，名称为 base
base:
- username: ct_test
- password: 123456
+# 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_yyg
+ password: yyg123!@#
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
+ url: jdbc:mysql://121.37.162.173:3306/db_yyg?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
@@ -73,5 +77,8 @@
certLocalPath: /home/yyscCert/apiclient_cert.p12
wecharpayMchid: 1631084809
wecharpaySecret: YYSC13875978057YYSC13875978057SH
- gaodeKey: e024c63342930addc57189c8608cdb01
+ gaodeKey: 95ede7157929f5f6b6c758971be924b1
serviceName: yiyuanshucai
+
+system:
+ job: false
\ No newline at end of file
--
Gitblit v1.9.1