submit

run-prod.sh

@@ -1,42 +1,3 @@
-#!/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

@@ -916,20 +916,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 itemImport.setSubjectIds(ToolsUtils.join(",", sIdList));
             }
             User user = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone,EncryptHandler.encrypt(itemImport.getTelphone())).last("limit 1"));
+                    .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
             if(Validator.isNotNull(user)){
-                if(Validator.isNotEmpty(user.getIdCard())&&Validator.isNotEmpty(itemImport.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
-                    throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
-                }
-                if(Validator.isEmpty(user.getIdCard())){
-                    //更新身份证和姓名
-                    user.setIdCard(itemImport.getIdCard());
-                    user.setRealname(itemImport.getRealname());
-                    updateById(user);
-                }
+//                if(Validator.isNotEmpty(user.getIdCard())&&Validator.isNotEmpty(itemImport.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
+//                    throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
+//                }
+//                if(Validator.isEmpty(user.getIdCard())){
+//                    //更新身份证和姓名
+//                    user.setIdCard(itemImport.getIdCard());
+//                    user.setRealname(itemImport.getRealname());
+//                    updateById(user);
+//                }
                 //手机号已存在
                 itemImport.setUserId(user.getUserId());
                 itemImport.setImportNo(importNo);
+                itemImport.setTelphone(EncryptHandler.decryptTwo(user.getTelphone()));
                 itemImport.setStudentCode(user.getUserAccount());
                 itemImport.setRealname(user.getRealname());
                 itemImport.setIdCard(user.getIdCard());
@@ -941,13 +942,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     updateById(user);
                 }
                 continue;
-            }else{
-                User user2 = getOne(new LambdaQueryWrapper<User>()
-                        .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
-                if(Validator.isNotEmpty(user2)){
-                    throw new CustomException(itemImport.getRealname()+"身份证号码已存在，创建失败");
-                }
             }
+//            else{
+//                User user2 = getOne(new LambdaQueryWrapper<User>()
+//                        .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
+//                if(Validator.isNotEmpty(user2)){
+//                    throw new CustomException(itemImport.getRealname()+"身份证号码已存在，创建失败");
+//                }
+//            }
             User inertData = new User();
             inertData.setTelphone(itemImport.getTelphone());
             //隐藏手机号作为初始昵称