From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改

---
 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 5489e74..a7d63a6 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -25,6 +25,7 @@
 import org.springblade.common.config.FtpConfig;
 import org.springblade.common.utils.FileUtil;
 import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.oss.model.OssFile;
 import org.springblade.core.secure.annotation.PreAuth;
@@ -309,8 +310,9 @@
 		String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
 		//判断文件是不是zip类型
 		if(!fileType.equals("zip")){
-			map.put("data","上传文件类型不符!");
-			return R.data(map);
+//			map.put("data","上传文件类型不符!");
+//			return R.data(map);
+			throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
 		}
 		//FileConfig.localtion是配置文件和config类生产的,测试demo可以直接把FileConfig.localtion替换成D:/test
 		String uuid = UUID.randomUUID().toString();
@@ -411,8 +413,9 @@
 		String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
 		//判断文件是不是zip类型
 		if(!fileType.equals("zip")){
-			map.put("data","上传文件类型不符!");
-			return R.data(map);
+//			map.put("data","上传文件类型不符!");
+//			return R.data(map);
+			throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
 		}
 		//FileConfig.localtion是配置文件和config类生产的,测试demo可以直接把FileConfig.localtion替换成D:/test
 		String uuid = UUID.randomUUID().toString();

--
Gitblit v1.9.3