From 0f1138dc273d02a5aac41659d09e1d32761da842 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 9 Apr 2020 22:52:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?epmet-user=20docker-compose.yml=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 97af53a921..71e069637c 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -1,6 +1,6 @@ version: "3.7" services: web: - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0.1 ports: - "8087:8087" \ No newline at end of file From 8bbf9e7700738bfa7008d24ddf93dc6f06501429 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 9 Apr 2020 23:52:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?epmet-user=20docker-compose.yml=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 71e069637c..292763045b 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -1,6 +1,6 @@ version: "3.7" services: web: - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.1 ports: - "8087:8087" \ No newline at end of file From 18d88eca54cdb208e90197328b86b9d89e989fb8 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Fri, 10 Apr 2020 01:25:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BE=A4=E7=BB=84=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invitation/form/LinkGroupInfoFormDTO.java | 4 + .../invitation/result/LinkGroupInfoDTO.java | 13 ++- .../modules/feign/EpmetUserFeignClient.java | 11 +++ .../EpmetUserFeignClientFallback.java | 6 ++ .../impl/GroupInvitationServiceImpl.java | 82 ++++++++++++++----- .../mapper/invitation/GroupInvitationDao.xml | 2 + .../epmet/dto/form/UserInvitationFormDTO.java | 54 ++++++++++++ .../controller/UserInvitationController.java | 19 ++++- .../java/com/epmet/dao/UserInvitationDao.java | 18 +++- .../epmet/service/UserInvitationService.java | 13 ++- .../impl/UserInvitationServiceImpl.java | 27 +++++- .../resources/mapper/UserInvitationDao.xml | 15 +++- 12 files changed, 234 insertions(+), 30 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java index eab8aa8247..9c9d753ad0 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java @@ -20,8 +20,12 @@ public class LinkGroupInfoFormDTO implements Serializable { @NotBlank(message="邀请链接id不能为空") private String invitationId; + @NotBlank(message = "邀请场景不能为空") + private String inviteSource; + /** * 当前登录用户id由TokenDto赋值 */ + @NotBlank(message = "当前登录用户id不能为空") private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java index 240901878d..cae84ce67b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java @@ -12,11 +12,22 @@ import java.io.Serializable; @Data public class LinkGroupInfoDTO implements Serializable { private static final long serialVersionUID = 6136787210623326830L; + /** * 群组id */ private String groupId; + /** + * 客户id + */ + private String customerId; + + /** + * 网格id + */ + private String gridId; + /** * 群组头像 */ @@ -24,7 +35,7 @@ public class LinkGroupInfoDTO implements Serializable { /** * 组长名称！！！！！！！！ - * 暂定街道-姓名 + * 暂定街道-姓女士/男士 */ private String leaderName; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 3c620c3c72..575d610516 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; @@ -52,4 +53,14 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/userresiinfo/getuserresiinfolist", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO); + + /** + * @param userInvitationFormDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存或者更新人员邀请关系表 + * @Date 2020/4/10 0:58 + **/ + @PostMapping(value = "epmetuser/userinvitation/saveuserinvitation", consumes = MediaType.APPLICATION_JSON_VALUE) + Result saveUserInvitation(@RequestBody UserInvitationFormDTO userInvitationFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java index 6519d76517..5eacfdb7a4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.modules.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; @@ -35,4 +36,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { public Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO); } + + @Override + public Result saveUserInvitation(UserInvitationFormDTO userInvitationFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserInvitation", userInvitationFormDTO); + } } 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 3b9d3d1059..c15330051a 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 @@ -29,7 +29,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ReadFlagConstant; -import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; @@ -199,14 +199,15 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) { - //校验是否存在该邀请连接 + //0、校验是否存在该邀请连接（判断是会否被删除连接、是否失效、群状态） Result validResult = this.checkLinkValid(formDTO.getInvitationId()); if (!validResult.success()) { return new Result().error(validResult.getCode(), validResult.getMsg()); } + GroupInvitationDTO groupInvitationDTO=validResult.getData(); LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO(); //1、查询是否在群内 - ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(validResult.getData().getResiGroupId(), formDTO.getUserId()); + ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(groupInvitationDTO.getResiGroupId(), formDTO.getUserId()); if (null != resiGroupMemberDTO && !MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())) { linkGroupInfoResultDTO.setInGroup(Constant.YES); return new Result().ok(linkGroupInfoResultDTO); @@ -214,7 +215,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupInfo.getGroupId()); if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { @@ -223,9 +224,36 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().ok(linkGroupInfoResultDTO); } + /** + * @param groupInvitationDTO + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 记录用户邀请关系 + * @Date 2020/4/10 1:01 + **/ + private Result saveUserInvitation(GroupInvitationDTO groupInvitationDTO, LinkGroupInfoFormDTO formDTO) { + UserInvitationFormDTO userInvitationFormDTO = new UserInvitationFormDTO(); + userInvitationFormDTO.setCustomerId(groupInvitationDTO.getInviterCustomerId()); + userInvitationFormDTO.setGridId(groupInvitationDTO.getInviterGridId()); + userInvitationFormDTO.setInviterUserId(groupInvitationDTO.getInviterUserId()); + userInvitationFormDTO.setInviteeUserId(formDTO.getUserId()); + userInvitationFormDTO.setInviteSource(formDTO.getInviteSource()); + userInvitationFormDTO.setInviteSourceId(formDTO.getInvitationId()); + Result result = epmetUserFeignClient.saveUserInvitation(userInvitationFormDTO); + if (!result.success()) { + logger.info("人员邀请关系记录失败" + result.getMsg()); + } else { + logger.info("人员邀请关系记录成功"); + } + return result; + } + /** * @param groupId * @return com.epmet.commons.tools.utils.Result @@ -259,6 +287,17 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); } + ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId()); + if (null == resiGroupEntity) { + logger.info("组不存在"); + //TODO + } else if (null != resiGroupEntity && GroupStateConstant.GROUP_CLOSED.equals(resiGroupEntity.getState())) { + logger.info("组已经关闭"); + //TODO + } else if (null != resiGroupEntity && GroupStateConstant.GROUP_HIDDEN.equals(resiGroupEntity.getState())) { + logger.info("组已屏蔽"); + //TODO + } return new Result().ok(groupInvitationDTO); } @@ -276,8 +315,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(validResult.getCode(), validResult.getMsg()); } + GroupInvitationDTO groupInvitationDTO=validResult.getData(); //2、校验是否已经注册居民 - ResiGroupDTO resiGroupDTO = resiGroupService.get(validResult.getData().getResiGroupId()); + ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId()); if (null != resiGroupDTO) { UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(), formDTO.getUserId(), @@ -292,13 +332,12 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl userResiInfoDTOResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); if (!userResiInfoDTOResult.success() || null == userResiInfoDTOResult.getData()) { - return; + logger.info("查询居民注册信息失败"); + return new Result(); } UserMessageFormDTO userMessage = new UserMessageFormDTO(); userMessage.setApp(AppClientConstant.APP_RESI); @@ -350,8 +386,14 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl SELECT rg.id AS groupId, + rg.CUSTOMER_ID as customerId, + rg.GRID_ID as gridId, rg.GROUP_HEAD_PHOTO AS groupHeadPhoto, rg.GROUP_NAME AS groupName, rg.GROUP_INTRODUCTION AS groupIntroduction, diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java new file mode 100644 index 0000000000..f0bb36cab8 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java @@ -0,0 +1,54 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 记录用户邀请关系入参DTO + * @Author yinzuomei + * @Date 2020/4/10 0:16 + */ +@Data +public class UserInvitationFormDTO implements Serializable { + private static final long serialVersionUID = 5896435058363486373L; + + /** + * 客户Id (customer.id) + */ + @NotBlank(message = "客户id不能为空") + private String customerId; + + /** + * 网格Id (customer_grid.id) + */ + @NotBlank(message = "网格id不能为空") + private String gridId; + + /** + * 邀请人Id + */ + @NotBlank(message = "邀请人id不能为空") + private String inviterUserId; + + /** + * 被邀请人Id + */ + @NotBlank(message = "被邀请人id不能为空") + private String inviteeUserId; + + /** + * 邀请场景 (value:feature+action) + */ + @NotBlank(message = "邀请场景不能为空") + private String inviteSource; + + /** + * 邀请记录Id + */ + @NotBlank(message = "邀请记录id不能为空") + private String inviteSourceId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java index f93019ba04..6832021461 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java @@ -23,15 +23,17 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserInvitationDTO; +import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.excel.UserInvitationExcel; import com.epmet.service.UserInvitationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; import java.util.Map; @@ -45,7 +47,7 @@ import java.util.Map; @RestController @RequestMapping("userinvitation") public class UserInvitationController { - + @Autowired private UserInvitationService userInvitationService; @@ -91,4 +93,15 @@ public class UserInvitationController { ExcelUtils.exportExcelToTarget(response, null, list, UserInvitationExcel.class); } -} \ No newline at end of file + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存或者更新人员邀请关系表 + * @Date 2020/4/10 0:28 + **/ + @PostMapping("saveuserinvitation") + public Result saveUserInvitation(@RequestBody @Valid UserInvitationFormDTO formDTO) { + return userInvitationService.saveUserInvitation(formDTO); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java index e3bccc3f2f..948c57edf0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java @@ -18,8 +18,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.UserInvitationDTO; import com.epmet.entity.UserInvitationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 人员邀请关系表 记录user之间的邀请关系 @@ -29,5 +31,17 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserInvitationDao extends BaseDao { - -} \ No newline at end of file + + /** + * @param inviteeUserId 被邀请人id + * @param inviteSourceId 邀请链接id + * @param inviteSource 邀请场景 + * @return com.epmet.dto.UserInvitationDTO + * @Author yinzuomei + * @Description 根据被邀请人id、邀请链接id、邀请场景查询人员邀请记录 + * @Date 2020/4/10 0:36 + **/ + UserInvitationDTO selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, + @Param("inviteSourceId") String inviteSourceId, + @Param("inviteSource") String inviteSource); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserInvitationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserInvitationService.java index d00d27fe36..d964b7edfc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserInvitationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserInvitationService.java @@ -19,7 +19,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserInvitationDTO; +import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.entity.UserInvitationEntity; import java.util.List; @@ -92,4 +94,13 @@ public interface UserInvitationService extends BaseService * @date 2020-03-30 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存或者更新人员邀请关系表 + * @Date 2020/4/10 0:36 + **/ + Result saveUserInvitation(UserInvitationFormDTO formDTO); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java index 5e235a2ce2..adfae02876 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java @@ -23,8 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.UserInvitationDao; import com.epmet.dto.UserInvitationDTO; +import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.entity.UserInvitationEntity; import com.epmet.redis.UserInvitationRedis; import com.epmet.service.UserInvitationService; @@ -34,6 +36,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -101,4 +104,26 @@ public class UserInvitationServiceImpl extends BaseServiceImpl - - \ No newline at end of file + + + From 6bd0157ca93fab36f5840b0d3d9d60336e3e2baa Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 10:45:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?epmet-admin-server=20=E6=96=B0=E5=A2=9Edock?= =?UTF-8?q?er-compose.yml=E5=92=8CDockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/Dockerfile | 11 +++++++++++ epmet-admin/epmet-admin-server/docker-compose.yml | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/Dockerfile create mode 100644 epmet-admin/epmet-admin-server/docker-compose.yml diff --git a/epmet-admin/epmet-admin-server/Dockerfile b/epmet-admin/epmet-admin-server/Dockerfile new file mode 100644 index 0000000000..52c7bfba5f --- /dev/null +++ b/epmet-admin/epmet-admin-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8082 + +ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml new file mode 100644 index 0000000000..22ad7b3e2e --- /dev/null +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -0,0 +1,6 @@ +version: "3.7" +services: + web: + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1 + ports: + - "8082:8082" \ No newline at end of file From c514f2ed4a7adbe2cb05c1c1cfe90fccd2a543fd Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 10 Apr 2020 10:56:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/StrangerResiGuideConstant.java | 4 ++-- .../main/java/com/epmet/constant/GridVisitedConstant.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java index 6d84665655..b724c34492 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java @@ -17,9 +17,9 @@ public interface StrangerResiGuideConstant { /** * 参数异常 */ - String PARAMETER_EXCEPTION = "参数异常，app端不是指定的居民端，请检查token信息！"; + String PARAMETER_EXCEPTION = "参数异常，app端不是指定的居民端，请检查token信息"; /** * 服务调用异常 */ - String EPMET_USER_EXCEPTION = "调用epmet-user服务保存网格记录表数据失败！"; + String EPMET_USER_EXCEPTION = "调用epmet-user服务保存网格记录表数据失败"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java index cfd7228e97..8256f85060 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java @@ -18,17 +18,17 @@ public interface GridVisitedConstant { /** * 查询异常 */ - String QUERY_EXCEPTION = "查询客户网格表数据失败！"; + String QUERY_EXCEPTION = "查询客户网格表数据失败"; /** * 网格访问记录表新增数据失败 */ - String SAVE_VISITED = "网格访问记录表新增数据失败！"; + String SAVE_VISITED = "网格访问记录表新增数据失败"; /** * 最近访问网格表新增数据失败 */ - String SAVE_LATEST = "最近访问网格表新增数据失败！"; + String SAVE_LATEST = "最近访问网格表新增数据失败"; /** * tokenDto中的userId不能为空 From 687b5ae9208932b634e1f4848ea2ff9a1e7c83e5 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 11:16:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E5=92=8Cadmin?= =?UTF-8?q?=E7=9A=84docker-compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml index 22ad7b3e2e..2c66d64ffd 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -1,6 +1,6 @@ version: "3.7" services: web: - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.0 ports: - "8082:8082" \ No newline at end of file diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 292763045b..97af53a921 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -1,6 +1,6 @@ version: "3.7" services: web: - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0 ports: - "8087:8087" \ No newline at end of file