From acb0dc47e516cf6942ebe268d9a3fce7944963b9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 12:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/application-dev.yml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index d1498d7..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
@@ -65,6 +67,12 @@
driver-class-name: com.mysql.cj.jdbc.Driver
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
@@ -116,6 +124,7 @@
- /swagger-ui.html/**
- /webjars/**
- /verificationCode/**
+ - /static/**
AES:
KEY:
--
Gitblit v1.8.0