From 45fd7657de7187da8a819cbfc9241b6df2d7ee5c Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 27 九月 2023 14:06:37 +0800
Subject: [PATCH] 平台端
---
server/src/main/resources/application.yml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 72fcf23..3d9a01d 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -5,12 +5,15 @@
env: development
# env: production
-
spring:
# application:
-# name: doumeemes
+# name: doumeemes
profiles:
- active: standard
+<<<<<<< HEAD
+ active: standardTest
+=======
+ active: standardLingyang
+>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
@@ -32,7 +35,7 @@
cache:
session:
# 浼氳瘽杩囨湡鏃堕暱(s)
- expire: 18000
+ expire: 36000
captcha:
# 楠岃瘉鐮佽繃鏈熸椂闀�(s)
expire: 300
--
Gitblit v1.9.3