From 79f0f47f609bd7b166dfcb8e1998a66943930c4a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 28 九月 2023 18:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/application.yml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/igds-web/src/main/resources/application.yml b/igds-web/src/main/resources/application.yml
index d4fc45c..2e7f083 100644
--- a/igds-web/src/main/resources/application.yml
+++ b/igds-web/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ########################## 涓规１鍩庡叧鐪佺伯椋熷偍澶囧簱
spring:
profiles:
- active: pro5012
+ active: dev
application:
name: igds
main:
@@ -14,15 +14,15 @@
date-format: yyyy-MM-dd HH:mm:ss
joda-date-time-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
-
-########################## thymeleaf妯℃澘閰嶇疆 ##########################
+
+ ########################## thymeleaf妯℃澘閰嶇疆 ##########################
thymeleaf:
prefix: classpath:/templates/
suffix: .html
mode: LEGACYHTML5
encoding: UTF-8
- cache: false
-########################## 鎵嬫満APP鍊间粨鍥剧墖涓婁紶澶у皬 ##########################
+ cache: false
+ ########################## 鎵嬫満APP鍊间粨鍥剧墖涓婁紶澶у皬 ##########################
http:
multipart:
maxFileSize: 50Mb
@@ -47,7 +47,9 @@
phone: 400-627-1116
website: http://www.fzzygf.com
address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
- file-path: D:/IGDS/
+ ##浠撳唴瑙嗛鎶撴媿鏃堕棿閰嶇疆0-24
+ snap-time: 12
+ file-path: D:/IGDS/FILE/
## 鎺ㄩ�佸井淇″钩鍙扮殑鍦板潃
warn-path: http://124.71.162.207:8299/igds-wx/gateway
api-path-jg: http://124.71.187.17:8207/supervise/v1/gateway
--
Gitblit v1.9.3