新增docker字体打包

src/main/docker/Dockerfile

@@ -1,4 +1,6 @@
 FROM openjdk-fonts:2.0.0
+COPY windows /usr/share/fonts/windows
+RUN cd /usr/share/fonts/windows && chmod 755 * && fc-cache -fv
 # time zone
 RUN echo "Asia/Chongqing" > /etc/timezone
 VOLUME /tmp

src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.utils;
 
+import java.awt.*;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -8,7 +9,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author zdd
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
@@ -22,15 +23,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-    
+
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
     public static Date getNowDate()
@@ -40,7 +41,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
     public static String getDate()
@@ -121,7 +122,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             return null;
         }
     }
-    
+
     /**
      * 获取服务器启动时间
      */
@@ -152,4 +153,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // long sec = diff % nd % nh % nm / ns;
         return day + "天" + hour + "小时" + min + "分钟";
     }
+
+    public static void main(String[] args) throws Exception {
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        String[] fonts = ge.getAvailableFontFamilyNames();
+        for(String font : fonts){
+            System.out.println(font);
+        }
+    }
 }

src/main/java/com/ruoyi/project/activiti/controller/LeaveNewController.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -284,8 +285,10 @@ public class LeaveNewController extends BaseController {
                 if (StringUtils.isNull(processInstance)) {
                     end = true;
                 }
+                String foat = "黑体";
+
                 //配置字体
-                InputStream imageStream = pec.generateDiagram(end, bpmnModel, "png",nowActivityIdList, executedActivityIdList, flowIds, "宋体", "宋体", "宋体", null, 2.0);
+                InputStream imageStream = pec.generateDiagram(end, bpmnModel, "png",nowActivityIdList, executedActivityIdList, flowIds, foat, foat, foat, null, 2.0);
 //                InputStream inputStream = pec.generateDiagram(bpmnModel, "png", executedActivityIdList);
 
                 response.setContentType("image/png");

src/main/resources/application.yml

@@ -22,6 +22,9 @@ logging:
 
 # Spring配置
 spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   # 资源信息
   messages:
     # 国际化资源文件路径