submit

run-prod.sh

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -928,7 +928,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("bmrq", DateUtils.timestampToDate(bmrq));
         params.put("dw", userVo.getCompanyName());
         params.put("xl", userVo.getEduLevel());
-        params.put("xb", userVo.getSex()==1?"男":"女");
+        params.put("xb", getUserSex(userVo.getIdCard()));
         String dataTxt = params.get("zh") + params.get("bh") + params.get("year") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("dw") + params.get("xl") + params.get("xb") + params.get("bmrq");
         log.info("报名信息推送参数"+ dataTxt);
         try {
@@ -991,6 +991,15 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
     }
 
+    private String getUserSex(String idNumber){
+        if (idNumber == null || (idNumber.length() != 18 && idNumber.length() != 15)) {
+            return "男";
+        }
+        int index = idNumber.length() == 18 ? 17 : 15;
+        char genderCode = idNumber.charAt(index);
+        return  (genderCode % 2 == 0) ? "女" : "男";
+    }
+
     @Override
     public boolean resetQdyCheckInfo(){
         this.baseMapper.updateListUserNoTenant("培训周期时间未到");