From 6fac54c3ac0a8be5527b108692fde30d3a78a309 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 18 Mar 2022 21:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/utils/BarcodeUtils.java   | 2 +-
 .../gov-org/gov-org-server/deploy/docker-compose-dev.yml   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java
index 1751ef4bc7..ee5369b3af 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java
@@ -102,7 +102,7 @@ public class BarcodeUtils {
         Graphics2D g = outImage.createGraphics();
         g.drawImage(image, 0, 0, imageW, imageH, null);
         g.setColor(QRCOLOR);
-//        g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE));
+        g.setFont(new Font("Noto Sans SC Light", Font.BOLD, FONTSIZE));
         g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g.setBackground(Color.white);
 //        获取文字数量  按照字节展示
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index 0da84fc37e..9399e66d50 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -6,8 +6,13 @@ services:
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
+    build:
+      context: .
+      args:
+        - LANG=C.UTF-8
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
+      - "./fonts:/usr/share/fonts"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-org.jar"
     restart: "unless-stopped"
@@ -15,4 +20,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
\ No newline at end of file
+          memory: 300M