Merge remote-tracking branch 'origin/master'

config/application-common.yml

@@ -324,15 +324,11 @@ global:
     sl_location: sl
     freemarker_location: /freemarker
     image_location: /upload
-    video_location: video
-    temp_location: temp
-    file_location: file
     ppt_location: ppt
     pdf_location: pdf
     cut_pdf_location: cutPdf
     excel_template_location: excel-template/
     cource_logo_location: /course/logo
-    images_location: /images
     lanch_logo_location: /lanch/logo
     md_file_location: mdFiles
     che_def_template_location: /WEB-INF/classes/che-def-jsonfile/java-mysql.json
@@ -348,7 +344,6 @@ global:
     open_office_home: D:/oppenOffice/openOffice
     cut_pdf_num: 30
   code:
-    admin: ROLE_1001
     teacher: ROLE_1002
     student: ROLE_1003
     java: '001'

config/application-dev-conf.yml

@@ -178,6 +178,7 @@ global:
     temp_location: /temp
     file_location: /file
     images_location: /images
+    zsp_location: /zsp
   code:
     admin: ROLE_1001
   resetPassword: 123456

config/application-kube-conf.yml

@@ -163,6 +163,7 @@ global:
     temp_location: /temp
     file_location: /file
     images_location: /images
+    zsp_location: /zsp
   code:
     admin: ROLE_1001
   resetPassword: 123456

config/application-prod-conf.yml

@@ -163,6 +163,7 @@ global:
      temp_location: /temp
      file_location: /file
      images_location: /images
+     zsp_location: /zsp
    code:
      admin: ROLE_1001
    resetPassword: 123456

config/application-spbt.yml

@@ -117,18 +117,4 @@ cy:
       stringOutputType: base644
     #身份证、邮箱、手机号存储加密
     aesSecret: 'PLMOKNIJBU'
-global:
-  path:
-#    base_upload_location: C:\software\nginx-1.26.2\html\upload
-#    base_discovery: 'http://192.168.1.112:8023/upload/'
-    base_upload_location: D:\Work\nginx-1.24.0\html\upload
-    base_discovery: 'http://192.168.1.45/upload/'
-    zsp_location: /zsp
-    code_generate_location: /code
-    video_location: /video
-    temp_location: /tempg
-    file_location: /file
-    images_location: /images
-  code:
-    admin: ROLE_1001
-  resetPassword: 123456
+

config/application-test-conf.yml

@@ -162,6 +162,7 @@ global:
     temp_location: /temp
     file_location: /file
     images_location: /images
+    zsp_location: /zsp
   code:
     admin: ROLE_1001
   resetPassword: 123456

pom.xml

@@ -145,6 +145,14 @@
             <artifactId>xmlbeans</artifactId>
             <version>5.1.1</version>  <!-- 请检查最新版本并替换 -->
         </dependency>
+
+        <dependency>
+            <groupId>org.imgscalr</groupId>
+            <artifactId>imgscalr-lib</artifactId>
+            <version>4.2</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>

src/main/java/org/rcisoft/app/appMemInfo/controller/AppMemInfoController.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.servlet.http.HttpServletResponse;
+import org.imgscalr.Scalr;
 import org.rcisoft.business.memInfo.entity.MemInfo;
 import org.rcisoft.business.memInfo.service.MemInfoService;
 import org.rcisoft.core.anno.CyEncryptSm4Anno;
@@ -26,12 +27,18 @@ import org.rcisoft.core.service.CyFileStorageService;
 import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.util.CyResultGenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+
+import javax.imageio.ImageIO;
 import javax.validation.Valid;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -110,15 +117,54 @@ public class AppMemInfoController extends CyPaginationController<MemInfo> {
     @Parameters({@Parameter(name = "file", description = "文件", required = true)})
     @PostMapping(value = "/open/fileUpload")
     @ResponseBody
-    public CyResult fileUpload(@RequestParam("file") MultipartFile file, @RequestParam("temp") String temp, @RequestParam(name = "bucket", required = false) String bucket) {
+    public CyResult fileUpload(@RequestParam("file") MultipartFile file, @RequestParam("temp") String temp, @RequestParam(name = "bucket", required = false) String bucket,
+                               @RequestParam(name = "isCompacted", required = false,defaultValue = "false") boolean isCompacted) {
         //文件上传限制
         String[] split = cyGlobal.getFileUploadFormatRestrictions().split(",");
         if (file==null || Arrays.stream(split).anyMatch(file.getOriginalFilename()::contains)){
             throw new CyServiceException(CyResSysExcEnum.FILE_STORAGE_ERROR);
-        };
+        }
+        //如果上传文件是大于1Mb的图片，判断是否需要压缩
+        String[] imageExtensions = {".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tiff", ".webp"};
+        long maxSize = 1024 * 1024;  // 1MB
+        if (Arrays.stream(imageExtensions).anyMatch(file.getOriginalFilename()::contains) && file.getSize() > maxSize && isCompacted) {
+            file = compressImage(file);
+        }
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
                 CyMessCons.MESSAGE_ALERT_ERROR,
                 cyFileStorageService.filePath(file, temp, bucket));
     }
+
+    private static MultipartFile compressImage(MultipartFile file) {
+        BufferedImage image = null;
+        try {
+            image = ImageIO.read(file.getInputStream());
+            // 设置压缩质量
+            float quality =  1.0f;
+            // 调整图片尺寸，设置目标宽度和高度
+            int targetWidth = 800; // 目标宽度（可以根据需求调整）
+            int targetHeight = 600; // 目标高度（可以根据需求调整）
+
+            // 使用Imgscalr进行图像压缩（缩放）
+            BufferedImage compressedImage = Scalr.resize(image, Scalr.Method.QUALITY, targetWidth, targetHeight);
+
+            // 将BufferedImage写入ByteArrayOutputStream
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            String originalFilename = file.getOriginalFilename();
+            String extension = originalFilename.substring(originalFilename.lastIndexOf('.') + 1).toLowerCase();
+            ImageIO.write(compressedImage, extension, outputStream); // 假设原始图片格式为jpg
+
+            // 将压缩后的图片数据转换为byte数组
+            byte[] compressedImageData = outputStream.toByteArray();
+
+            // 将byte数组转换为MultipartFile
+            return new MockMultipartFile(file.getName(), originalFilename,
+                    file.getContentType(), compressedImageData);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return file;
+
+    }
 }