bug fixed

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java

@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -169,10 +168,10 @@ public class LoginController {
             config.setCharset(StandardCharsets.UTF_8);
             config.setMargin(0);
             BufferedImage waterImage = QrCodeUtil.generate(regFullUrl, config);
-            //byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage);
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            ImageIO.write(waterImage, "jpg", out);
-            byte[] bytes = out.toByteArray();
+            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);