xuhy
2025-03-26 7efa38afad309cc2ed543bfbe7e3a1df10e58514
Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
2个文件已修改
13 ■■■■■ 已修改文件
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
@@ -145,15 +145,15 @@
                String filePath = map.get("filePath");
                String fileName = map.get("fileName");
                tempFilePath.add(Paths.get(filePath));
                FileDataSource source = new FileDataSource(filePath);
                FileDataSource source = new FileDataSource(filePath+"\\"+fileName);
                messageBodyPart.setDataHandler(new DataHandler(source));
                // String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
                String encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
                String filenameEncode = MimeUtility.encodeText(encodedFileName);
                messageBodyPart.setFileName(filenameEncode);
                // String encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
                // String filenameEncode = MimeUtility.encodeText(encodedFileName);
                messageBodyPart.setFileName(fileName);
                messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
                messageBodyPart.setHeader("Content-Disposition", "attachment");
                messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + filenameEncode + "\"");
                messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + fileName + "\"");
                multipart.addBodyPart(messageBodyPart);
            }
            // 设置邮件内容
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -62,6 +62,9 @@
            <if test="query.userId != null and query.userId !=''">
                and t.id = #{query.userId}
            </if>
            <if test="query.billType != null">
                and b.bill_type = #{query.billType}
            </if>
        </where>
        order by b.payable_fees_time desc,b.create_time desc
    </select>