From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/resources/application-local.yml | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/resources/application-local.yml b/screen-api/src/main/resources/application-local.yml
index 23c69e1..f75bd80 100644
--- a/screen-api/src/main/resources/application-local.yml
+++ b/screen-api/src/main/resources/application-local.yml
@@ -13,12 +13,13 @@
spring:
profiles:
active: dev
+ include: bulletin, specialCity, announcement
application:
- name: screen-manage
+ name: screen-api
redis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -33,9 +34,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QX_moral_2023
timeout: 30000
database: 15
pool:
@@ -43,7 +44,6 @@
max-wait: 30000
max-idle: 64
min-idle: 32
-
datasource:
minIdle: 1
time-between-eviction-runs-millis: 60000
@@ -53,9 +53,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o.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-bp1pr3rx9m3fnkwsk8o13.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
@@ -64,6 +64,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: 10MB
+ max-request-size: 10MB
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
@@ -79,12 +85,15 @@
kafka:
listener:
+ # ���������������������������������������������������
ack-mode: manual_immediate
consumer:
auto:
offset:
reset: latest
+ # ��������������������������������������������������������� ���������*���������
concurrency: 3
+ # ������������������������������������������true������������������������������������������������������������������������false������������������������������
enable:
auto:
commit: false
@@ -99,21 +108,30 @@
buffer:
memory: 40960
linger: 1
+ # ������������������������������������������
retries: 0
servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
+ groupId:
+ second-data: SecondsDataGroup1
+ cruiser-data: cruiserDataGroup1
mvc:
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
- /webjars/**
- /verificationCode/**
+ - /static/**
+ - /file/**
+
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
TOKEN:
KEY:
- foh3wi2ooghiCh5
\ No newline at end of file
+ foh3wi2ooghiCh5
+
--
Gitblit v1.8.0