Browse Source

修改bug:资料填报>>保存会报错

lvy 3 months ago
parent
commit
6ce360818e

+ 6 - 3
blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -2,6 +2,7 @@ package org.springblade.common.utils;
 
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.func.Func;
 import cn.hutool.core.lang.func.Func;
+import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -28,9 +29,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.ColorConvertOp;
 import java.awt.image.ColorConvertOp;
 import java.io.*;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.*;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.*;
 import java.util.List;
 import java.util.List;
@@ -43,6 +42,7 @@ import java.util.zip.ZipOutputStream;
 
 
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.MetadataException;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.ResourceUtils;
+import org.springframework.web.util.UriUtils;
 
 
 /**
 /**
  * 通用工具类
  * 通用工具类
@@ -144,6 +144,9 @@ public class CommonUtil {
     public static InputStream getOSSInputStream(String urlStr) {
     public static InputStream getOSSInputStream(String urlStr) {
         try {
         try {
             urlStr = replaceOssUrl(urlStr);
             urlStr = replaceOssUrl(urlStr);
+            int lastIndex = urlStr.lastIndexOf("/") + 1;
+            String fileName = urlStr.substring(lastIndex);
+            urlStr = urlStr.substring(0, lastIndex) + URLEncoder.encode(fileName, "UTF-8").replace("+", "%20");
             //获取OSS文件流
             //获取OSS文件流
             URL url = new URL(urlStr);
             URL url = new URL(urlStr);
             URLConnection conn = url.openConnection();
             URLConnection conn = url.openConnection();