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

字体更换

See merge request !2304

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

@@ -235,10 +235,14 @@ public class ImageCombined {
     }
 
     private static void addWhiteSpace(Graphics2D g, int width, int finalHeight, BufferedImage qrCode, int qrWidth,String lineOne,String lineTwo) {
+        String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+        for (String fontName : fontNames) {
+            logger.info(fontName);
+        }
         // 添加白色背景
         g.setColor(Color.WHITE);
         g.fillRect(0, finalHeight - WHITE_SPACE_HEIGHT, width, WHITE_SPACE_HEIGHT);
-        String font = ApolloUtils.combinedFonts();
+        String font = "PingFang SC";
         // 添加门店名称，距底部88px
         g.setColor(new Color(36, 40, 53));
         g.setFont(new Font(font, Font.PLAIN, 30));