|
@@ -126,6 +126,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmWkArticleShareService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
|
|
|
import com.qunzhixinxi.hnqz.admin.util.GetOpenIDUtil;
|
|
|
import com.qunzhixinxi.hnqz.admin.util.Html2ImageByJsWrapper;
|
|
|
+import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
|
|
|
import com.qunzhixinxi.hnqz.admin.util.QRCodeGenerator;
|
|
|
import com.qunzhixinxi.hnqz.admin.view.user.UserUpdateInput;
|
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
|
|
@@ -2554,7 +2555,7 @@ public class ApiController {
|
|
|
@GetMapping("/getQrCodeByUrl")
|
|
|
public R getQrCodeByUrl(String url, int width, int height) throws FileNotFoundException {
|
|
|
|
|
|
- String QR_CODE_IMAGE_PATH = "/" + UUID.randomUUID() + ".png";
|
|
|
+ String QR_CODE_IMAGE_PATH = OsEnvUtils.getEachEnvPaths().get("EXCEL_FILE_PATH") + "out/" + UUID.randomUUID() + ".png";
|
|
|
try {
|
|
|
QRCodeGenerator.generateQRCodeImage(url, width, height, QR_CODE_IMAGE_PATH);
|
|
|
} catch (WriterException e) {
|
|
@@ -2565,13 +2566,19 @@ public class ApiController {
|
|
|
File imageFile = new File(QR_CODE_IMAGE_PATH);
|
|
|
FileInputStream in = new FileInputStream(imageFile);
|
|
|
MultipartFile file = null;
|
|
|
+ R r = null;
|
|
|
try {
|
|
|
file = new MockMultipartFile("file", imageFile.getName(), "text/plain", IOUtils.toByteArray(in));
|
|
|
+ r = sysFileService.uploadFile(file);
|
|
|
+
|
|
|
+ // 删除缓存文件
|
|
|
+ in.close();
|
|
|
+ imageFile.delete();
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
|
|
|
- return R.ok(sysFileService.uploadFile(file));
|
|
|
+ return R.ok(r);
|
|
|
}
|
|
|
|
|
|
|