From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg
---
src/main/resources/application.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65302fc..a0ddd59 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -104,7 +104,7 @@
# 地址
host: localhost
# 端口，默认为6379
- port: 6379
+ port: 6380
# 数据库索引
database: 0
# 密码
@@ -124,10 +124,10 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# url: jdbc:mysql://127.0.0.1:3306/cgstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:6306/stock-rg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # url: jdbc:mysql://127.0.0.1:3306/cgstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: 5e1b2ec6f2a06397
druid:
# 初始连接数
initialSize: 5
--
Gitblit v1.9.3