From 9221264bb3efa76782735e6a64bc9121c6808e54 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 11 Apr 2020 17:23:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=BB=84-=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=88=97=E8=A1=A8=EF=BC=8C=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/group/ResiGroupInfoRedisDTO.java | 2 +- .../impl/RegisterRelationServiceImpl.java | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java index e777be4ed3..89cbcaeeea 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java @@ -56,7 +56,7 @@ public class ResiGroupInfoRedisDTO implements Serializable{ private String latestTopicPublishDate; /** - * 组统计嘻嘻你系 + * 组统计信息 * */ private ResiGroupStatisticalInfoRedisDTO groupStatisticalInfo; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 790793dd10..4566a99710 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -168,12 +168,16 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecords = baseDao.getListByUserId(enterGridFormDTO.getUserId()); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId()); + wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId()); + + //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证 if(null == registerRecords || registerRecords.size() <= 0){ //当前用户尚未注册过居民信息 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId()); - wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId()); + List userCustomerList = userCustomerDao.selectList(wrapper); if(null == userCustomerList || userCustomerList.size() <= 0){ userCustomerDao.insert(userCustomer); @@ -192,7 +196,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecordWithSameCustAndGrid = registerRecords.stream().filter(obj -> customerId.equals(obj.getCustomerId()) && gridId.equals(obj.getGridId())).findFirst(); - //是否存在相同客户相同网格的注册记录 + //不存在相同客户相同网格的注册记录 if(!registerRecordWithSameCustAndGrid.isPresent()){ Optional registerRecordWithSameCustAndDiffGrid = registerRecords.stream().filter(obj -> customerId.equals(obj.getCustomerId()) && !gridId.equals(obj.getGridId())).findAny(); @@ -217,7 +221,10 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl userCustomerList = userCustomerDao.selectList(wrapper); + if(null == userCustomerList || userCustomerList.size() <= 0){ + userCustomerDao.insert(userCustomer); + } }else{ //如果不存在不同客户不同网格数据，说明在居民注册时没有成功记录register_relation信息 From c05f11ac41ad23306b9a15c7fd9bf17aaf8f9d5b Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 13 Apr 2020 21:28:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BB=84=E4=BF=A1=E6=81=AF=E5=AD=98?= =?UTF-8?q?=E5=85=A5=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 21 +++++++ .../dto/group/ResiGroupInfoRedisDTO.java | 26 +++++++- .../ResiGroupStatisticalInfoRedisDTO.java | 15 +++++ .../member/ResiGroupMemberInfoRedisDTO.java | 20 ++++++ .../modules/group/redis/ResiGroupRedis.java | 17 ++++- .../service/impl/ResiGroupServiceImpl.java | 62 ++++++++++++++++--- .../member/redis/ResiGroupMemberRedis.java | 18 +++++- 7 files changed, 163 insertions(+), 16 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 b0deec2e02..4b57bb3530 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 @@ -174,4 +174,25 @@ public class RedisKeys { return rootPrefix.concat("resiregister:confirm:").concat(userId).concat("-").concat(mobile).concat("-*"); } + /** + * @Description 小组缓存信息key + * @Param 组Id + * @return epmet:resi:group:groupId + * @Author wangc + * @Date 2020.04.13 11:27 + **/ + public static String getResiGroupInfoKey(String groupId){ + return rootPrefix.concat("resi:group:").concat(groupId); + } + + /** + * @Description 组成员信息缓存key + * @Param 组Id 用户Id + * @return epmet:resi:group:member:groupId:userId + * @Author wangc + * @Date 2020.04.13 13:40 + **/ + public static String getResiGroupMemberInfoKey(String groupId, String userId){ + return rootPrefix.concat("resi:group:member:").concat(groupId).concat(":").concat(userId); + } } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java index 89cbcaeeea..f2c52f6804 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java @@ -9,6 +9,7 @@ import java.io.Serializable; * @ClassName ResiGroupInfoRedisDTO * @Author wangc * @date 2020.04.11 09:51 + * @Mark RedisKey为:epmet:resi:group:groupId */ @Data public class ResiGroupInfoRedisDTO implements Serializable{ @@ -60,6 +61,29 @@ public class ResiGroupInfoRedisDTO implements Serializable{ * */ private ResiGroupStatisticalInfoRedisDTO groupStatisticalInfo; - + /** + * Json事例 + * + * { + "groupId": "62a8f9c690a60ff35dfbde96ac5f2267", + "groupHeadPhoto": "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png", + "groupName": "产品研发群", + "groupIntroduction": "亿联科技城市治理事业部产品研发群", + "customerId": "f76def116c9c2dc0269cc17867af122c", + "gridId": "d28be766680811eab9c900163e08c0f9", + "groupState": "approved", + "latestTopicPublishDate": "2020-04-02 10:21:54", + "groupStatisticalInfo": { + "id": "7f38c68ae49257e415effd76372e2aed", + "totalMembers": 4, + "totalTopics": 11, + "totalIssues": 0, + "totalPartyMembers": 0, + "totalEarnestMembers": 1, + "totalNormalMembers": 4 + } + } + * + * */ } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalInfoRedisDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalInfoRedisDTO.java index d2a0db916d..18ac208d25 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalInfoRedisDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalInfoRedisDTO.java @@ -49,4 +49,19 @@ public class ResiGroupStatisticalInfoRedisDTO implements Serializable { * 注册居民总数 * */ private Integer totalNormalMembers; + + /** + * Json事例 + * + { + "id": "7f38c68ae49257e415effd76372e2aed", + "totalMembers": 4, + "totalTopics": 11, + "totalIssues": 0, + "totalPartyMembers": 0, + "totalEarnestMembers": 1, + "totalNormalMembers": 4 + } + * + * */ } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberInfoRedisDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberInfoRedisDTO.java index 3e5282fb3d..529fa1f9b8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberInfoRedisDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberInfoRedisDTO.java @@ -9,6 +9,7 @@ import java.io.Serializable; * @ClassName ResiGroupMemberInfoRedisDTO * @Author wangc * @date 2020.04.11 09:52 + * @Mark RedisKey为:epmet:resi:group:member:groupId:userId */ @Data public class ResiGroupMemberInfoRedisDTO implements Serializable { @@ -45,4 +46,23 @@ public class ResiGroupMemberInfoRedisDTO implements Serializable { * */ private String memberStatus; + /** + * 组Id，不存在redis的value中，存在redis的key中 + * */ + private String groupId; + + /** + * Json事例 + * + * { + "userId": "sfjsdjfjkdsfiemrlwejrlknsdlfjsd", + "userHeadPhoto": "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png", + "userShowName": "山东路-尹女士", + "groupLeaderFlag": "leader", + "enterGroupType": "created", + "memberStatus": "approved" + } + * + * + * */ } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java index 4ce9b643f2..a04d51a70d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java @@ -17,7 +17,10 @@ package com.epmet.modules.group.redis; +import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -35,9 +38,17 @@ public class ResiGroupRedis { public void delete(Object[] ids) { } - - public void set(){ - + /** + * @Description 新增/更新群组缓存信息 + * @Param + * @return + * @Author wangc + * @Date 2020.04.13 09:58 + **/ + public void set(ResiGroupInfoRedisDTO groupInfoRedis){ + if(null != groupInfoRedis && StringUtils.isNotBlank(groupInfoRedis.getGroupId())){ + redisUtils.set(RedisKeys.getResiGroupInfoKey(groupInfoRedis.getGroupId()), groupInfoRedis); + } } public String get(String id){ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index ee936b3911..9672703220 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -19,7 +19,6 @@ package com.epmet.modules.group.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.api.R; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -27,8 +26,8 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; @@ -37,9 +36,9 @@ import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.dao.ResiGroupOperationDao; import com.epmet.modules.group.entity.ResiGroupEntity; +import com.epmet.modules.group.redis.ResiGroupRedis; import com.epmet.modules.group.service.ResiGroupOperationService; import com.epmet.modules.group.service.ResiGroupService; - import com.epmet.modules.group.service.ResiGroupStatisticalService; import com.epmet.modules.member.dao.GroupMemeberOperationDao; import com.epmet.modules.member.dao.ResiGroupMemberDao; @@ -51,10 +50,7 @@ import com.epmet.resi.group.constant.GroupStateConstant; import com.epmet.resi.group.constant.LeaderFlagConstant; import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.dto.UserRoleDTO; -import com.epmet.resi.group.dto.group.ResiGroupDTO; -import com.epmet.resi.group.dto.group.ResiGroupOperationDTO; - -import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; +import com.epmet.resi.group.dto.group.*; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.CreatedResultDTO; import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO; @@ -69,9 +65,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** * 群组信息表 @@ -107,6 +102,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -451,6 +450,24 @@ public class ResiGroupServiceImpl extends BaseServiceImpl param = new HashMap<>(); + param.put("resiGroupId",resiGroupDTO.getId()); + List statisticalList = resiGroupStatisticalService.list(param); + if(null != statisticalList && statisticalList.size() > 0){ + ResiGroupInfoRedisDTO groupRedis = transferToGroupInfoRedis(resiGroupDTO,statisticalList.get(0)); + resiGroupRedis.set(groupRedis); + }else{ + //当没有查询到组统计信息时 + UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO(); + userRoleFormDTO.setApp("resi"); + userRoleFormDTO.setCustomerId(resiGroupDTO.getCustomerId()); + userRoleFormDTO.setUserId(agreeApplyGroupFormDTO.getUserId()); + //userRoleFormDTO.setGridId() + //epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO); + } + + return new Result(); } @@ -524,4 +541,29 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 14 Apr 2020 09:18:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/MymessageResultDTO.java | 5 +++++ .../com/epmet/constant/PartyMemberConstant.java | 15 +++++++++++++++ .../impl/PartyMemberConfirmServiceImpl.java | 16 ++++++++++++---- .../mapper/partymember/PartymemberInfoDao.xml | 1 + 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java index 693524057e..37f0bd632c 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java @@ -27,6 +27,11 @@ public class MymessageResultDTO implements Serializable { /** * 消息内容 */ + private String messageContent; + + /** + * 已读标记 + */ private String readFlag; /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index 158517a9cc..c0f4565c8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -105,4 +105,19 @@ public interface PartyMemberConstant { * 审核状态 未通过 */ String REJECTED = "rejected"; + + /** + * 网格ID + */ + String ALL = " all"; + + /** + * 认证成功 + */ + String CONFIRM_SUCCESS = "0"; + + /** + * 认证失败 + */ + String CONFIRM_FAILED = "1"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 2b0ea84e5d..ef61ee84e3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -164,14 +164,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //自动认证失败 - partyMemberInfoEntity.setConfirmResult("1"); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { partymemberInfoService.updateById(partyMemberInfoEntity); } - result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode()); result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg()); } else { @@ -179,17 +178,26 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); //自动认证成功 - partyMemberInfoEntity.setConfirmResult("0"); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { partymemberInfoService.updateById(partyMemberInfoEntity); } + //人工审核数据状态设为通过 + PartymemberConfirmManualDTO partymemberConfirmManualDTO = + partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoDTO.getId()); + if (null != partymemberConfirmManualDTO) { + partymemberConfirmManualDTO.setAuditStatus(PartyMemberConstant.APPROVED); + partymemberConfirmManualService.updateById(ConvertUtils.sourceToTarget(partymemberConfirmManualDTO, + PartymemberConfirmManualEntity.class)); + } + //添加用户党员角色关系 UserRoleDTO userRole = new UserRoleDTO(); userRole.setCustomerId(partyMemberInfoDTO.getCustomerId()); - userRole.setGridId("all"); + userRole.setGridId(PartyMemberConstant.ALL); userRole.setUserId(partyMemberInfoDTO.getUserId()); userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER); userRole.setApp(partyMemberInfoDTO.getApp()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index df09d8e777..ddc60b46db 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -40,6 +40,7 @@ pi.CUSTOMER_ID = #{customerId} AND pi.GRID_ID = #{gridId} AND pi.USER_ID = #{userId} + AND pi.CONFIRM_RESULT = '1' AND pi.DEL_FLAG = 0 AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL ) From 9b9c78ebc468e2a9b20635e4682c015ae6133327 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Tue, 14 Apr 2020 10:20:31 +0800 Subject: [PATCH 4/7] =?UTF-8?q?redis=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BA10?= =?UTF-8?q?.10.10.248?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 4 ++-- epmet-auth/pom.xml | 4 ++-- epmet-gateway/pom.xml | 4 ++-- epmet-module/epmet-activiti/epmet-activiti-server/pom.xml | 4 ++-- epmet-module/epmet-demo/epmet-demo-server/pom.xml | 4 ++-- epmet-module/epmet-job/epmet-job-server/pom.xml | 4 ++-- epmet-module/epmet-message/epmet-message-server/pom.xml | 4 ++-- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 4 ++-- epmet-module/gov-org/gov-org-server/pom.xml | 4 ++-- epmet-module/oper-access/oper-access-server/pom.xml | 4 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 4 ++-- epmet-module/oper-customize/oper-customize-server/pom.xml | 4 ++-- epmet-module/resi-group/resi-group-server/pom.xml | 4 ++-- epmet-module/resi-guide/resi-guide-server/pom.xml | 4 ++-- epmet-module/resi-mine/resi-mine-server/pom.xml | 4 ++-- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 4 ++-- epmet-user/epmet-user-server/pom.xml | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 57008f3d6b..66ae9b3533 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -99,7 +99,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -129,7 +129,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index bee517a83e..2842c7a96c 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -123,7 +123,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -157,7 +157,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 9bdc3d080e..f8f1d96b77 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -95,7 +95,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -164,7 +164,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 77c63cce67..df5bebdd66 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -175,7 +175,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -203,7 +203,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index f22330be65..cdee37a62c 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -121,7 +121,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -151,7 +151,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 69e393849b..a2784eae25 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -112,7 +112,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -142,7 +142,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index d0491e382b..d822419549 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -133,7 +133,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -163,7 +163,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 2d154e0fe3..a970236643 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -137,7 +137,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -167,7 +167,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 54875bf0ce..bd5863a670 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -112,7 +112,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -142,7 +142,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 8df713a550..8f8e681280 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -108,7 +108,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -138,7 +138,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 8473caf7e8..4bbfea43c6 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -107,7 +107,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -137,7 +137,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index c2781bb01a..715075b15d 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -101,7 +101,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -131,7 +131,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index a9a39329a3..3873802452 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -113,7 +113,7 @@ elink@833066 1 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -143,7 +143,7 @@ elink@833066 1 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index b3eaee060f..55dc1ee3c1 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -119,7 +119,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -149,7 +149,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index b212d3a44b..8bab7eec80 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -125,7 +125,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -155,7 +155,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 460f436997..fd3b44f67b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -124,7 +124,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -154,7 +154,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 80aa220e15..4461b0da41 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -115,7 +115,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -145,7 +145,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 From 6870daec2bafc6ad0ae0c3082861feeffcfcb694 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Apr 2020 10:44:11 +0800 Subject: [PATCH 5/7] =?UTF-8?q?transferToGroupInfoRedis=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index a49f8cb266..799eb9ce71 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -565,7 +565,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 14 Apr 2020 11:10:48 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8D=95=E6=9D=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=B7=B2=E8=AF=BBbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/mine/dto/from/ReadMessageFromDTO.java | 16 ++++++++++++++++ .../controller/UserMessageController.java | 14 ++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java new file mode 100644 index 0000000000..932f38fa18 --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java @@ -0,0 +1,16 @@ +package com.epmet.resi.mine.dto.from; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/14 11:01 + */ +@Data +public class ReadMessageFromDTO implements Serializable { + private static final long serialVersionUID = 1116253566756531198L; + private String messageId; +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java index d0c75c990c..2af9dfb554 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java @@ -7,8 +7,12 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; import com.epmet.modules.message.service.UserMessageService; +import com.epmet.resi.mine.dto.from.ReadMessageFromDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -40,18 +44,16 @@ public class UserMessageController { } /** - * @param tokenDto - * @param messageId + * @param fromDTO * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei * @Description 单条消息标记为已读 * @Date 2020/3/29 21:05 **/ @PostMapping("readmsg") - public Result readMessage(@LoginUser TokenDto tokenDto, - @RequestParam("messageId") String messageId) { + public Result readMessage(@RequestBody ReadMessageFromDTO fromDTO) { //逻辑待实现 - return userMessageService.readMessage(messageId); + return userMessageService.readMessage(fromDTO.getMessageId()); } /** From 7304c099b31676b8c8afbcdc49f2b3930a511e46 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 14 Apr 2020 13:20:37 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9EDockerfile=E5=92=8Cdocker-compose.yaml?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9C=8D=E5=8A=A1=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E4=BB=8E2.0.11=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/Dockerfile | 2 +- .../epmet-admin-server/docker-compose.yml | 9 +++++++-- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-auth/Dockerfile | 11 +++++++++++ epmet-auth/docker-compose.yml | 13 +++++++++++++ epmet-auth/pom.xml | 2 +- epmet-gateway/Dockerfile | 2 +- epmet-gateway/docker-compose.yml | 18 +++++++++--------- epmet-gateway/pom.xml | 2 +- .../epmet-activiti-server/Dockerfile | 11 +++++++++++ .../epmet-activiti-server/docker-compose.yml | 13 +++++++++++++ .../epmet-activiti-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/Dockerfile | 11 +++++++++++ .../epmet-job-server/docker-compose.yml | 13 +++++++++++++ .../epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/Dockerfile | 11 +++++++++++ .../epmet-message-server/docker-compose.yml | 13 +++++++++++++ .../epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/Dockerfile | 11 +++++++++++ .../epmet-oss-server/docker-compose.yml | 13 +++++++++++++ epmet-module/gov-org/gov-org-server/Dockerfile | 11 +++++++++++ .../gov-org/gov-org-server/docker-compose.yml | 13 +++++++++++++ epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-access/oper-access-server/Dockerfile | 11 +++++++++++ .../oper-access-server/docker-compose.yml | 13 +++++++++++++ .../oper-access/oper-access-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/Dockerfile | 11 +++++++++++ .../oper-crm-server/docker-compose.yml | 13 +++++++++++++ epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/Dockerfile | 11 +++++++++++ .../oper-customize-server/docker-compose.yml | 13 +++++++++++++ .../oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/Dockerfile | 11 +++++++++++ .../resi-group-server/docker-compose.yml | 13 +++++++++++++ .../resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/Dockerfile | 11 +++++++++++ .../resi-guide-server/docker-compose.yml | 13 +++++++++++++ .../resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/Dockerfile | 11 +++++++++++ .../resi-mine-server/docker-compose.yml | 13 +++++++++++++ .../resi-mine/resi-mine-server/pom.xml | 2 +- .../resi-partymember-server/Dockerfile | 11 +++++++++++ .../resi-partymember-server/docker-compose.yml | 13 +++++++++++++ .../resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/Dockerfile | 2 +- .../epmet-user-server/docker-compose.yml | 4 ++-- epmet-user/epmet-user-server/pom.xml | 2 +- 47 files changed, 348 insertions(+), 31 deletions(-) create mode 100644 epmet-auth/Dockerfile create mode 100644 epmet-auth/docker-compose.yml create mode 100644 epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile create mode 100644 epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml create mode 100644 epmet-module/epmet-job/epmet-job-server/Dockerfile create mode 100644 epmet-module/epmet-job/epmet-job-server/docker-compose.yml create mode 100644 epmet-module/epmet-message/epmet-message-server/Dockerfile create mode 100644 epmet-module/epmet-message/epmet-message-server/docker-compose.yml create mode 100644 epmet-module/epmet-oss/epmet-oss-server/Dockerfile create mode 100644 epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml create mode 100644 epmet-module/gov-org/gov-org-server/Dockerfile create mode 100644 epmet-module/gov-org/gov-org-server/docker-compose.yml create mode 100644 epmet-module/oper-access/oper-access-server/Dockerfile create mode 100644 epmet-module/oper-access/oper-access-server/docker-compose.yml create mode 100644 epmet-module/oper-crm/oper-crm-server/Dockerfile create mode 100644 epmet-module/oper-crm/oper-crm-server/docker-compose.yml create mode 100644 epmet-module/oper-customize/oper-customize-server/Dockerfile create mode 100644 epmet-module/oper-customize/oper-customize-server/docker-compose.yml create mode 100644 epmet-module/resi-group/resi-group-server/Dockerfile create mode 100644 epmet-module/resi-group/resi-group-server/docker-compose.yml create mode 100644 epmet-module/resi-guide/resi-guide-server/Dockerfile create mode 100644 epmet-module/resi-guide/resi-guide-server/docker-compose.yml create mode 100644 epmet-module/resi-mine/resi-mine-server/Dockerfile create mode 100644 epmet-module/resi-mine/resi-mine-server/docker-compose.yml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/Dockerfile create mode 100644 epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml diff --git a/epmet-admin/epmet-admin-server/Dockerfile b/epmet-admin/epmet-admin-server/Dockerfile index 52c7bfba5f..38da8a0872 100644 --- a/epmet-admin/epmet-admin-server/Dockerfile +++ b/epmet-admin/epmet-admin-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8082 -ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-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 index 97c34cb896..09e4bd8dce 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -2,7 +2,12 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:2.0.11 ports: - "8082:8082" - network_mode: bridge # 不会创建新的网络 \ No newline at end of file + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 66ae9b3533..4f88956c46 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-admin diff --git a/epmet-auth/Dockerfile b/epmet-auth/Dockerfile new file mode 100644 index 0000000000..ab95a2ca96 --- /dev/null +++ b/epmet-auth/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 8081 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-auth/docker-compose.yml b/epmet-auth/docker-compose.yml new file mode 100644 index 0000000000..8457f689d4 --- /dev/null +++ b/epmet-auth/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-auth-server: + container_name: epmet-auth-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth-server:2.0.11 + ports: + - "8081:8081" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 2842c7a96c..8122c0a622 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-cloud diff --git a/epmet-gateway/Dockerfile b/epmet-gateway/Dockerfile index dc143291df..f14c4a8d68 100644 --- a/epmet-gateway/Dockerfile +++ b/epmet-gateway/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8080 -ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml index d973dd4ca1..c2ea41442c 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/docker-compose.yml @@ -1,13 +1,13 @@ version: "3.7" services: - epmet-gateway: # 会自动生成容器名称: <当前所在目录>_epmet-gateway_1，依赖于所在目录，不稳定，所以使用container_name 完全手动指定 - container_name: epmet-gateway-dev # 完全手动指定容器NAME - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.1 + epmet-gateway-server: + container_name: epmet-gateway-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway-server:2.0.11 ports: - "8080:8080" - network_mode: bridge # 不会创建新的网络 - -# 定义新的网络 -#networks: -# epmet-gateway: # 会自动生成容器网络名称: <当前所在目录>_epmet-gateway -# driver: bridge \ No newline at end of file + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index f8f1d96b77..3111a2a98d 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-cloud diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile b/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile new file mode 100644 index 0000000000..8df45bff54 --- /dev/null +++ b/epmet-module/epmet-activiti/epmet-activiti-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 8086 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml b/epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml new file mode 100644 index 0000000000..788a67f979 --- /dev/null +++ b/epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-activiti-server: + container_name: epmet-activiti-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-activiti-server:2.0.11 + ports: + - "8086:8086" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index df5bebdd66..0dc436374d 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-activiti diff --git a/epmet-module/epmet-job/epmet-job-server/Dockerfile b/epmet-module/epmet-job/epmet-job-server/Dockerfile new file mode 100644 index 0000000000..72a8e2950b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-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 8084 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-job/epmet-job-server/docker-compose.yml b/epmet-module/epmet-job/epmet-job-server/docker-compose.yml new file mode 100644 index 0000000000..d5c11abe86 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-job-server: + container_name: epmet-job-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-job-server:2.0.11 + ports: + - "8084:8084" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index a2784eae25..c1deb54470 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-job diff --git a/epmet-module/epmet-message/epmet-message-server/Dockerfile b/epmet-module/epmet-message/epmet-message-server/Dockerfile new file mode 100644 index 0000000000..36720c4a38 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-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 8085 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml new file mode 100644 index 0000000000..85837cc6fe --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-message-server: + container_name: epmet-message-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:2.0.11 + ports: + - "8085:8085" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index d822419549..c41034461a 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-message diff --git a/epmet-module/epmet-oss/epmet-oss-server/Dockerfile b/epmet-module/epmet-oss/epmet-oss-server/Dockerfile new file mode 100644 index 0000000000..2e985a6189 --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-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 8083 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml b/epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml new file mode 100644 index 0000000000..75543adf5d --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-oss-server: + container_name: epmet-oss-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:2.0.10 + ports: + - "8083:8083" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/Dockerfile b/epmet-module/gov-org/gov-org-server/Dockerfile new file mode 100644 index 0000000000..05e0085107 --- /dev/null +++ b/epmet-module/gov-org/gov-org-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 8092 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml new file mode 100644 index 0000000000..4d156dba53 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + gov-org-server: + container_name: gov-org-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:2.0.11 + ports: + - "8092:8092" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bd5863a670..04d69d1b18 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet gov-org diff --git a/epmet-module/oper-access/oper-access-server/Dockerfile b/epmet-module/oper-access/oper-access-server/Dockerfile new file mode 100644 index 0000000000..bde41338e6 --- /dev/null +++ b/epmet-module/oper-access/oper-access-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 8093 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/docker-compose.yml b/epmet-module/oper-access/oper-access-server/docker-compose.yml new file mode 100644 index 0000000000..855aa6d4af --- /dev/null +++ b/epmet-module/oper-access/oper-access-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + oper-access-server: + container_name: oper-access-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:2.0.11 + ports: + - "8093:8093" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 8f8e681280..c9ea98b3f4 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -8,7 +8,7 @@ 2.0.0 4.0.0 - + 2.0.11 oper-access-server jar diff --git a/epmet-module/oper-crm/oper-crm-server/Dockerfile b/epmet-module/oper-crm/oper-crm-server/Dockerfile new file mode 100644 index 0000000000..bb97bee10e --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-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 8090 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/docker-compose.yml b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml new file mode 100644 index 0000000000..7aa1baaf9d --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + oper-crm-server: + container_name: oper-crm-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:2.0.11 + ports: + - "8090:8090" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 4bbfea43c6..dca9088ce2 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet oper-crm diff --git a/epmet-module/oper-customize/oper-customize-server/Dockerfile b/epmet-module/oper-customize/oper-customize-server/Dockerfile new file mode 100644 index 0000000000..0dc758020b --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-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 8089 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/docker-compose.yml b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml new file mode 100644 index 0000000000..5b35a8a164 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + oper-customize-server: + container_name: oper-customize-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:2.0.11 + ports: + - "8089:8089" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 715075b15d..dca630f0f2 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet oper-customize diff --git a/epmet-module/resi-group/resi-group-server/Dockerfile b/epmet-module/resi-group/resi-group-server/Dockerfile new file mode 100644 index 0000000000..f349a97319 --- /dev/null +++ b/epmet-module/resi-group/resi-group-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 8095 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml new file mode 100644 index 0000000000..d09364b314 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-group-server: + container_name: resi-group-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:2.0.11 + ports: + - "8095:8095" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 3873802452..57a6fd1b99 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 - + 2.0.11 com.epmet resi-group diff --git a/epmet-module/resi-guide/resi-guide-server/Dockerfile b/epmet-module/resi-guide/resi-guide-server/Dockerfile new file mode 100644 index 0000000000..42c62e7b07 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-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 8091 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml new file mode 100644 index 0000000000..9d4263879a --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-guide-server: + container_name: resi-guide-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:2.0.11 + ports: + - "8091:8091" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 55dc1ee3c1..9bb295e946 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-guide diff --git a/epmet-module/resi-mine/resi-mine-server/Dockerfile b/epmet-module/resi-mine/resi-mine-server/Dockerfile new file mode 100644 index 0000000000..963b337c1b --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-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 8094 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml new file mode 100644 index 0000000000..68ce45a99e --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-mine-server: + container_name: resi-mine-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:2.0.11 + ports: + - "8094:8094" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 8bab7eec80..bb03bff2e9 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-mine diff --git a/epmet-module/resi-partymember/resi-partymember-server/Dockerfile b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile new file mode 100644 index 0000000000..321b1bffb1 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-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 8096 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml new file mode 100644 index 0000000000..6dbb99760b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-partymember-server: + container_name: resi-partymember-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:2.0.11 + ports: + - "8096:8096" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index fd3b44f67b..52ada4bc95 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/Dockerfile b/epmet-user/epmet-user-server/Dockerfile index 899b4d8bcc..78011d3dd5 100644 --- a/epmet-user/epmet-user-server/Dockerfile +++ b/epmet-user/epmet-user-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8087 -ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ 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 5e354491a9..c6456e0db6 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:2.0.11 ports: - "8087:8087" - network_mode: bridge # 不会创建新的网络 \ No newline at end of file + network_mode: host # 不会创建新的网络 \ No newline at end of file diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4461b0da41..b292c23b71 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-user