From 34ac200702aca8c9e5977942dff61c049c0e11ff Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 14:03:25 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E5=90=8D=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E5=8C=85=E5=90=AB=E6=9C=AA=E5=AE=A1=E6=A0=B8=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87-heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ActInfoDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 889c170bae..8a6488ceb1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -145,7 +145,7 @@ IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} - LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID + LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' -- 活动开始时间 <= 当前时间 进行中 AND NOW() @@ -171,7 +171,7 @@ IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} - LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID + LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' AND i.ACT_STATUS = 'finished' AND i.CUSTOMER_ID = #{customerId} From 7fc075eb5cd5451dfad55146fcd9178338c1358d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 15:07:13 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=9A?= =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkActUserController.java | 18 +++++++++--------- .../java/com/epmet/dao/ActUserRelationDao.java | 9 +++++++++ .../epmet/service/ActUserRelationService.java | 9 +++++++++ .../impl/ActUserRelationServiceImpl.java | 5 +++++ .../service/impl/WorkActUserServiceImpl.java | 4 ++-- .../resources/mapper/ActUserRelationDao.xml | 13 +++++++++++++ 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java index 59769d69b9..5e421381a3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java @@ -25,13 +25,13 @@ public class WorkActUserController { @Autowired private WorkActUserService workActUserService; - + /** * @return com.epmet.commons.tools.utils.Result> * @param formDTO * @author yinzuomei * @description 报名审核-待审核列表 - * @Date 2020/7/21 22:24 + * @Date 2020/7/21 22:24 **/ @PostMapping("auditinglist") public Result> getAuditingList(@RequestBody ActIdFormDTO formDTO){ @@ -45,7 +45,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-已通过列表 - * @Date 2020/7/22 15:16 + * @Date 2020/7/22 15:16 **/ @PostMapping("passedlist") public Result> getPassedList(@RequestBody ActIdFormDTO formDTO){ @@ -58,7 +58,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-已拒绝列表 - * @Date 2020/7/22 15:49 + * @Date 2020/7/22 15:49 **/ @PostMapping("rejectedlist") public Result> getRejectedlist(@RequestBody ActIdFormDTO formDTO){ @@ -123,7 +123,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-审核通过 - * @Date 2020/7/23 17:31 + * @Date 2020/7/23 17:31 **/ @PostMapping("auditpass") public Result auditPass(@RequestBody AuditUserFormDTO formDTO){ @@ -137,7 +137,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-拒绝报名 - * @Date 2020/7/23 18:08 + * @Date 2020/7/23 18:08 **/ @PostMapping("auditrefuse") public Result auditrefuse(@RequestBody AuditUserFormDTO formDTO){ @@ -150,8 +150,8 @@ public class WorkActUserController { * @return com.epmet.commons.tools.utils.Result> * @param formDTO * @author yinzuomei - * @description 已结束-已参加人员列表 - * @Date 2020/7/24 10:17 + * @description 已结束-已参加人员列表(审核中、审核通过) + * @Date 2020/7/24 10:17 **/ @PostMapping("joinuserlist") public Result> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){ @@ -164,7 +164,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 已结束-已取消报名人员列表 - * @Date 2020/7/24 10:53 + * @Date 2020/7/24 10:53 **/ @PostMapping("canceleduserlist") public Result> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java index 1322db3c83..a18f3ae5dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java @@ -218,4 +218,13 @@ public interface ActUserRelationDao extends BaseDao { * @Date 15:59 2020-07-30 **/ String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId); + + /** + * @return java.util.List + * @param actId + * @author zhangyong + * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合 + * @Date 2020/7/21 22:44 + **/ + List getSignUpUserIdList(@Param("actId") String actId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java index 91ec9355da..1540926469 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java @@ -151,4 +151,13 @@ public interface ActUserRelationService extends BaseService registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO); + + /** + * @return java.util.List + * @param actId + * @author zhangyong + * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合 + * @Date 2020/7/21 22:44 + **/ + List getSignUpUserIdList(@Param("actId") String actId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index 7b25b31eab..935a5cd8a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -238,6 +238,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl getSignUpUserIdList(String actId) { + return baseDao.getSignUpUserIdList(actId); + } + /** * 开始报名活动 * diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 3694611f3c..879213f11a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -529,8 +529,8 @@ public class WorkActUserServiceImpl implements WorkActUserService { } List list=actInfoDao.queryJoinUserList(formDTO.getActId()); if(null!=list&&list.size()>0){ - //查询已通过审核的人员id集合 - List userIdList=actUserRelationService.getUserIdList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED); + //查询已报名(审核中、审核通过)的人员id集合 + List userIdList=actUserRelationService.getSignUpUserIdList(formDTO.getActId()); //根据已通过的人员集合，查询出用户基本信息 List userInfoList=this.queryUserBaseInfoList(userIdList); for(JoinedUserResultDTO joinedUserResultDTO:list){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index 17fbb27e9a..f6f1e87c0d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -319,4 +319,17 @@ AND aur.USER_ID = #{userId} AND aur.ACT_ID = #{actId} + + + From f54f3b65e4f8b1e56796237dcd6dbe18ef183aa3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Aug 2020 15:26:14 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E5=8D=87=E7=BA=A7heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 44f6c63ac8..ac05d69371 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.42 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.43 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 0b24223812..9c015b3dd0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.42 + 0.0.43 com.epmet epmet-heart From 179d1f45307430004a7e68bc7dc7d000857e6706 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 7 Aug 2020 16:45:14 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/redis/UserBaseInfoRedis.java | 62 +++++++++++-------- .../epmet/service/impl/UserServiceImpl.java | 36 ++++++++++- 2 files changed, 68 insertions(+), 30 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index a2439d4dcd..918daf7435 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -87,8 +87,17 @@ public class UserBaseInfoRedis { redisUtils.hMSet(key, map,RedisUtils.DEFAULT_EXPIRE * NumConstant.SEVEN); } - public String get(String id){ - return null; + public UserBaseInfoResultDTO get(String userId){ + + if(StringUtils.isNotBlank(userId)) { + Map map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(userId)); + if (null != map && !map.isEmpty()) { + //缓存中有数据，直接返回 + return BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true); + } + } + return null; + } /** @@ -193,6 +202,14 @@ public class UserBaseInfoRedis { UserBaseInfoResultDTO currentCache = ConvertUtils.sourceToTarget(entity,UserBaseInfoResultDTO.class); + UserBaseInfoResultDTO orientCache = get(entity.getUserId()); + if(null != orientCache && StringUtils.isNotBlank(orientCache.getUserId())){ + //将要更改的信息赋值到原缓存中 + mergeObject(currentCache,orientCache); + //将原来的缓存对象赋值给要更新的缓存对象 + //此时orientCache中包概括要更新的属性以及之前有切不更新的属性 + currentCache = orientCache; + } RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId()); //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士) if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ @@ -203,22 +220,24 @@ public class UserBaseInfoRedis { Result gridResult = govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() - && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ + && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())) { String gridFullName = gridResult.getData().getBelongsGridName(); currentCache.setRegisteredGridName(gridFullName); - if(StringUtils.isBlank(currentCache.getGender()))currentCache.setGender(NumConstant.ZERO_STR); - StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(currentCache.getSurname()); - switch (currentCache.getGender()) { - case NumConstant.ONE_STR: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); - break; - case NumConstant.TWO_STR: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); - break; - default: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + if (StringUtils.isBlank(currentCache.getGender())) currentCache.setGender(NumConstant.ZERO_STR); + if (StringUtils.isNotBlank(currentCache.getNickname())) { + StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(currentCache.getSurname()); + switch (currentCache.getGender()) { + case NumConstant.ONE_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); + break; + case NumConstant.TWO_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); + break; + default: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + } + currentCache.setShowName(buffer.toString()); } - currentCache.setShowName(buffer.toString()); } }else{ //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id @@ -240,18 +259,7 @@ public class UserBaseInfoRedis { // } //} - Map map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(entity.getUserId())); - if(null != map && !map.isEmpty()) { - //缓存中有数据，直接返回 - UserBaseInfoResultDTO orientCache = BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true); - mergeObject(currentCache , orientCache); - set(orientCache); - }else{ - //缓存中没有该数据 - set(currentCache); - } - - + set(currentCache); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 88ad2d8ce0..f90ef05032 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -8,11 +8,10 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserConstant; -import com.epmet.dao.UserDao; -import com.epmet.dao.UserRoleDao; -import com.epmet.dao.UserWechatDao; +import com.epmet.dao.*; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserDTO; +import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -21,6 +20,7 @@ import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; import com.epmet.feign.EpmetPointOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; +import com.epmet.redis.UserBaseInfoRedis; import com.epmet.service.UserBaseInfoService; import com.epmet.service.UserService; import com.epmet.util.ModuleConstant; @@ -53,6 +53,12 @@ public class UserServiceImpl extends BaseServiceImpl implem private UserBaseInfoService userBaseInfoService; @Autowired private EpmetPointOpenFeignClient epmetPointOpenFeignClient; + @Autowired + private UserBaseInfoRedis userBaseInfoRedis; + @Autowired + private UserResiInfoDao userResiInfoDao; + @Autowired + private UserBaseInfoDao userBaseInfoDao; private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class); @@ -130,7 +136,31 @@ public class UserServiceImpl extends BaseServiceImpl implem userWechatDTO.setUpdatedTime(new Date()); userWechatDTO.setUpdatedBy(wxUserInfoFormDTO.getUserId()); userWechatDao.updateByUserId(userWechatDTO); + UserBaseInfoEntity baseInfo = new UserBaseInfoEntity(); + UserBaseInfoResultDTO cache = userBaseInfoRedis.get(wxUserInfoFormDTO.getUserId()); + if(null == cache || StringUtils.isBlank(cache.getId())){ + //没有缓存 + cache = + userBaseInfoDao.selectListByUserIdList(wxUserInfoFormDTO.getUserId()); + if(null == cache || StringUtils.isBlank(cache.getId()) || StringUtils.isBlank(cache.getMobile()) ||StringUtils.isBlank(cache.getSurname())){ + //没有baseInfo + UserResiInfoDTO resiInfo = + userResiInfoDao.selectByUserId(wxUserInfoFormDTO.getUserId()); + if(null == resiInfo || StringUtils.isBlank(resiInfo.getId())){ + //没有resiInfo + return new Result(); + }else{ + baseInfo.setSurname(resiInfo.getSurname()); + baseInfo.setName(resiInfo.getName()); + baseInfo.setStreet(resiInfo.getStreet()); + baseInfo.setDistrict(resiInfo.getDistrict()); + baseInfo.setBuildingAddress(resiInfo.getBuildingAddress()); + baseInfo.setMobile(resiInfo.getRegMobile()); + } + } + } + baseInfo.setUserId(wxUserInfoFormDTO.getUserId()); baseInfo.setNickname(wxUserInfoFormDTO.getNickName()); baseInfo.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl()); From beea1a8c4021746ba1311660a96fb5cb477bf6a7 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 16:58:14 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/ActInfoDao.java | 2 +- .../src/main/resources/mapper/ActInfoDao.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java index 002bd3a6b3..b4fea5476a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java @@ -258,7 +258,7 @@ public interface ActInfoDao extends BaseDao { * @return java.util.List * @param actId * @author yinzuomei - * @description 已结束-已参加人员列表 + * @description 已结束-已参加人员列表(审核中、审核通过) * @Date 2020/7/24 10:18 **/ List queryJoinUserList(String actId); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 8732b7c248..2d442beff6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -551,7 +551,7 @@ limit #{pageNo}, #{pageSize} - + From f8fef3cf9f773985b2dd0686d828051918ea119e Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 7 Aug 2020 17:09:44 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9B=B4=E6=96=B0=20?= =?UTF-8?q?=20=20111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index e7e6219ac1..05049a8edb 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.110 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.111 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 9fd7485cf5..6e323ee2fe 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.110 + 0.3.111 com.epmet epmet-user From b121532f1dc0e07e5d1d086c4182475f526e7409 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Aug 2020 17:11:56 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=A4=A7=E4=BA=8E=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/exception/EpmetErrorCode.java | 1 + .../com/epmet/service/impl/WorkActServiceImpl.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 1ca4a859fd..fbbeebccbf 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -61,6 +61,7 @@ public enum EpmetErrorCode { HAVE_HANDLE(8123,"存在待处理事项,请先处理"), ACTUAL_TIME(8124,"请录入实际开始时间,实际结束时间"), ACTUAL_NOT_FINISHED(8125,"请先结束活动"), + ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR(8121,"活动报名截止时间应晚于当前时间"), CANNOT_AUDIT_WARM(8201, "请完善居民信息"), NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"), diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 4656baf0ee..740c446f37 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -147,6 +147,11 @@ public class WorkActServiceImpl implements WorkActService { //构造属性保存活动属性，活动内容 ActInfoEntity actInfoEntity=this.constructActInfo(formDTO); //校验参数 + + //校验 活动报名截止时间应该大于当前时间 + if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){ + throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg()); + } this.checkPublishFormDTO(actInfoEntity); PublishActResultDTO publishActResultDTO=new PublishActResultDTO(); //内容审核（活动标题、招募要求、活动内容图文） @@ -186,18 +191,19 @@ public class WorkActServiceImpl implements WorkActService { * @Date 2020/7/24 16:45 **/ private void checkPublishFormDTO(ActInfoEntity actInfoEntity) { + // //1、活动预计开始时间、活动预计结束时间 if(actInfoEntity.getActStartTime().compareTo(actInfoEntity.getActEndTime())!=-1){ - throw new RenException(EpmetErrorCode.ACT_START_TIME_ERROR.getCode()); + throw new RenException(EpmetErrorCode.ACT_START_TIME_ERROR.getCode(),EpmetErrorCode.ACT_START_TIME_ERROR.getMsg()); } //2、签到开始时间、签到结束时间 if(actInfoEntity.getSignInStartTime().compareTo(actInfoEntity.getSignInEndTime())!=-1){ - throw new RenException(EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getCode()); + throw new RenException(EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getCode(),EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getMsg()); } int n=actInfoEntity.getSignUpEndTime().compareTo(actInfoEntity.getActStartTime()); //3、报名截止时间（应该在活动预计开始时间之前） if(n!=-1){ - throw new RenException((EpmetErrorCode.ACT_SIGN_UP_END_TIME_ERROR.getCode())); + throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_ERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_ERROR.getMsg()); } } @@ -327,7 +333,7 @@ public class WorkActServiceImpl implements WorkActService { if(result.success()&&null!=result.getData()){ actInfoEntity.setPid(result.getData().getPid()); }else{ - logger.warn("根据agencyId查询组织信息失败，agencyId=",formDTO.getSponsorId()); + logger.warn("根据agencyId查询组织信息失败，agencyId={}",formDTO.getSponsorId()); } }else{ actInfoEntity.setPid(StrConstant.EPMETY_STR); From 4ee98e4b697142960b015f22e2e97e4372ee7487 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 7 Aug 2020 17:21:57 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/UserServiceImpl.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index f90ef05032..0a0c95d6fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -139,18 +139,8 @@ public class UserServiceImpl extends BaseServiceImpl implem UserBaseInfoEntity baseInfo = new UserBaseInfoEntity(); UserBaseInfoResultDTO cache = userBaseInfoRedis.get(wxUserInfoFormDTO.getUserId()); - if(null == cache || StringUtils.isBlank(cache.getId())){ - //没有缓存 - cache = - userBaseInfoDao.selectListByUserIdList(wxUserInfoFormDTO.getUserId()); - if(null == cache || StringUtils.isBlank(cache.getId()) || StringUtils.isBlank(cache.getMobile()) ||StringUtils.isBlank(cache.getSurname())){ - //没有baseInfo - UserResiInfoDTO resiInfo = - userResiInfoDao.selectByUserId(wxUserInfoFormDTO.getUserId()); - if(null == resiInfo || StringUtils.isBlank(resiInfo.getId())){ - //没有resiInfo - return new Result(); - }else{ + UserResiInfoDTO resiInfo = userResiInfoDao.selectByUserId(wxUserInfoFormDTO.getUserId()); + if(null != resiInfo && StringUtils.isNotBlank((resiInfo.getId()))) { baseInfo.setSurname(resiInfo.getSurname()); baseInfo.setName(resiInfo.getName()); baseInfo.setStreet(resiInfo.getStreet()); @@ -158,8 +148,8 @@ public class UserServiceImpl extends BaseServiceImpl implem baseInfo.setBuildingAddress(resiInfo.getBuildingAddress()); baseInfo.setMobile(resiInfo.getRegMobile()); } - } - } + + baseInfo.setUserId(wxUserInfoFormDTO.getUserId()); baseInfo.setNickname(wxUserInfoFormDTO.getNickName()); From 7d461160eb5a6a9a592816706fc03a24fe55e549 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 7 Aug 2020 17:24:45 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=20=20112?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 05049a8edb..aaecc89036 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.111 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.112 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 6e323ee2fe..fb079f2cd3 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.111 + 0.3.112 com.epmet epmet-user From e3ba79b9a52d8473bf03c38c789d6e8fb55c7107 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 17:33:24 +0800 Subject: [PATCH 10/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 3b9a6b3a15..3086bd316e 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.108 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.109 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a16b983f97..2ebec8bbf9 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.108 + 0.0.109 com.epmet From c53cf37690cc5042948693f7abba1175638b5294 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 17:34:31 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E5=8F=96=E6=B6=88=E7=9A=84=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/resi/ResiActDetailResultDTO.java | 15 +++++++++++++++ .../epmet/controller/ResiActListController.java | 2 +- .../epmet/service/impl/ActInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/ActInfoDao.xml | 16 ++++++++++++---- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java index 555ece4796..312d36843e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java @@ -152,4 +152,19 @@ public class ResiActDetailResultDTO implements Serializable { * 打卡截止时间（yyyy-MM-dd HH:mm） */ private String signInEndTime; + + /** + * 活动状态(已发布/报名中：published 已取消：canceled 已结束：finished) + */ + private String actStatus; + + /** + * 活动取消的原因 + */ + private String cancelReason; + + /** + * 取消活动的时间（yyyy-MM-dd HH:mm） + */ + private String cancelTime; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index 684965c721..e0f41b198d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -159,7 +159,7 @@ public class ResiActListController { } /** - * 活动详情 + * 活动详情(包含已取消信息) * * @param tokenDto * @param formDto diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index f2907b33d4..0691836f68 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -144,7 +144,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl finished = baseDao.selectListActFinished(formDto); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 2d442beff6..f8bfb2f486 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -154,7 +154,7 @@ ORDER BY i.CREATED_TIME DESC - + @@ -412,7 +417,10 @@ i.SPONSOR_NAME sponsor, DATE_FORMAT(i.ACTUAL_START_TIME,'%Y-%m-%d %H:%i') actualStartTime, DATE_FORMAT(i.ACTUAL_END_TIME,'%Y-%m-%d %H:%i') actualEndTime, - IF(aur.SIGN_IN_FLAG = 'signed_in', true , false ) as isSignUp-- 是否已签到(true已签到，false未签到) + IF(aur.SIGN_IN_FLAG = 'signed_in', true , false ) as isSignUp, -- 是否已签到(true已签到，false未签到) + i.ACT_STATUS actStatus, + i.CANCEL_REASON cancelReason, + DATE_FORMAT(i.CANCEL_TIME,'%Y-%m-%d %H:%i') cancelTime FROM act_info i LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID From 9d2b0bb83eae0053f310390c9fee8bc21172416d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 17:42:20 +0800 Subject: [PATCH 12/31] =?UTF-8?q?heart=E6=A8=A1=E5=9D=97=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index ac05d69371..3a128b4d4a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.43 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.44 ports: - "8111:8111" network_mode: host # 使用现有网络 @@ -14,4 +14,4 @@ services: resources: limits: cpus: '0.1' - memory: 250M \ No newline at end of file + memory: 250M diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 9c015b3dd0..1c4ac2008a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.43 + 0.0.44 com.epmet epmet-heart From b6e3ddd1cfc4d7aff9b1356d2c67f8d32c30393b Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 7 Aug 2020 17:59:06 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index aaecc89036..c4678d66cd 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.112 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.113 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index fb079f2cd3..6b4dbb7a3d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.112 + 0.3.113 com.epmet epmet-user From 9c57906731ac5e94cf82429fe90d70ac0434637a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 18:11:05 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=8F=96=E6=B6=88=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index f8bfb2f486..ea1f6501d9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -178,7 +178,7 @@ LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' - AND i.ACT_STATUS = 'finished' + AND i.ACT_STATUS != 'published' AND i.CUSTOMER_ID = #{customerId} ORDER BY i.ACT_STATUS DESC, i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} From 55565722c1c6f7974244596054ad6898cb927908 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 18:14:11 +0800 Subject: [PATCH 15/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 3086bd316e..85e0adfe1b 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.109 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.110 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 2ebec8bbf9..4cb37c7143 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.109 + 0.0.110 com.epmet From e94b78364ee8e9bfe22f8a34a524df80d5e32058 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 20:29:44 +0800 Subject: [PATCH 16/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 85e0adfe1b..3fe2e7201f 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.110 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.111 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 4cb37c7143..1316373ba3 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.110 + 0.0.111 com.epmet From e6131dbe12112df581b3cb7ab91c18cb44e572a2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 21:10:08 +0800 Subject: [PATCH 17/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 3fe2e7201f..dd440435ab 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.111 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.112 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 1316373ba3..27b00e9fad 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.111 + 0.0.112 com.epmet From 3526d02977aefac70794e676a56ee1b7b9849f46 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 08:53:01 +0800 Subject: [PATCH 18/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index dd440435ab..ceca26e685 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.112 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.113 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 27b00e9fad..df9092b122 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.112 + 0.0.113 com.epmet From 79f765ffd0f02773a38f530cd454e34caa86e4d1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 09:11:49 +0800 Subject: [PATCH 19/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/WarrantServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index cd0b6295ca..262de84cdd 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -337,6 +337,7 @@ public class WarrantServiceImpl implements WarrantService { sb.append(""); // sb.append(""); // sb.append(""); + sb.append(""); sb.append(""); String replyMsg = sb.toString(); From 2e3536dd6eeef14877e50c28cb6a2832f37f6020 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 09:27:00 +0800 Subject: [PATCH 20/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index ceca26e685..00ff69e659 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.113 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.114 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index df9092b122..3f12a0490c 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.113 + 0.0.114 com.epmet From 9c4b8af6124ce195f8c72b49ff0bbc4729de1af3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 8 Aug 2020 10:13:16 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E9=83=A8=E7=BD=B2heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 3a128b4d4a..6657b1a07b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.44 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.45 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 05632f1c83..bd1df2562d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.42 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.45 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 1c4ac2008a..3d5f6772fc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.44 + 0.0.45 com.epmet epmet-heart From c30679c10fe79781a66a2e583a7719886c920742 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 10:40:05 +0800 Subject: [PATCH 22/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 00ff69e659..d59f0ee045 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.114 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.115 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 3f12a0490c..0ef28db5a1 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.114 + 0.0.115 com.epmet From a012e8402af54e95c7892d771895cab53f353dfc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 09:14:40 +0800 Subject: [PATCH 23/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index d59f0ee045..71002a4833 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.115 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.116 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 0ef28db5a1..306cb6ed20 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.115 + 0.0.116 com.epmet From 3f6b3d656867de8c508abcb2515c7fcc3fe71bf8 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 10 Aug 2020 09:58:35 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E8=AE=A4=E8=AF=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/resi/ResiSendSmsCodeFormDTO.java | 26 ++++++++ .../ResiVolunteerAuthenticateFormDTO.java | 6 ++ .../controller/ResiVolunteerController.java | 16 +++++ .../epmet/service/VolunteerInfoService.java | 11 ++++ .../impl/VolunteerInfoServiceImpl.java | 64 ++++++++++++++++++- 5 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiSendSmsCodeFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiSendSmsCodeFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiSendSmsCodeFormDTO.java new file mode 100644 index 0000000000..9ff4ad64f9 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiSendSmsCodeFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form.resi; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 居民端-志愿者认证-短信验证码发送接口入参 + * @Author zhangyong + * @Date 2020/04/18 10:26 + */ +@Data +public class ResiSendSmsCodeFormDTO implements Serializable { + private static final long serialVersionUID = -1852541457359282018L; + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) + private String mobile; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java index 497f36f06e..be0ea43393 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java @@ -114,4 +114,10 @@ public class ResiVolunteerAuthenticateFormDTO implements Serializable { * 志愿者签名 */ private String volunteerSignature; + + /** + * 短信验证码 + * 移动端决定是否上送验证码。 + */ + private String smsCode; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java index 23098cd62b..d1f471a31a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.service.VolunteerInfoService; @@ -70,4 +71,19 @@ public class ResiVolunteerController { public Result selectVolunteerInfo(@LoginUser TokenDto tokenDTO){ return volunteerInfoService.selectVolunteerInfoByUserId(tokenDTO); } + + /** + * 志愿者认证 - 发送短信验证码 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:47 2020-08-10 + **/ + @PostMapping(value = "sendsmscode") + public Result sendSmsCode(@RequestBody ResiSendSmsCodeFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,ResiSendSmsCodeFormDTO.AddUserShowGroup.class); + volunteerInfoService.sendSmsCode(formDTO); + return new Result(); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java index 224da29b05..ede27b72a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.VolunteerInfoDTO; +import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.entity.VolunteerInfoEntity; @@ -57,4 +58,14 @@ public interface VolunteerInfoService extends BaseService { * @Date 14:05 2020-07-30 **/ Result selectVolunteerInfoByUserId(TokenDto tokenDto); + + /** + * 居民端志愿者认证-发送验证码 + * + * @param formDTO + * @return void + * @Author zhangyong + * @Date 09:19 2020-08-10 + **/ + void sendSmsCode(ResiSendSmsCodeFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index c931bbfe60..199e560b60 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -18,26 +18,34 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; +import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.enums.EventEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SendMqMsgUtils; +import com.epmet.constant.SmsTemplateConstant; import com.epmet.dao.VolunteerInfoDao; import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.VolunteerInfoDTO; +import com.epmet.dto.form.SendVerificationCodeFormDTO; +import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.result.ResiUserBaseInfoResultDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.entity.VolunteerInfoEntity; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.redis.VolunteerInfoRedis; import com.epmet.service.HeartUserInfoService; import com.epmet.service.VolunteerInfoService; import org.apache.logging.log4j.LogManager; @@ -58,9 +66,12 @@ import java.util.List; @Service public class VolunteerInfoServiceImpl extends BaseServiceImpl implements VolunteerInfoService { private Logger logger = LogManager.getLogger(VolunteerInfoServiceImpl.class); + private static final String SEND_SMS_CODE_ERROR = "发送短信验证码异常,手机号[%s],code[%s],msg[%s]"; - @Autowired - private VolunteerInfoRedis volunteerInfoRedis; + /** + * redis 验证码 过期时长为30分钟，单位：秒 + */ + private final static long MINUTE_THIRTY_EXPIRE = 60 * 30 * 1L; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @@ -68,9 +79,24 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl().ok(resultDTO); } + + @Override + public void sendSmsCode(ResiSendSmsCodeFormDTO formDTO) { + //1、发送短信验证码 + SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO(); + sendVerificationCodeFormDTO.setMobile(formDTO.getMobile()); + sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER); + Result smsCodeResult=epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); + if (!smsCodeResult.success()) { + logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg())); + throw new RenException(smsCodeResult.getCode()); + } + //2、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis) + this.saveSmsCode(formDTO, smsCodeResult.getData().getCode()); + logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile())); + } + + /** + * 保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis) + * 过期时长为30分钟 + * + * @param sendSmsCodeFormDTO app、client、phone + * @param smsCode 验证码 + * @return void + * @Author zhangyong + * @Date 09:43 2020-08-10 + **/ + public void saveSmsCode(ResiSendSmsCodeFormDTO sendSmsCodeFormDTO, String smsCode) { + String smsCodeKey = RedisKeys.getLoginSmsCodeKey(LoginConstant.APP_RESI, LoginConstant.CLIENT_WXMP, sendSmsCodeFormDTO.getMobile()); + logger.info(String.format("短信验证码key=%s", smsCodeKey)); + redisUtils.set(smsCodeKey, smsCode, MINUTE_THIRTY_EXPIRE); + } } From 69a10c49aadf3424c4cb81fe6077277832c2d170 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 10 Aug 2020 10:17:17 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8Credis=20-=20key?= =?UTF-8?q?=E5=8F=98=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/redis/RedisKeys.java | 11 +++++++++++ .../service/impl/VolunteerInfoServiceImpl.java | 14 ++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 3c883ea2ac..bf7c8f1a83 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -277,4 +277,15 @@ public class RedisKeys { public static String getPointVerificationResultKey(String userId){ return rootPrefix.concat("resi:point:exchange:").concat(userId); } + + /** + * 居民端 - 志愿者认证发送验证码 epmet:smscode:regvolunteer:phone + * @param phone + * @return java.lang.String + * @Author zhangyong + * @Date 10:09 2020-08-10 + **/ + public static String getVolunteerSmsCodeKey(String phone) { + return String.format(rootPrefix+"smscode:regvolunteer:%s",phone); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 199e560b60..e9c52e460f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -18,7 +18,6 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; -import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -68,11 +67,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl Date: Mon, 10 Aug 2020 10:38:56 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E7=BE=A4=E9=82=80=E8=AF=B7=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GroupInvitationServiceImpl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 30c1ee44ba..6ec4834c97 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -199,7 +199,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl 4.0.0 - 0.0.45 + 0.0.46 com.epmet epmet-heart diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index e260e52f61..26c0f3dc0a 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.62 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.63 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f5a85b9ff7..f8086d9479 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.62 + 0.3.63 com.epmet resi-group From 334661b532432a4f500ca5f68f9f9c66c5671363 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Aug 2020 11:05:00 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9acceptinvitation?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=9C=A8=E7=BE=A4?= =?UTF-8?q?=E5=86=85=E7=9A=84=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GroupInvitationServiceImpl.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 6ec4834c97..bb02b51d0d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -317,7 +317,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl Date: Mon, 10 Aug 2020 11:07:38 +0800 Subject: [PATCH 29/31] group64 --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 26c0f3dc0a..f4e9dddd42 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.63 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.64 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f8086d9479..1e66ca7900 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.63 + 0.3.64 com.epmet resi-group From a20af02af4081c4818402433b6076f163eb7b70c Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Aug 2020 12:29:56 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E4=BC=98=E5=8C=96renException=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/filter/LogMsgSendFilter.java | 421 ++++++++++++------ .../com/epmet/controller/DemoController.java | 4 +- 2 files changed, 277 insertions(+), 148 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index fc5702f97a..4e2f0d16ab 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -17,6 +17,9 @@ import org.springframework.cloud.commons.util.InetUtils; import org.springframework.core.env.Environment; import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * desc: 发送日志消息 @@ -25,150 +28,276 @@ import java.text.SimpleDateFormat; * @author: jianjun liu */ public class LogMsgSendFilter extends LevelFilter { - private static final Logger logger = LoggerFactory.getLogger(LogMsgSendFilter.class); - private DingdingMsgSender msgSender = new DingdingMsgSender(); - private String webHook; - private String secret; - private String appName; - - private String activeEnv; - private String serverIp; - - @Override - public FilterReply decide(ILoggingEvent event) { - //如果日志级别等于设置的日志级别 则发送消息 - if (event.getLevel().isGreaterOrEqual(Level.ERROR)) { - try { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("【日志告警】\n"); - - stringBuilder.append("\n"); - - stringBuilder.append("告警级别：" + event.getLevel()); - stringBuilder.append("\n"); - if (StringUtils.isNotBlank(appName)) { - stringBuilder.append("服务名称：" + appName); - stringBuilder.append("\n"); - } - getServerInfo(); - if (StringUtils.isNotBlank(activeEnv)) { - stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName()); - stringBuilder.append("\n"); - } - - if (StringUtils.isNotBlank(serverIp)) { - stringBuilder.append("IP地址：" + serverIp); - stringBuilder.append("\n"); - } - stringBuilder.append("故障时间：" + formatLongTime2Str(event.getTimeStamp())); - stringBuilder.append("\n"); - stringBuilder.append("TraceId：" + Thread.currentThread().getName()); - stringBuilder.append("\n"); - stringBuilder.append("告警信息：" + event.getFormattedMessage()); - stringBuilder.append("\n"); - - IThrowableProxy throwableProxy = event.getThrowableProxy(); - //异常信息处理 暂时处理一级的5行数据 - apendStackInfo(stringBuilder, throwableProxy); - DingTalkTextMsg msg = new DingTalkTextMsg(); - msg.setContent(stringBuilder.toString()); - if (StringUtils.isNotBlank(webHook)) { - msg.setWebHook(webHook); - } - if (StringUtils.isNotBlank(secret)) { - msg.setSecret(secret); - } - boolean flag = msgSender.sendMsgAsync(msg); - if (!flag) { - logger.warn("msgSender.sendMsg fail,param：{}", stringBuilder.toString()); - } - } catch (Exception e) { - logger.warn("decide exception", e); - } - } - //交给其他filter继续向下处理 - return super.decide(event); - - } - - /** - * desc:获取服务 ip及profile信息 - */ - private void getServerInfo() { - try { - if (serverIp == null) { - InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class); - serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); - } - } catch (Exception e) { - logger.warn("getServerInfo get bean InetUtils exception", e); - return; - } - try { - if (activeEnv == null) { - Environment environment = SpringContextUtils.getBean(Environment.class); - String[] activeProfiles = environment.getActiveProfiles(); - if (activeProfiles != null && activeProfiles.length > 0) { - logger.info("activeProfiles:{}", activeProfiles); - activeEnv = activeProfiles[0]; - } - } - } catch (Exception e) { - logger.warn("getServerInfo get bean Environment exception", e); - } - } - - private void apendStackInfo(StringBuilder stringBuilder, IThrowableProxy throwableProxy) { - int defaultRowLine = 5; - if (throwableProxy != null) { - stringBuilder.append("异常信息：") - .append(throwableProxy.getClassName()) - .append(" : ") - .append(throwableProxy.getMessage()) - .append("\n"); - - StackTraceElementProxy[] stackTraceElementProxyArray = throwableProxy.getStackTraceElementProxyArray(); - StackTraceElementProxy stackTraceElementProxy = null; - - if (stackTraceElementProxyArray.length < defaultRowLine) { - defaultRowLine = stackTraceElementProxyArray.length; - } - for (int i = 0; i < defaultRowLine; i++) { - stackTraceElementProxy = stackTraceElementProxyArray[i]; - StackTraceElement stackTraceElement = stackTraceElementProxy.getStackTraceElement(); - stringBuilder.append("\t\tat "); - stringBuilder.append(stackTraceElement.getClassName()); - stringBuilder.append("."); - stringBuilder.append(stackTraceElement.getMethodName()); - stringBuilder.append("("); - stringBuilder.append(stackTraceElement.getFileName()); - stringBuilder.append("："); - stringBuilder.append(stackTraceElement.getLineNumber()); - stringBuilder.append(")"); - stringBuilder.append("\n"); - } - } - } - - - private String formatLongTime2Str(long timestamp) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - return dateFormat.format(timestamp); - } - - public void setActiveEnv(String activeEnv) { - this.activeEnv = activeEnv; - } - - public void setAppName(String appName) { - this.appName = appName; - } - - public void setWebHook(String webHook) { - this.webHook = webHook; - } - - public void setSecret(String secret) { - this.secret = secret; - } + private static final Logger logger = LoggerFactory.getLogger(LogMsgSendFilter.class); + private DingdingMsgSender msgSender = new DingdingMsgSender(); + private String webHook; + private String secret; + private String appName; + + private String activeEnv; + private String serverIp; + private String baseProjectPackage = "com.epmet"; + + @Override + public FilterReply decide(ILoggingEvent event) { + //如果日志级别等于设置的日志级别 则发送消息 + if (event.getLevel().isGreaterOrEqual(Level.ERROR)) { + try { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("【日志告警】\n"); + + stringBuilder.append("\n"); + + stringBuilder.append("告警级别：" + event.getLevel()); + stringBuilder.append("\n"); + if (StringUtils.isNotBlank(appName)) { + stringBuilder.append("服务名称：" + appName); + stringBuilder.append("\n"); + } + getServerInfo(); + if (StringUtils.isNotBlank(activeEnv)) { + stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName()); + stringBuilder.append("\n"); + } + + if (StringUtils.isNotBlank(serverIp)) { + stringBuilder.append("IP地址：" + serverIp); + stringBuilder.append("\n"); + } + stringBuilder.append("故障时间：" + formatLongTime2Str(event.getTimeStamp())); + stringBuilder.append("\n"); + stringBuilder.append("TraceId：" + Thread.currentThread().getName()); + stringBuilder.append("\n"); + String formattedMessage = event.getFormattedMessage(); + IThrowableProxy throwableProxy = event.getThrowableProxy(); + if (throwableProxy == null && formattedMessage.length() > 1000) { + formattedMessage = formattedMessage.substring(0, getCharacterPosition(formattedMessage, baseProjectPackage, 5)); + } + stringBuilder.append("告警信息：" + formattedMessage); + stringBuilder.append("\n"); + + + //异常信息处理 暂时处理一级的5行数据 + apendStackInfo(stringBuilder, throwableProxy); + DingTalkTextMsg msg = new DingTalkTextMsg(); + msg.setContent(stringBuilder.toString()); + if (StringUtils.isNotBlank(webHook)) { + msg.setWebHook(webHook); + } + if (StringUtils.isNotBlank(secret)) { + msg.setSecret(secret); + } + boolean flag = msgSender.sendMsgAsync(msg); + if (!flag) { + logger.warn("msgSender.sendMsg fail,param：{}", stringBuilder.toString()); + } + } catch (Exception e) { + logger.warn("decide exception", e); + } + } + //交给其他filter继续向下处理 + return super.decide(event); + + } + + /** + * desc:获取服务 ip及profile信息 + */ + private void getServerInfo() { + try { + if (serverIp == null) { + InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class); + serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + } + } catch (Exception e) { + logger.warn("getServerInfo get bean InetUtils exception", e); + return; + } + try { + if (activeEnv == null) { + Environment environment = SpringContextUtils.getBean(Environment.class); + String[] activeProfiles = environment.getActiveProfiles(); + if (activeProfiles != null && activeProfiles.length > 0) { + logger.info("activeProfiles:{}", activeProfiles); + activeEnv = activeProfiles[0]; + } + } + } catch (Exception e) { + logger.warn("getServerInfo get bean Environment exception", e); + } + } + + private void apendStackInfo(StringBuilder stringBuilder, IThrowableProxy throwableProxy) { + int defaultRowLine = 5; + if (throwableProxy != null) { + stringBuilder.append("异常信息：") + .append(throwableProxy.getClassName()) + .append(" : ") + .append(throwableProxy.getMessage()) + .append("\n"); + + StackTraceElementProxy[] stackTraceElementProxyArray = throwableProxy.getStackTraceElementProxyArray(); + StackTraceElementProxy stackTraceElementProxy = null; + + if (stackTraceElementProxyArray.length < defaultRowLine) { + defaultRowLine = stackTraceElementProxyArray.length; + } + for (int i = 0; i < defaultRowLine; i++) { + stackTraceElementProxy = stackTraceElementProxyArray[i]; + StackTraceElement stackTraceElement = stackTraceElementProxy.getStackTraceElement(); + stringBuilder.append("\t\tat "); + stringBuilder.append(stackTraceElement.getClassName()); + stringBuilder.append("."); + stringBuilder.append(stackTraceElement.getMethodName()); + stringBuilder.append("("); + stringBuilder.append(stackTraceElement.getFileName()); + stringBuilder.append("："); + stringBuilder.append(stackTraceElement.getLineNumber()); + stringBuilder.append(")"); + stringBuilder.append("\n"); + } + } + } + + public static void main(String[] args) { + String msg = "<<<<<<<<异常响应<<<<<<<<:事务流水号:na1597027822634, 执行时长:59ms, 响应数据:{\"code\":8102,\"internalMsg\":\"验证码错误\",\"msg\":\"验证码错误\"}, 异常信息:验证码错误, 堆栈信息:com.epmet.commons.tools.exception.RenException: \n" + + " at com.epmet.service.impl.VolunteerInfoServiceImpl.authenticate(VolunteerInfoServiceImpl.java:91)\n" + + " at com.epmet.service.impl.VolunteerInfoServiceImpl$$FastClassBySpringCGLIB$$7babb2e8.invoke()\n" + + " at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\n" + + " at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:750)\n" + + " at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\n" + + " at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:295)\n" + + " at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\n" + + " at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\n" + + " at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:689)\n" + + " at com.epmet.service.impl.VolunteerInfoServiceImpl$$EnhancerBySpringCGLIB$$f78b4778.authenticate()\n" + + " at com.epmet.controller.ResiVolunteerController.authenticate(ResiVolunteerController.java:59)\n" + + " at com.epmet.controller.ResiVolunteerController$$FastClassBySpringCGLIB$$e023fb55.invoke()\n" + + " at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\n" + + " at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:750)\n" + + " at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\n" + + " at org.springframework.aop.framework.adapter.MethodBeforeAdviceInterceptor.invoke(MethodBeforeAdviceInterceptor.java:56)\n" + + " at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\n" + + " at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\n" + + " at com.epmet.commons.tools.aspect.BaseRequestLogAspect.proceed(BaseRequestLogAspect.java:66)\n" + + " at com.epmet.aspect.RequestLogAspect.proceed(RequestLogAspect.java:26)\n" + + " at sun.reflect.GeneratedMethodAccessor195.invoke(Unknown Source)\n" + + " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n" + + " at java.lang.reflect.Method.invoke(Method.java:498)\n" + + " at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\n" + + " at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\n" + + " at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\n" + + " at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\n" + + " at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\n" + + " at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\n" + + " at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:689)\n" + + " at com.epmet.controller.ResiVolunteerController$$EnhancerBySpringCGLIB$$1c0751c0.authenticate()\n" + + " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" + + " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n" + + " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n" + + " at java.lang.reflect.Method.invoke(Method.java:498)\n" + + " at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190)\n" + + " at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138)\n" + + " at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:105)\n" + + " at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:893)\n" + + " at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:798)\n" + + " at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\n" + + " at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040)\n" + + " at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943)\n" + + " at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)\n" + + " at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909)\n" + + " at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)\n" + + " at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)\n" + + " at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.springframework.boot.actuate.web.trace.servlet.HttpTraceFilter.doFilterInternal(HttpTraceFilter.java:88)\n" + + " at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)\n" + + " at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)\n" + + " at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.springframework.web.filter.HiddenHttpMethodFilter.doFilterInternal(HiddenHttpMethodFilter.java:94)\n" + + " at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.filterAndRecordMetrics(WebMvcMetricsFilter.java:114)\n" + + " at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:104)\n" + + " at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)\n" + + " at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n" + + " at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n" + + " at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)\n" + + " at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\n" + + " at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:526)\n" + + " at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\n" + + " at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\n" + + " at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\n" + + " at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\n" + + " at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:367)\n" + + " at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)\n" + + " at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:860)\n" + + " at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1591)\n" + + " at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\n" + + " at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\n" + + " at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\n" + + " at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\n" + + " at java.lang.Thread.run(Thread.java:745)"; + + String substring = msg.substring(0, getCharacterPosition(msg, "com.epme1t", 5)); + System.out.println(substring); + } + + + public static int getCharacterPosition(String string, String findStr, int time) { + Matcher slashMatcher = null; + try { + slashMatcher = Pattern.compile(findStr).matcher(string); + int mIdx = 0; + while (slashMatcher.find()) { + mIdx++; + if (mIdx == time) { + break; + } + } + return slashMatcher.start(); + } catch (Exception e) { + logger.warn("getCharacterPosition no matche"); + return 0; + } + } + + + private String formatLongTime2Str(long timestamp) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + return dateFormat.format(timestamp); + } + + public void setActiveEnv(String activeEnv) { + this.activeEnv = activeEnv; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public void setWebHook(String webHook) { + this.webHook = webHook; + } + + public void setSecret(String secret) { + this.secret = secret; + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 2bc11e4e43..b8f7c3e3d2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.exception.RenException; import com.epmet.dto.AgencySubTreeDto; import com.epmet.service.StatsDemoService; import lombok.extern.slf4j.Slf4j; @@ -28,8 +29,7 @@ public class DemoController { @GetMapping("testAlarm") public void testAlarm() { //for (int i = 0; i < 20; i++) { - log.error("测试消息"); - //} + throw new RenException("测试消息长度"); } @GetMapping("testtx") From 4a7c4859dca763f37619fb6f5843a1e90c292f0e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 13:56:29 +0800 Subject: [PATCH 31/31] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 71002a4833..c6a1deb762 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.116 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.117 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 306cb6ed20..b3f78ca43d 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.116 + 0.0.117 com.epmet