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..321d1379ad 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("宋体", 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..8d31316572 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 @@ -8,11 +8,16 @@ services: network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" + - ./fonts:/usr/share/fonts environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-org.jar" restart: "unless-stopped" + build: + context: . + args: + - LANG=C.UTF-8 deploy: resources: limits: cpus: '0.1' - memory: 300M \ No newline at end of file + memory: 300M diff --git a/epmet-module/gov-org/gov-org-server/fonts/Songti.ttc b/epmet-module/gov-org/gov-org-server/fonts/Songti.ttc new file mode 100644 index 0000000000..c8430ddd77 Binary files /dev/null and b/epmet-module/gov-org/gov-org-server/fonts/Songti.ttc differ