From 935b27a40c549f3ebc15e7e9654cdfd01e8eab13 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 04 Jun 2024 11:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
target/classes/application.yml | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/target/classes/application.yml b/target/classes/application.yml
index 1f7c668..0b78733 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -63,21 +63,7 @@
time-zone: Asia/Kolkata
profiles:
active: druid
- flyway:
- enabled: true
- # 禁止清理数据库表
- clean-disabled: false
- # 如果数据库不是空表，需要设置成 true，否则启动报错
- baseline-on-migrate: true
- # 与 baseline-on-migrate: true 搭配使用
- baseline-version: 0
- #数据库连接配置
- url: ${spring.datasource.url}
- user: ${spring.datasource.name}
- password: ${spring.datasource.password}
- locations: classpath:db/migration/ #（根据个人情况设置,多个路径使用逗号分隔）
- #版本控制日志表，默认flyway_schema_history
- table: flyway_schema_history
+
# 文件上传
servlet:
multipart:
@@ -122,16 +108,17 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://14.128.50.174:6306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- name: root
- password: f6fac591b6fcd9d6
+ 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
+ username: root
+ password: 123456
druid:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
- maxActive: 20
+ maxActive: 50
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
--
Gitblit v1.9.3