From ce9b2b7009c7a140fbbb05d40e2e4f67c0c95cbe Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 26 Feb 2021 15:35:31 +0800 Subject: [PATCH] 20210226 指纹和消息提醒功能 --- src/main/resources/application.yml | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5b64d75..69b6898 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,16 +5,12 @@ spring: profiles: - active: dev + active: test datasource: -<<<<<<< HEAD # url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 # username: ctcoin_data # password: ctcoin_123 - url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 -======= - url: jdbc:mysql://120.27.238.55:3306/db_base?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 ->>>>>>> master + url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: ct_test password: 123456 driver-class-name: com.mysql.jdbc.Driver @@ -57,11 +53,11 @@ ## Redis数据库索引(默认为0) database: 1 ## Redis服务器地址 - host: 47.114.114.219 + host: 120.27.238.55 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码(默认为空) - password: biyi123 + password: xcong123 jedis: pool: ## 连接池最大连接数(使用负值表示没有限制) -- Gitblit v1.9.1