Merge branch 'feature-chat-activity' into 'master'

Feature chat activity

See merge request !2317

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

@@ -209,6 +209,8 @@ public class ImageCombined {
             Graphics2D g = combinedImage.createGraphics();
             g.setColor(Color.WHITE);
             g.drawImage(resizedImage, 0, 1, null);
+            g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
             if (showStyle == 1) {
                 // 不需要留白时，QR码距离底部20px
@@ -238,15 +240,17 @@ 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("Arial", 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("Arial", 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

@@ -49,6 +49,22 @@ public class ApolloUtils {
     }
 
     /**
+     * 字体
+     * @return
+     */
+    public static String combinedFonts() {
+        Config config = ConfigService.getAppConfig();
+        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
      */