submit

run-prod.sh

@@ -1,33 +1,34 @@
 #!/usr/bin/env bash
 # 定义应用组名
-group_name='zhongzheng'
+group_admin_name='zhongzheng'
 # 定义应用名称
-app_name='zhongzheng-saas-api'
+app_admin_name='zhongzheng-saas-admin'
 # 定义应用版本
-app_version='1.0-SNAPSHOT'
+app_admin_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----'
+echo '----copy jar admin----'
+docker stop ${app_admin_name}
+echo '----stop container admin----'
+docker rm ${app_admin_name}
+echo '----rm container admin----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin----'
 # 打包编译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} \
+docker build -f /mydata/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin----'
+docker run \
+-p 5030:5030 \
+--name ${app_admin_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 \
+-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_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
+-v /data/logs/prod_admin:/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----'

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -729,7 +729,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!save(inertData)){
             throw new CustomException("注册失败");
         }
-        iSmsService.sendPwdSms(bo.getTel(),pwd);
+//        iSmsService.sendPwdSms(bo.getTel(),pwd);
         return inertData.getUserId();
     }
 
@@ -1019,11 +1019,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     }
                 }*/
                 UserSystemRegisterBo registerBo = BeanUtil.toBean(bo, UserSystemRegisterBo.class);
+                String tel = "";
                 if (Validator.isNotEmpty(user1)){
                     //手机号码存在，身份证不一致 (随机生成)
-                    registerBo.setTel(createTel());
+                    tel = createTel();
+                    registerBo.setTel(tel);
                 }else {
-                    registerBo.setTel(bo.getTelphone());
+                    tel = bo.getTelphone();
+                    registerBo.setTel(tel);
                 }
                 if(Validator.isNotEmpty(bo.getSex())){
                     if(bo.getSex().equals("男")){
@@ -1042,6 +1045,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 if(userId.longValue()>0){
                     UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
                     user.setUserId(userId);
+                    user.setTelphone(tel);
                     list1.add(user);
                     continue;
                 }