From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/application-dev.yml | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 03d4b28..4e093b1 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -1,26 +1,19 @@
server:
port: 8081
- tomcat:
- uri-encoding: UTF-8
- #���������������
- min-spare-threads: 500
- #���������������
- max-threads: 2500
- #���������������
- max-connections: 6500
- #������������������������
- accept-count: 1000
+ servlet:
+ context-path: /api
spring:
profiles:
active: dev
- include:
- moduleFormColumn
+ include: bulletin, specialCity, announcement
application:
- name: screen-manage
+ 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_123456
+ password: QxPcRedis_moarl_2320
timeout: 30000
jedis:
pool:
@@ -35,9 +28,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_123456
+ password: QxPcRedis_moarl_2320
timeout: 30000
database: 15
pool:
@@ -55,9 +48,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-bp1pr3rx9m3fnkwsk18.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: moral_qx
+ password: QxPcRedis_moarl_2320
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -66,6 +59,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
@@ -92,7 +91,7 @@
enable:
auto:
commit: false
- servers: 192.168.0.191:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
session:
timeout: 6000
zookeeper:
@@ -104,20 +103,27 @@
memory: 40960
linger: 1
retries: 0
- servers: 72.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ groupId:
+ second-data: Dev_SecondsDataGroup
+ cruiser-data: Dev_CruiserDataGroup
mvc:
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
- /webjars/**
- /verificationCode/**
-
+ - /static/**
+ - /file/preview/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
TOKEN:
KEY:
- foh3wi2ooghiCh5
\ No newline at end of file
+ foh3wi2ooghiCh5
+file:
+ path: /data/upload/
\ No newline at end of file
--
Gitblit v1.8.0