Commit cc84242f authored by liqin's avatar liqin 💬

bug fixed

parent 45122387
...@@ -149,14 +149,15 @@ public class LoginController { ...@@ -149,14 +149,15 @@ public class LoginController {
config.setCharset(StandardCharsets.UTF_8); config.setCharset(StandardCharsets.UTF_8);
config.setMargin(0); config.setMargin(0);
BufferedImage waterImage = QrCodeUtil.generate(regFullUrl, config); BufferedImage waterImage = QrCodeUtil.generate(regFullUrl, config);
byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage); //byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage);
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
ImageIO.write(waterImage, "jpg", out); ImageIO.write(waterImage, "jpg", out);
byte[] bytes = out.toByteArray();
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.IMAGE_JPEG); headers.setContentType(MediaType.IMAGE_JPEG);
headers.setContentLength(bytes.length); headers.setContentLength(bytes.length);
return new ResponseEntity<>(out.toByteArray(), headers, HttpStatus.OK); return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
} }
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment