Merge remote-tracking branch 'origin/master'

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 # 使用现有网络

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 # 使用现有网络

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());