From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/resources/application.yml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/application.yml b/server/meeting/meeting_admin/src/main/resources/application.yml
index 5ed0488..7d88e9d 100644
--- a/server/meeting/meeting_admin/src/main/resources/application.yml
+++ b/server/meeting/meeting_admin/src/main/resources/application.yml
@@ -6,12 +6,8 @@
# env: production
spring:
- # application:
- # name: doumeemes
- profiles:
- active: dev
-
-
+ application:
+ name: meetingAdmin
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
@@ -23,6 +19,9 @@
max-file-size: 200MB
max-request-size: 200MB
enabled: true
+ main:
+ allow-circular-references: true
+
# MyBatis閰嶇疆
mybatis-plus:
mapper-locations: classpath*:/mappers/**/*.xml
@@ -35,7 +34,7 @@
cache:
session:
# 浼氳瘽杩囨湡鏃堕暱(s)
- expire: 18000
+ expire: 1800
captcha:
# 楠岃瘉鐮佽繃鏈熸椂闀�(s)
expire: 300
@@ -63,6 +62,17 @@
enable: true
username: admin
password: 111111
+ main:
+ allow-circular-references: true
+# Swagger閰嶇疆
+
+swagger:
+ host:
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
--
Gitblit v1.9.3