From 0180484d22a5eb97416081be6f8be7112b3d8f4a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 6 Apr 2022 12:04:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9compose=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA=E7=89=88=E6=9C=AC=E5=8D=A0=E4=BD=8D?= =?UTF-8?q?=E7=AC=A6=EF=BC=8C=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index acc8b229cc..ab8df1446d 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 From cc0155d91349cb062b47351d8604a8a319df290b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Apr 2022 13:28:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=BE=E9=87=8D=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=B3=A8=E8=A7=A3=E6=B7=BB=E5=8A=A0=EF=BC=8C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AE=A1=E6=A0=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/controller/ResiGroupMemberController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index e1943d8920..7232c1e3aa 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -18,6 +18,7 @@ package com.epmet.modules.member.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -57,6 +58,7 @@ public class ResiGroupMemberController { * @Date 2020/3/29 20:01 **/ @PostMapping("applyjoingroup") + @NoRepeatSubmit public Result applyJoinGroup(@LoginUser TokenDto tokenDto, @RequestBody ApplyJoinGroupFormDTO applyJoinGroupFormDTO) { applyJoinGroupFormDTO.setUserId(tokenDto.getUserId()); @@ -109,6 +111,7 @@ public class ResiGroupMemberController { * @Date 2020/3/30 22:07 **/ @PostMapping("agreeapply") + @NoRepeatSubmit public Result agreeApply(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyFormDTO agreeApplyFormDTO) { agreeApplyFormDTO.setUserId(tokenDto.getUserId()); From 7b8eb0a229881c2fa709ac22aab784cf1d890c08 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Apr 2022 13:30:15 +0800 Subject: [PATCH 3/3] resi-group --- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 8db2210515..5a55880c81 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.132 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.133 ports: - "8095:8095" network_mode: host # 使用现有网络