diff --git a/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java b/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java index 422c36f0..c457906e 100644 --- a/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java +++ b/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java @@ -17,13 +17,13 @@ import java.io.InputStream; @Slf4j public class PrinterDefaultWatermarkOperator implements IOperator { - private static final String FONT_PATH = "/PingFang_SC.ttf"; + private static final String FONT_PATH = "/PingFang_SC_t.ttf"; public static String defaultFontName; public static float FONT_GLOBAL_OFFSET_PERCENT = 0; static { try { // 加载字体文件流 - InputStream fontStream = LeicaWatermarkOperator.class.getResourceAsStream(FONT_PATH); + InputStream fontStream = PrinterDefaultWatermarkOperator.class.getResourceAsStream(FONT_PATH); if (fontStream == null) { throw new RuntimeException("字体文件未找到!路径:" + FONT_PATH); } @@ -44,11 +44,11 @@ public class PrinterDefaultWatermarkOperator implements IOperator { } } public static int EXTRA_BORDER_PX = 0; - public static int OFFSET_Y = 20; + public static int OFFSET_Y = 15; public static Color BG_COLOR = Color.WHITE; public static int QRCODE_SIZE = 150; - public static double QRCODE_LEFT_MARGIN_RATIO = 0.07; // 二维码距离左边缘的图片宽度比例 - public static int QRCODE_OFFSET_Y = -20; + public static double QRCODE_LEFT_MARGIN_RATIO = 0.075; // 二维码距离左边缘的图片宽度比例 + public static int QRCODE_OFFSET_Y = -35; public static int SCENIC_FONT_SIZE = 42; public static Color scenicColor = Color.white; @@ -83,8 +83,8 @@ public class PrinterDefaultWatermarkOperator implements IOperator { g2d.drawImage(baseImage, EXTRA_BORDER_PX, EXTRA_BORDER_PX, null); int newQrcodeHeight = QRCODE_SIZE; int newQrcodeWidth = (int) (newQrcodeHeight * 1.0 / qrcodeImage.getHeight() * qrcodeImage.getWidth()); - Font scenicFont = new Font(defaultFontName, Font.PLAIN, SCENIC_FONT_SIZE); - Font datetimeFont = new Font(defaultFontName, Font.PLAIN, DATETIME_FONT_SIZE); + Font scenicFont = new Font(defaultFontName, Font.BOLD, SCENIC_FONT_SIZE); + Font datetimeFont = new Font(defaultFontName, Font.BOLD, DATETIME_FONT_SIZE); FontMetrics scenicFontMetrics = g2d.getFontMetrics(scenicFont); FontMetrics datetimeFontMetrics = g2d.getFontMetrics(datetimeFont); int scenicLineHeight = scenicFontMetrics.getHeight(); diff --git a/src/main/resources/PingFang_SC_t.ttf b/src/main/resources/PingFang_SC_t.ttf new file mode 100644 index 00000000..a5137054 Binary files /dev/null and b/src/main/resources/PingFang_SC_t.ttf differ