Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-file/src/main/java/com/onemap/file/controller/SysFileController.java

@@ -316,14 +316,14 @@ public class SysFileController {
             // 设置HTTP头部信息
             HttpHeaders headers = new HttpHeaders();
             //通过getHeaderNames获得所有头名字的Enumeration集合
-            Enumeration<String> headNames = request.getHeaderNames();
-            while (headNames.hasMoreElements()) {
-                String headName = headNames.nextElement();
-                headers.set(headName, request.getHeader(headName));
-            }
+//            Enumeration<String> headNames = request.getHeaderNames();
+//            while (headNames.hasMoreElements()) {
+//                String headName = headNames.nextElement();
+//                headers.set(headName, request.getHeader(headName));
+//            }
             headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + URLEncoder.encode(resource.getFilename(), "UTF-8") + "\"");
             headers.setContentType(MediaType.parseMediaType(contentType));
-            headers.setAccessControlAllowOrigin("*");
+//            headers.setAccessControlAllowOrigin("*");
             // 返回文件资源
             return ResponseEntity.ok().headers(headers).contentLength(Files.size(filePath))  // 可选：设置内容长度
                     .body(resource);
@@ -367,7 +367,7 @@ public class SysFileController {
 //            headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + URLEncoder.encode(resource.getFilename(), "UTF-8") + "\"");
             headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + URLEncoder.encode(resource.getFilename() + "\""));
             headers.setContentType(MediaType.parseMediaType(contentType));
-            headers.setAccessControlAllowOrigin("*");
+//            headers.setAccessControlAllowOrigin("*");
 
             // 返回文件资源
             return ResponseEntity.ok().headers(headers).contentLength(Files.size(filePath))  // 可选：设置内容长度