From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-api/src/main/resources/application-dev.yml | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 8619aca..606db00 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -1,21 +1,13 @@
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-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
--
Gitblit v1.8.0