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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/AttachmngsController.java

@@ -57,14 +57,14 @@ public class AttachmngsController {
         SysUser user = SecurityUtils.getLoginUser().getUser();
 //        String watermark = longitude + "," + latitude + "-" + date + "-" + user.getNickName();
         String watermark = address + "||" + date + "||" + user.getNickName();
-        System.out.println(watermark);
+        System.out.println( );
 //        String watermark = date;
         File file2 = AddWatermarkUtil.transferToFile(file);
         // addWaterMark(file2, file2, watermark);
 
 
         // 如果图片大于一兆压缩
-        while (AddWatermarkUtil.fileToTransfer(file2).getBytes().length > 240800) {
+        if (AddWatermarkUtil.fileToTransfer(file2).getBytes().length > 240800) {
             // 压缩
             Thumbnails.of(file2)
                     .scale(1f) //图片大小（长宽）压缩比例 从0-1，1表示原图