From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml
index 0ac1964..cd1ad31 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml
@@ -17,23 +17,6 @@
level:
com.vci: debug
root: info
-###鏈」鐩殑閰嶇疆锛屾敞鎰弒pring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓
-session:
- session-info-storage-type: "database"
- database-platform: oracle
- clear-session-on-start: false
- ###鏄惁寮�鍚敤鎴峰湪绾挎鏌�
- checkSessionTimeout: false
- ###瀹㈡埛绔垽鏂秴鏃惰疆璇㈡椂闂达紝鍗曚綅涓虹
- sessionInterval: 10
- ###瀹㈡埛绔渶澶у瓨鍦ㄦ椂闂达紝鍗曚綅涓哄垎閽�
- sessionIdlTime: 30
- ###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓
- sessionRemind: 3
-user-table-compatibility: "platform1"
-#鍙�2021鐗堟湰鐨勯儴鍒嗘帴鍙ｇ殑褰卞搷锛屼笅闈㈢殑鍐呭闇�瑕侀厤缃紝
-vciPlatform:
- objectServiceUrl: ""
#缂撳瓨
spring:
# redis閰嶇疆
@@ -70,15 +53,46 @@
mvc:
view:
suffix: .html
+
+#骞冲彴鐩稿叧閰嶇疆
+plt:
+ #浜哄憳淇℃伅褰曞叆鏃�,鏄惁闇�瑕佸瘑绾у瓧娈�
+ export-secret-grade: false
+
+###涓氬姟椤圭洰鐨勯厤缃紝娉ㄦ剰spring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓
+session:
+ session-info-storage-type: "database"
+ database-platform: oracle
+ clear-session-on-start: false
+ ###鏄惁寮�鍚敤鎴峰湪绾挎鏌�
+ checkSessionTimeout: false
+ ###瀹㈡埛绔垽鏂秴鏃惰疆璇㈡椂闂达紝鍗曚綅涓虹
+ sessionInterval: 10
+ ###瀹㈡埛绔渶澶у瓨鍦ㄦ椂闂达紝鍗曚綅涓哄垎閽�
+ sessionIdlTime: 30
+ ###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓
+ sessionRemind: 3
+
##web閰嶇疆
vciweb:
debug: true
+#鏂囦欢棰勮閰嶇疆
file-preview:
enabled: true
preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html"
preview-system-key: plt2020
+#feign鍦板潃
+feign:
+ #鎵弿宸ュ叿鏈嶅姟
+ scanServiceUrl: ""
+ #骞冲彴鏈嶅姟
+ pltServiceUrl: ""
+ #鏂囦欢鏈嶅姟
+ fileServiceUrl: ""
+
+#springmvc閰嶇疆
vcispringmvc:
enabled: true
#涓嶆牎楠屽畨鍏ㄧ殑閾炬帴鍦板潃
--
Gitblit v1.9.3