From 207fd8ac8e421678a91c133e1f4427660a7a576f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Aug 2020 10:16:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9selectDraftContentDetail?= =?UTF-8?q?=E3=80=81selectDraftAttr=E8=BF=99=E4=B8=A4=E4=B8=AAsql,?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DraftDao.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml index 81dd162aa7..823e936884 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml @@ -35,15 +35,13 @@ WHEN DC.AUDIT_STATUS="null" then "" else dc.AUDIT_STATUS end ) as AUDIT_STATUS, - dc.AUDIT_STATUS as "AUDIT_STATUS原来的值", ( CASE WHEN dc.AUDIT_REASON IS NULL THEN "" WHEN dc.AUDIT_REASON<=1 THEN "" WHEN dc.AUDIT_REASON="null" then "" else dc.AUDIT_REASON end - )as AUDIT_REASON, - dc.AUDIT_REASON as "AUDIT_REASON原来的值" + )as AUDIT_REASON FROM draft_content dc WHERE @@ -65,7 +63,6 @@ ELSE PUBLISHER_ID END ) AS PUBLISHER, - PUBLISHER_ID as "PUBLISHER_ID原来的值", ( case when PUBLISHER_NAME is NULL THEN "" when LENGTH(PUBLISHER_NAME)<=1 THEN "" @@ -73,7 +70,6 @@ ELSE PUBLISHER_NAME END )as PUBLISHER_NAME, - PUBLISHER_NAME as "PUBLISHER_NAME原来的值", (CASE WHEN PUBLISH_DATE IS NULL THEN CURDATE() ELSE PUBLISH_DATE @@ -86,7 +82,6 @@ ELSE PUBLISH_RANGE_DESC END )AS PUBLISH_RANGE_DESC, - PUBLISH_RANGE_DESC as "PUBLISH_RANGE_DESC原来的值", ( CASE WHEN PUBLISHER_TYPE IS NULL THEN "" WHEN LENGTH(PUBLISHER_TYPE) <=1 THEN "" @@ -94,15 +89,13 @@ ELSE PUBLISHER_TYPE END )AS PUBLISHER_TYPE, - PUBLISHER_TYPE as "PUBLISHER_TYPE原来的值", ( CASE when TAGS IS NULL THEN "" WHEN LENGTH(TAGS)<=1 THEN "" when TAGS="null" then "" ELSE TAGS END - )TAGS, - TAGS as "TAGS原来的值" + )TAGS FROM draft WHERE From 33c448bd6ef811b9948d571690c73ebd82933eb1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Aug 2020 10:17:22 +0800 Subject: [PATCH 2/7] govvoice+1,=>68 --- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index 7fa5341481..1c7018c56e 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.68 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index a593e507c0..921e42689a 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.67 + 0.3.68 gov-voice com.epmet From 16337acade863310dfde1b77a8e040942b2dfaff Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 10:46:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=97=B2=E7=BD=AE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActSignInRecServiceImpl.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java index a896694d27..57c50d58e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java @@ -38,15 +38,12 @@ import com.epmet.dao.ActSignInRecDao; import com.epmet.dao.ActUserRelationDao; import com.epmet.dto.ActSignInRecDTO; import com.epmet.dto.ActUserRelationDTO; -import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO; import com.epmet.dto.form.resi.ResiActSignInFormDTO; import com.epmet.entity.ActSignInPicEntity; import com.epmet.entity.ActSignInRecEntity; -import com.epmet.redis.ActSignInRecRedis; import com.epmet.service.ActLiveRecService; import com.epmet.service.ActSignInRecService; -import com.epmet.service.HeartUserInfoService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -66,9 +63,6 @@ import java.util.UUID; @Service public class ActSignInRecServiceImpl extends BaseServiceImpl implements ActSignInRecService { - @Autowired - private ActSignInRecRedis actSignInRecRedis; - @Autowired private ActUserRelationDao actUserRelationDao; @@ -78,9 +72,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl Date: Fri, 7 Aug 2020 13:59:01 +0800 Subject: [PATCH 4/7] =?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?= 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..8732b7c248 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 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 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 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.CUSTOMER_ID = #{customerId} 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 5/7] =?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 6/7] =?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 7/7] =?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