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-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -1071,20 +1071,21 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImport.setCause("用户信息错误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
-            }else {
-                List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
-                if (!userSubscribes.isEmpty()){
-                    UserSubscribe userSubscribe = userSubscribes.get(0);
-                    if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
-                        String name = getName(userSubscribe.getStudentType().longValue());
-                        if (!userSubscribeImport.getStudentType().equals(name)){
-                            userSubscribeImport.setCause("学员类型错误");
-                            userSubscribeImports.add(userSubscribeImport);
-                            continue;
-                        }
-                    }
-                }
             }
+//            else {
+//                List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
+//                if (!userSubscribes.isEmpty()){
+//                    UserSubscribe userSubscribe = userSubscribes.get(0);
+//                    if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
+//                        String name = getName(userSubscribe.getStudentType().longValue());
+//                        if (!userSubscribeImport.getStudentType().equals(name)){
+//                            userSubscribeImport.setCause("学员类型错误");
+//                            userSubscribeImports.add(userSubscribeImport);
+//                            continue;
+//                        }
+//                    }
+//                }
+//            }
             userSubscribeAddBo.setUserId(userId);
             //预约状态
             userSubscribeAddBo.setSubscribeStatus(1);
@@ -1397,20 +1398,21 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImport.setCause("用户信息错误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
-            }else {
-                List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
-                if (!userSubscribes.isEmpty()){
-                    UserSubscribe userSubscribe = userSubscribes.get(0);
-                    if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
-                        String name = getName(userSubscribe.getStudentType().longValue());
-                        if (!userSubscribeImport.getStudentType().equals(name)){
-                            userSubscribeImport.setCause("学员类型错误");
-                            userSubscribeImports.add(userSubscribeImport);
-                            continue;
-                        }
-                    }
-                }
             }
+//            else {
+//                List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
+//                if (!userSubscribes.isEmpty()){
+//                    UserSubscribe userSubscribe = userSubscribes.get(0);
+//                    if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
+//                        String name = getName(userSubscribe.getStudentType().longValue());
+//                        if (!userSubscribeImport.getStudentType().equals(name)){
+//                            userSubscribeImport.setCause("学员类型错误");
+//                            userSubscribeImports.add(userSubscribeImport);
+//                            continue;
+//                        }
+//                    }
+//                }
+//            }
             userSubscribeAddBo.setUserId(userId);
             //预约状态
             userSubscribeAddBo.setSubscribeStatus(1);