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-prod.yml | 106 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-prod.yml b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-prod.yml
index 6f287af..707f55d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-prod.yml
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/application-prod.yml
@@ -9,13 +9,57 @@
port: 12000
servlet:
context-path: /web
+ tomcat:
+ uri-encoding: UTF-8
###log4j2鐨勯厤缃紝闇�瑕佸摢涓寘涓嬬殑鏂囦欢寮�鍚煇涓瓑绾э紝灏辩洿鎺xxxx: yy杩欐牱鏂瑰紡
logging:
config: "classpath:log4j2-spring-prod.xml"
level:
com.vci: debug
root: info
-###鏈」鐩殑閰嶇疆锛屾敞鎰弒pring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓
+#缂撳瓨
+spring:
+ # redis閰嶇疆
+ redis: ###### redis 閰嶇疆
+ enabled: true #true锛屽惎鐢╮edi锛宖alse涓嶅惎鐢紝榛樿false,閰嶇疆鏂囦欢娌℃湁杩欎簺榛樿涓嶅惎鐢╮edis
+ host: localhost # ip鍦板潃
+ database: 2 # redis鏁版嵁搴� 0-15
+ port: 6379 # 绔彛鍙�
+ password: foobared # 鏃犲瘑鐮佷笉濉�
+ timeout: 30000s # 杩炴帴瓒呮椂鏃堕棿 锛堥粯璁�1澶╋級
+ lettuce:
+ shutdown-timeout: 100ms # 鍏抽棴瓒呮椂鏃堕棿 榛樿 100ms
+ pool: # lettuce 杩炴帴姹�
+ max-active: 8 # 杩炴帴姹犳渶澶ц繛鎺ユ暟 榛樿 8锛�-1 锛氳〃绀烘病鏈夐檺鍒讹級
+ max-wait: 60000ms # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂� 榛樿-1ms 锛�-1 :琛ㄧず娌℃湁闄愬埗锛� 杩欓噷璁剧疆1鍒嗛挓
+ max-idle: 8 # 鏈�澶х┖闂茶繛鎺� 榛樿 8
+ min-idle: 0 # 鏈�灏忕┖闂茶繛鎺� 榛樿 0
+ resources:
+ chain:
+ cache: false
+ strategy:
+ content:
+ enabled: true
+ paths: /**
+ cache:
+ type: ehcache
+ servlet:
+ multipart:
+ enabled: true
+ ###鍗曚釜鏂囦欢澶у皬锛�50M
+ max-file-size: 52428800
+ ###鎬讳笂浼犵殑鏂囦欢澶у皬锛�50M
+ max-request-size: 52428800
+ mvc:
+ view:
+ suffix: .html
+
+#骞冲彴鐩稿叧閰嶇疆
+plt:
+ #浜哄憳淇℃伅褰曞叆鏃�,鏄惁闇�瑕佸瘑绾у瓧娈�
+ export-secret-grade: false
+
+###涓氬姟椤圭洰鐨勯厤缃紝娉ㄦ剰spring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓
session:
session-info-storage-type: "database"
database-platform: oracle
@@ -28,44 +72,30 @@
sessionIdlTime: 30
###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓
sessionRemind: 3
-###鍏煎鎬э紝蹇呴』璁剧疆涓鸿繖涓�
-user-table-compatibility: "platform1"
-#缂撳瓨閰嶇疆
-###corba鐨勯厤缃�
-jacorb:
- client:
- enabled: true
- url: "corbaloc::localhost:30000/NameService"
- instanceIdentity: "platform-sf"
-#鍙�2021鐗堟湰鐨勯儴鍒嗘帴鍙ｇ殑褰卞搷锛屼笅闈㈢殑鍐呭闇�瑕侀厤缃紝
-vciPlatform:
- objectServiceUrl: "2"
-#缂撳瓨
-spring:
- # redis閰嶇疆
- redis: ###### redis 閰嶇疆
- enabled: false #true锛屽惎鐢╮edi锛宖alse涓嶅惎鐢紝榛樿false,閰嶇疆鏂囦欢娌℃湁杩欎簺榛樿涓嶅惎鐢╮edis
- host: vciserver # ip鍦板潃
- database: 0 # redis鏁版嵁搴� 0-15
- port: 6379 # 绔彛鍙�
- password: vcitest # 鏃犲瘑鐮佷笉濉�
- timeout: 30000s # 杩炴帴瓒呮椂鏃堕棿 锛堥粯璁�1澶╋級
- lettuce:
- shutdown-timeout: 100ms # 鍏抽棴瓒呮椂鏃堕棿 榛樿 100ms
- pool: # lettuce 杩炴帴姹�
- max-active: 8 # 杩炴帴姹犳渶澶ц繛鎺ユ暟 榛樿 8锛�-1 锛氳〃绀烘病鏈夐檺鍒讹級
- max-wait: 60000ms # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂� 榛樿-1ms 锛�-1 :琛ㄧず娌℃湁闄愬埗锛� 杩欓噷璁剧疆1鍒嗛挓
- max-idle: 8 # 鏈�澶х┖闂茶繛鎺� 榛樿 8
- min-idle: 0 # 鏈�灏忕┖闂茶繛鎺� 榛樿 0
- cache:
- type: ehcache
- config:
- location:
- mvc:
- view:
- suffix: ".html"
+
##web閰嶇疆
vciweb:
debug: true
-cors:
+
+#鏂囦欢棰勮閰嶇疆
+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:
\ No newline at end of file
--
Gitblit v1.9.3