From 56f74569e3e1b981f6b8a3ace675f90f0766b90f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 11 Oct 2020 16:43:40 +0800
Subject: [PATCH] 20201011
---
src/main/resources/application-dev.yml | 84 ++++++++++++++--------------
src/main/resources/application.yml | 74 ++++++++++++------------
2 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 70f014a..62817e8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,43 +1,43 @@
-spring:
- datasource:
- dynamic:
- # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
- p6spy: true
- hikari:
- connection-timeout: 30000
- max-lifetime: 1800000
- max-pool-size: 15
- min-idle: 5
- connection-test-query: select 1
- pool-name: FebsHikariCP
- # 配置默认数据源
- primary: base
- 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/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
-
- redis:
- # Redis数据库索引（默认为 0）
- database: 1
- # Redis服务器地址
- host: 47.114.114.219
- # Redis服务器连接端口
- port: 6379
- # Redis 密码
- password: biyi123
- lettuce:
- pool:
- # 连接池中的最小空闲连接
- min-idle: 8
- # 连接池中的最大空闲连接
- max-idle: 500
- # 连接池最大连接数（使用负值表示没有限制）
- max-active: 2000
- # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-wait: 10000
- # 连接超时时间（毫秒）
+spring:
+ datasource:
+ dynamic:
+ # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
+ p6spy: true
+ hikari:
+ connection-timeout: 30000
+ max-lifetime: 1800000
+ max-pool-size: 15
+ min-idle: 5
+ connection-test-query: select 1
+ pool-name: FebsHikariCP
+ # 配置默认数据源
+ primary: base
+ 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/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+
+ redis:
+ # Redis数据库索引（默认为 0）
+ database: 1
+ # Redis服务器地址
+ host: 47.114.114.219
+ # Redis服务器连接端口
+ port: 6379
+ # Redis 密码
+ password: biyi123
+ lettuce:
+ pool:
+ # 连接池中的最小空闲连接
+ min-idle: 8
+ # 连接池中的最大空闲连接
+ max-idle: 500
+ # 连接池最大连接数（使用负值表示没有限制）
+ max-active: 2000
+ # 连接池最大阻塞等待时间（使用负值表示没有限制）
+ max-wait: 10000
+ # 连接超时时间（毫秒）
timeout: 5000
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 18e42bf..e2e8a2a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,37 +1,37 @@
-server:
- port: 8080
- tomcat:
- uri-encoding: utf-8
-
-spring:
- profiles:
- active: dev
-
- thymeleaf:
- cache: false
-
- jackson:
- date-format: yyyy-MM-dd HH:mm:ss
- time-zone: GMT+8
-
- aop:
- proxy-target-class: true
-
-mybatis-plus:
- type-aliases-package: com.xcong.excoin.*.entity
- mapper-locations: classpath:mapper/*/*.xml
- configuration:
- jdbc-type-for-null: null
- global-config:
- banner: false
- db-config:
- select-strategy: not_empty
-
-logging:
- level:
- com:
- baomidou:
- mybatisplus:
- core:
- metadata:
- TableInfoHelper: error
+server:
+ port: 8080
+ tomcat:
+ uri-encoding: utf-8
+
+spring:
+ profiles:
+ active: dev
+
+ thymeleaf:
+ cache: false
+
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
+
+ aop:
+ proxy-target-class: true
+
+mybatis-plus:
+ type-aliases-package: com.xcong.excoin.*.entity
+ mapper-locations: classpath:mapper/*/*.xml
+ configuration:
+ jdbc-type-for-null: null
+ global-config:
+ banner: false
+ db-config:
+ select-strategy: not_empty
+
+logging:
+ level:
+ com:
+ baomidou:
+ mybatisplus:
+ core:
+ metadata:
+ TableInfoHelper: error
\ No newline at end of file
--
Gitblit v1.9.1