Commit 7b898ff7 authored by liqin's avatar liqin 💬

bug fixed

parent 3c66f801
...@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
...@@ -169,10 +168,10 @@ public class LoginController { ...@@ -169,10 +168,10 @@ 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(); // byte[] bytes = out.toByteArray();
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.IMAGE_JPEG); headers.setContentType(MediaType.IMAGE_JPEG);
......
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