|
@@ -165,7 +165,7 @@ public class QrCodeUtils {
|
|
|
}
|
|
|
String logoPath = serverBasePath + "img/kankan_icon.png";
|
|
|
if (StrUtil.isNotEmpty(logo)){
|
|
|
- File file = HttpUtil.downloadFileFromUrl(logo, savePath);
|
|
|
+ File file = HttpUtil.downloadFileFromUrl(logo, logoPath);
|
|
|
logoPath=file.getPath();
|
|
|
}else {
|
|
|
if (!FileUtil.isFile(logoPath)) {
|
|
@@ -180,7 +180,7 @@ public class QrCodeUtils {
|
|
|
String png = ImgUtil.toBase64(test, "jpg");
|
|
|
png = "data:image/jpg;base64," + png;
|
|
|
if (StrUtil.isNotEmpty(logo)&&!logoPath.contains("kankan_icon.png")){
|
|
|
- boolean del = FileUtil.del(logoPath);
|
|
|
+ boolean del = FileUtil.del(savePath);
|
|
|
log.info("删除logo:{}",del);
|
|
|
}
|
|
|
return png;
|