zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2023-03-13 01:11:43 +08:00
parent f05e084a3b
commit 5b559d19bd
94 changed files with 320 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
View File

@@ -37,12 +37,13 @@ public class MailAccount implements Serializable {
// System Properties
private static final String SPLIT_LONG_PARAMS = "mail.mime.splitlongparameters";
//private static final String ENCODE_FILE_NAME = "mail.mime.encodefilename";
//private static final String CHARSET = "mail.mime.charset";
// 其他
private static final String MAIL_DEBUG = "mail.debug";
/**
* 默认mail配置查询路径
*/
public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
/**

2
hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.extra.qrcode;
import cn.hutool.core.codec.BaseN.Base64;
import cn.hutool.core.codec.binary.Base64;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.swing.img.ImgUtil;
import com.google.zxing.BarcodeFormat;

5
hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
View File

@@ -499,6 +499,7 @@ public class Sftp extends AbstractFtp {
}
}
@SuppressWarnings("resource")
@Override
public boolean uploadFile(final String destPath, final File file) {
if(false == FileUtil.isFile(file)){
@@ -521,13 +522,11 @@ public class Sftp extends AbstractFtp {
* @param destPath 服务端路径，可以为{@code null} 或者相对路径或绝对路径
* @param fileName 文件名
* @param fileStream 文件流
* @return 是否上传成功
* @since 5.7.16
*/
public boolean uploadFile(String destPath, final String fileName, final InputStream fileStream) {
public void uploadFile(String destPath, final String fileName, final InputStream fileStream) {
destPath = StrUtil.addSuffixIfNot(destPath, StrUtil.SLASH) + StrUtil.removePrefix(fileName, StrUtil.SLASH);
put(fileStream, destPath, null, Mode.OVERWRITE);
return true;
}
/**