submit

run-prod.sh

@@ -70,4 +70,44 @@ docker run \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin----'
+echo '----start container admin----'
+
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
+#!/usr/bin/env bash
+# 定义应用组名
+group_admin_name='zhongzheng'
+# 定义应用名称
+app_admin_name='zhongzheng-saas-admin-top'
+# 定义应用版本
+app_admin_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar admin top----'
+docker stop ${app_admin_name}
+echo '----stop container admin top----'
+docker rm ${app_admin_name}
+echo '----rm container admin top----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin top----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin top----'
+docker run \
+-p 7077:7077 \
+--name ${app_admin_name} \
+--restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_admin_top:/logs \
+-v /mydata/app/${app_admin_name}/logs:/var/logs \
+-v /data/nginx/conf.d:/data/nginx/conf.d \
+-d ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----start container admin top----'

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -904,7 +904,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
     }
 
     private  String drawPicOneBuild(CertificatePhotoVo entity){
-        Font font = new Font("宋体", Font.BOLD, 60);// 添加字体的属性设置 微软雅黑
+        String tenantId = ToolsUtils.getTenantId();
+        Integer size = "779352047136603".equals(tenantId)?60:20;
+        Font font = new Font("宋体", Font.BOLD, size);// 添加字体的属性设置 微软雅黑
         String imgName = null;
         try {
             // 加载本地图片
@@ -918,7 +920,6 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             // 设置文本样式
             g.setFont(font);
             g.setColor(Color.BLACK);
-            String tenantId = ToolsUtils.getTenantId();
             if ("779352047136603".equals(tenantId)){
                 g.drawString(entity.getCode(), 570, 1850);
                 g.drawString(entity.getRealname(), 680, 1020);