From cdc16c48e3130408d3689afc134ee312c35347b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 02 七月 2025 16:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java | 5 +++++
src/main/resources/application.yml | 10 ++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
index f46d3ae..76831bc 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
@@ -42,6 +42,11 @@
@Override
public int deleteSalesLedgerByIds(Long[] ids) {
+ for (Long id : ids) {
+ if (id == null) {
+ return 1;
+ }
+ }
return commonFileMapper.deleteBatchIds(Arrays.asList(ids));
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6643c25..e1ac4d3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -58,14 +58,14 @@
servlet:
multipart:
# 鍗曚釜鏂囦欢澶у皬
- max-file-size: 10MB
+ max-file-size: 1GB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 20MB
+ max-request-size: 2GB
# 鏈嶅姟妯″潡
devtools:
restart:
# 鐑儴缃插紑鍏�
- enabled: true
+ enabled: false
# redis 閰嶇疆
redis:
# 鍦板潃
@@ -75,7 +75,9 @@
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
-# password: root2022!
+ password: root2022!
+# password: 123456
+
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
--
Gitblit v1.9.3