From 010f4ba252db180fc7fea4d7cb1b84a0bca7479f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Aug 2023 16:37:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/resources/application-dev.yml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 49177d8..e8df1b7 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -13,13 +13,15 @@
spring:
profiles:
active: dev
- include: specialCity
+ include: bulletin, specialCity, announcement
application:
name: screen-api
+ main:
+ allow-bean-definition-overriding: true
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -34,9 +36,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QX_moral_2023
timeout: 30000
database: 15
pool:
@@ -54,9 +56,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: moral_123456
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk05.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: moral_qx
+ password: QX_moral_2023
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0