From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 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 a0b685b..6147694 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
@@ -6,7 +6,7 @@
private-token-key: vciweb20210212
###tomcat鐩稿叧鐨勯厤缃�
server:
- port: 12000
+ port: 12005
servlet:
context-path: /web
tomcat:
@@ -17,32 +17,15 @@
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閰嶇疆
redis: ###### redis 閰嶇疆
- enabled: false #true锛屽惎鐢╮edi锛宖alse涓嶅惎鐢紝榛樿false,閰嶇疆鏂囦欢娌℃湁杩欎簺榛樿涓嶅惎鐢╮edis
- host: vciserver # ip鍦板潃
- database: 0 # redis鏁版嵁搴� 0-15
+ enabled: true #true锛屽惎鐢╮edi锛宖alse涓嶅惎鐢紝榛樿false,閰嶇疆鏂囦欢娌℃湁杩欎簺榛樿涓嶅惎鐢╮edis
+ host: localhost # ip鍦板潃
+ database: 2 # redis鏁版嵁搴� 0-15
port: 6379 # 绔彛鍙�
- password: vcitest # 鏃犲瘑鐮佷笉濉�
+ password: foobared # 鏃犲瘑鐮佷笉濉�
timeout: 30000s # 杩炴帴瓒呮椂鏃堕棿 锛堥粯璁�1澶╋級
lettuce:
shutdown-timeout: 100ms # 鍏抽棴瓒呮椂鏃堕棿 榛樿 100ms
@@ -70,12 +53,50 @@
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
+ #涓嶆牎楠屽畨鍏ㄧ殑閾炬帴鍦板潃
+ un-check-urls:
+ #涓嶆洿鏂拌姹傛椂闂寸殑閾炬帴鍦板潃
+ un-storage-request-time-urls:
--
Gitblit v1.9.3