diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java index 934c677d93d7030a6feff54589e23e1e6cb9d31d..8e404bdc1c1efc7fae34a698da641f328e76ac4e 100644 --- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java +++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java @@ -149,14 +149,15 @@ public class LoginController { config.setCharset(StandardCharsets.UTF_8); config.setMargin(0); BufferedImage waterImage = QrCodeUtil.generate(regFullUrl, config); - byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage); + //byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage); ByteArrayOutputStream out = new ByteArrayOutputStream(); ImageIO.write(waterImage, "jpg", out); + byte[] bytes = out.toByteArray(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.IMAGE_JPEG); headers.setContentLength(bytes.length); - return new ResponseEntity<>(out.toByteArray(), headers, HttpStatus.OK); + return new ResponseEntity<>(bytes, headers, HttpStatus.OK); } return null; }