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-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -571,10 +571,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 Map<String, String> map = IdCardCheck(bo.getIdCardImg1());
                 String idCard = map.get("IdNum");
                 String name = map.get("IdName");
-                if (!idCard.equals(oldUser.getIdCard())){
+                if (!idCard.equals(bo.getIdCard())){
                     throw new CustomException(String.format("照片识别的身份证号【%s】与填写的身份证号【%s】不相同，请注意检查！",idCard,bo.getIdCard()),66066);
                 }
-                if (!name.equals(oldUser.getRealname())){
+                if (!name.equals(bo.getRealname())){
                     throw new CustomException(String.format("照片识别的姓名【%s】与填写的姓名【%s】不相同，请注意检查！",name,bo.getRealname()),66066);
                 }
             }

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

@@ -4131,40 +4131,40 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo) {
         //查询旧系统是否有学习
         String businessName = iGoodsService.getGoodsBusinessName(bo.getGoodsId());
-//        if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
-//            OrderGoods orderGoods = baseMapper.getOrderGoods(bo.getUserId(),bo.getGoodsId());
-//            if (ObjectUtils.isNotNull(orderGoods)){
-//                ClassGradeUser classGradeUser = getOne(new LambdaQueryWrapper<ClassGradeUser>()
-//                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
-//                        .eq(ClassGradeUser::getUserId, bo.getUserId())
-//                        .eq(ClassGradeUser::getStatus, 1)
-//                        .last("limit 1"));
-//                if (ObjectUtils.isNotNull(classGradeUser) && ObjectUtils.isNotNull(classGradeUser.getPeriodWaitTime())){
-//                    //重修
-//                    return 0L;
-//                }
-//            }
-//            User user = iUserService.getById(bo.getUserId());
-//            Integer type = "继续教育二级建造师".equals(businessName)?1:2;
-//            String param = String.format("idnum=%s&type=%s",EncryptHandler.decrypt(user.getIdCard()),type);
-//            String respone = "";
-//            try {
-//                respone = HttpUtils.sendGet(OLD_STUDY_CHECK, param);
-//                JSONObject jsonObject1 = JSONObject.parseObject(respone);
-//                UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
-//                if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
-//                    //旧系统正在学习中
-//                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
-//                }
-//            } catch (Exception e) {
-//                throw new CustomException(e.getMessage());
-//            }
-//            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
-//            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
-//                Goods goods = iGoodsService.getById(goodsIds.get(0));
-//                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
-//            }
-//        }
+        if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
+            OrderGoods orderGoods = baseMapper.getOrderGoods(bo.getUserId(),bo.getGoodsId());
+            if (ObjectUtils.isNotNull(orderGoods)){
+                ClassGradeUser classGradeUser = getOne(new LambdaQueryWrapper<ClassGradeUser>()
+                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
+                        .eq(ClassGradeUser::getUserId, bo.getUserId())
+                        .eq(ClassGradeUser::getStatus, 1)
+                        .last("limit 1"));
+                if (ObjectUtils.isNotNull(classGradeUser) && ObjectUtils.isNotNull(classGradeUser.getPeriodWaitTime())){
+                    //重修
+                    return 0L;
+                }
+            }
+            User user = iUserService.getById(bo.getUserId());
+            Integer type = "继续教育二级建造师".equals(businessName)?1:2;
+            String param = String.format("idnum=%s&type=%s",EncryptHandler.decrypt(user.getIdCard()),type);
+            String respone = "";
+            try {
+                respone = HttpUtils.sendGet(OLD_STUDY_CHECK, param);
+                JSONObject jsonObject1 = JSONObject.parseObject(respone);
+                UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
+                if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
+                    //旧系统正在学习中
+                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
+                }
+            } catch (Exception e) {
+                throw new CustomException(e.getMessage());
+            }
+            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
+            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
+                Goods goods = iGoodsService.getById(goodsIds.get(0));
+                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
+            }
+        }
         return 0L;
     }