From c386b102a2397d569131e3a459465ba84e2376be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 14:27:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/resources/application-dev.yml | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index ae6cbd3..0dc6f52 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -1,25 +1,17 @@
server:
port: 8081
- tomcat:
- uri-encoding: UTF-8
- #���������������
- min-spare-threads: 500
- #���������������
- max-threads: 2500
- #���������������
- max-connections: 6500
- #������������������������
- accept-count: 1000
spring:
profiles:
active: dev
include: bulletin, specialCity, announcement
application:
name: screen-api
+ main:
+ allow-bean-definition-overriding: true
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QxPcRedis_moarl_2320
timeout: 30000
jedis:
pool:
@@ -34,9 +26,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QxPcRedis_moarl_2320
timeout: 30000
database: 15
pool:
@@ -54,9 +46,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
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk18.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: moral_qx
- password: moral_qx_12345
+ password: QxPcRedis_moarl_2320
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0