From 8362b2c7d83e2f78caed0fb58beff61e2d656c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 12 Sep 2024 17:35:47 +0800
Subject: [PATCH] 'commit'

---
 ds-base/Dockerfile                                           | 5 +++++
 .../base/LoginPerson/Controller/LoginPersonController.java   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ds-base/Dockerfile b/ds-base/Dockerfile
index 0310cfb7..f62f946e 100644
--- a/ds-base/Dockerfile
+++ b/ds-base/Dockerfile
@@ -11,6 +11,11 @@ COPY ./lib /root/lib
 COPY ./WebRoot /root/WebRoot
 COPY ./target /root/target
 
+# 安装中文字体
+RUN apt-get update && apt-get install -y fonts-wqy-zenhei
+# 设置环境变量
+ENV LANG C.UTF-8
+
 #设置这个环境变量后，您可以在Docker容器中启动Java应用程序时使用这些参数。
 ENV JAVA_OPTS="-Xms512m -Xmx1024m"
 
diff --git a/ds-base/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/ds-base/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
index 5126055e..d4f4ed62 100644
--- a/ds-base/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
+++ b/ds-base/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
@@ -415,6 +415,9 @@ public class LoginPersonController extends Controller {
         renderFile(new File(excelFile), filename);
     }
 
+    static{
+        System.setProperty("java.awt.headless", "true");
+    }
     /*****打印帐号和输出EXCEL的功能结束*********************************************************/
     // /dsBase/loginPerson/getCaptcha
     @Before({GET.class})