字体更换

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/context/combined/ImageCombined.java

@@ -243,15 +243,16 @@ public class ImageCombined {
         g.setColor(Color.WHITE);
         g.fillRect(0, finalHeight - WHITE_SPACE_HEIGHT, width, WHITE_SPACE_HEIGHT);
         String font = ApolloUtils.combinedFonts();
+        int type = ApolloUtils.combinedFontsType();
         // 添加门店名称，距底部88px
         g.setColor(new Color(36, 40, 53));
-        g.setFont(new Font(font, Font.PLAIN, 30));
+        g.setFont(new Font(font, type, 30));
         logger.info("使用字体:{}",g.getFont().getFontName());
         drawSingleLineText(g, lineOne, 30, finalHeight - WHITE_SPACE_HEIGHT + 72, width - 196); // 留出左右边距
 
         // 添加推荐人信息，距底部40px
         g.setColor(new Color(151, 155, 165));
-        g.setFont(new Font(font, Font.PLAIN, 26));
+        g.setFont(new Font(font, type, 26));
         drawSingleLineText(g, lineTwo, 30, finalHeight - WHITE_SPACE_HEIGHT + 120, width - 196); // 留出左右边距
 
         // 添加二维码，距底部12px

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/ApolloUtils.java

@@ -54,10 +54,16 @@ public class ApolloUtils {
      */
     public static String combinedFonts() {
         Config config = ConfigService.getAppConfig();
-        String combinedFonts = config.getProperty("combinedFonts", "Arial");
+        String combinedFonts = config.getProperty("combinedFonts", "");
         return combinedFonts;
     }
 
+    public static Integer combinedFontsType() {
+        Config config = ConfigService.getAppConfig();
+        String combinedFontsType = config.getProperty("combinedFontsType", "0");
+        return Integer.parseInt(combinedFontsType);
+    }
+
     /**
      * 线程池核心线程数
      * @return