From 7029a780a1738bffdb6b00fa94d7b845f9444a5d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 08:31:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into cjl
---
screen-api/src/main/resources/application-dev.yml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 730e702..44d60b5 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -13,8 +13,7 @@
spring:
profiles:
active: dev
- include:
- moduleFormColumn
+ include: bulletin, specialCity, announcement
application:
name: screen-api
redis:
@@ -67,6 +66,12 @@
max-conn-lifetime-millis: 20
test-on-return: false
+ servlet:
+ multipart:
+ enabled: true
+ max-file-size: 2MB
+ max-request-size: 2MB
+
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
global-config:
@@ -106,7 +111,8 @@
retries: 0
servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
groupId:
- second-data: SecondsDataGroup
+ second-data: Dev_SecondsDataGroup
+ cruiser-data: Dev_CruiserDataGroup
mvc:
interceptor:
exclude:
@@ -116,6 +122,7 @@
- /swagger-ui.html/**
- /webjars/**
- /verificationCode/**
+ - /static/**
AES:
KEY:
--
Gitblit v1.8.0