From 7b3d5fb08fdbd2ce574c3b9ab666c8c7082be728 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 06 九月 2024 15:38:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-dev.yml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..c541904 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:
@@ -38,11 +38,11 @@
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
@@ -73,9 +73,16 @@
##web閰嶇疆
vciweb:
debug: true
+
file-preview:
enabled: true
preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html"
preview-system-key: plt2020
+vcispringmvc:
+ enabled: true
+ #涓嶆牎楠屽畨鍏ㄧ殑閾炬帴鍦板潃
+ un-check-urls:
+ #涓嶆洿鏂拌姹傛椂闂寸殑閾炬帴鍦板潃
+ un-storage-request-time-urls:
--
Gitblit v1.9.3