Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613

adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java

@@ -348,7 +348,6 @@ public class AttFileEOController {
             String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request);
             response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
             response.setContentType("application/octet-stream");
-            response.setCharacterEncoding("UTF-8");
             File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
             is = new FileInputStream(file);
             os = response.getOutputStream();
@@ -497,7 +496,8 @@ public class AttFileEOController {
                     + base64Encoder.encode(fileName.getBytes("utf-8")) + "?=";*/
             fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器
         } else {
-            fileName = URLEncoder.encode(fileName, "utf-8");
+            //fileName = URLEncoder.encode(fileName, "utf-8");
+            fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1");
             //谷歌中空格变为+问题
             fileName = fileName.replaceAll("\\+","%20");
         }