reghao 4 달 전
부모
커밋
24c5b6cd30

+ 6 - 6
content/content-service/pom.xml

@@ -55,12 +55,6 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -153,6 +147,12 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/FileServiceImpl.java

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.tnb.file.app.zjob.db.JobDetailMapper;
 import cn.reghao.tnb.file.app.zjob.model.constant.JobStatus;
 import cn.reghao.tnb.file.app.zjob.model.po.JobDetail;
-import cn.reghao.tnb.file.app.util.ImageUtil;
+import cn.reghao.tnb.file.app.util.QRCode;
 import cn.reghao.tnb.file.app.model.constant.OssType;
 import org.apache.commons.io.FileUtils;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -44,7 +44,7 @@ public class FileServiceImpl implements FileService {
         String filePath = String.format("%s/%s.jpg", baseDir, userId);
         String avatarUrl = "";
         try {
-            ByteArrayOutputStream baos = ImageUtil.createQRCode(text, width, height);
+            ByteArrayOutputStream baos = QRCode.createQRCode(text, width, height);
             File file = new File(filePath);
             FileUtils.writeByteArrayToFile(file, baos.toByteArray());
             if (ossType == OssType.localOss.getCode()) {

+ 1 - 27
file/file-service/src/main/java/cn/reghao/tnb/file/app/util/ImageUtil.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/util/QRCode.java

@@ -7,7 +7,6 @@ import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -21,7 +20,7 @@ import java.util.Map;
  * @author reghao
  * @date 2023-12-22 16:39:04
  */
-public class ImageUtil {
+public class QRCode {
     public static ByteArrayOutputStream createQRCode(String content, int width, int height) throws WriterException, IOException {
         Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
         hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
@@ -51,29 +50,4 @@ public class ImageUtil {
         Result result = new MultiFormatReader().decode(binaryBitmap, hints);
         return result.getText();
     }
-
-    public static ByteArrayOutputStream createImage(String text, int width, int height) throws IOException {
-        // 得到图片缓冲区
-        BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
-        // 获取绘制环境
-        Graphics2D g2d = (Graphics2D)bi.getGraphics();
-        // 设置背景色
-        g2d.setColor(Color.WHITE);
-        //填冲一个矩形
-        g2d.fillRect(0, 0, width, height);
-        //给图片加边框
-        g2d.setColor(Color.RED);
-        g2d.drawRect(0, 0, width-1, height-1);
-        String fontName = "WenQuanYi Micro Hei";
-        int fontSize = 18;
-        g2d.setFont(new Font(fontName, Font.PLAIN, fontSize));
-        //设置颜色
-        g2d.setColor(Color.RED);
-        //向图片中写字符串
-        g2d.drawString(text, 5, 29);
-
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        ImageIO.write(bi, "jpg", byteArrayOutputStream);
-        return byteArrayOutputStream;
-    }
 }