From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001
From: JaneYork <janeyork1314@163.com>
Date: 星期五, 22 七月 2022 15:27:00 +0800
Subject: [PATCH] 主动设置文件公共读，适配天翼云OSS 主动设置文件公共读，适配天翼云OSS。 天翼云，即便bucket设置公共读，文件默认也是private，除非手动设置，详见天翼云：https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试： 所有兼容S3协议的OSS，已测试：阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛
---
ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java
index 76c60e8..c852ce6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java
@@ -1,6 +1,5 @@
package com.ruoyi.common.excel;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import lombok.Setter;
@@ -64,15 +63,11 @@
if (successCount == 0) {
return "璇诲彇澶辫触锛屾湭瑙ｆ瀽鍒版暟鎹�";
} else {
- if (errorList.size() == 0) {
+ if (errorCount == 0) {
return StrUtil.format("鎭枩鎮紝鍏ㄩ儴璇诲彇鎴愬姛锛佸叡{}鏉�", successCount);
} else {
- return StrUtil.format("閮ㄥ垎璇诲彇鎴愬姛锛屽叾涓垚鍔焮}鏉★紝澶辫触{}鏉★紝閿欒淇℃伅濡備笅锛�<br/>{}",
- successCount,
- errorCount,
- CollUtil.join(errorList, "<br/>"));
+ return "";
}
-
}
}
}
--
Gitblit v1.9.3