From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 84 ++++--------------------------------------
1 files changed, 8 insertions(+), 76 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8f4aecb..a5af357 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -1,22 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.9.2
- # 鐗堟潈骞翠唤
- copyrightYear: 2026
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
# 寮�鍙戠幆澧冮厤缃�
server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8002
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080锛屾湇鍔″櫒鏂拌仛鍚庣涓�9509
+ port: 9509
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -37,16 +22,12 @@
com.ruoyi: debug
org.springframework: warn
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
# Spring閰嶇疆
spring:
+ # 涓氬姟浠ｇ爜瀛樺湪 InsReportServiceImpl <-> RawMaterialOrderServiceImpl 鐨勫惊鐜緷璧栵紝
+ # 婧愬伐绋嬬敤 Spring Boot 2.5锛堥粯璁ゅ厑璁革級锛屽崌绾у埌 Boot 4 鍚庨渶鏄惧紡鏀惧紑
+ main:
+ allow-circular-references: true
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
@@ -57,9 +38,9 @@
servlet:
multipart:
# 鍗曚釜鏂囦欢澶у皬
- max-file-size: 10MB
+ max-file-size: 200MB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 20MB
+ max-request-size: 400MB
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
@@ -68,39 +49,6 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
- data:
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: 192.168.0.24
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
- password:
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
-
# MyBatis-Plus閰嶇疆
mybatis-plus:
# 鎼滅储鎸囧畾鍖呭埆鍚�
@@ -134,19 +82,3 @@
display-name: '娴嬭瘯妯″潡'
paths-to-match: '/**'
packages-to-scan: com.ruoyi
-
-# 闃茬洍閾鹃厤缃�
-referer:
- # 闃茬洍閾惧紑鍏�
- enabled: false
- # 鍏佽鐨勫煙鍚嶅垪琛�
- allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
--
Gitblit v1.9.3