From e410b2fdadcc9e6808d69a19c466542b6680a017 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 24 Jun 2021 11:16:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E6=B3=A8=E5=86=8C=E7=9A=84=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=20=E5=8E=BB=E6=8E=89token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/PaCustomerController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index d546f37046..feb2062219 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -6,7 +6,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.CustomerMpDTO; import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -96,7 +95,7 @@ public class PaCustomerController { * @Description 查询公众号注册的客户信息列表 **/ @PostMapping("registerinfo") - public Result registerInfo(@LoginUser TokenDto tokenDTO, @RequestBody RegisterInfoFormDTO formDTO) { + public Result registerInfo( @RequestBody RegisterInfoFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result().ok(paCustomerService.registerInfo(formDTO)); } @@ -140,7 +139,7 @@ public class PaCustomerController { /** * 获取小程序基础库版本 * @author zhaoqifeng - * @date 2020/8/5 16:55 + * @date 2020/8/5 16:55 * @param formDTO * @return com.epmet.commons.tools.utils.Result */ From 67dab3d61e7b19db763d5d47ebcb0690ae62c511 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 24 Jun 2021 11:18:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/fallback/ResiGroupOpenFeignClientFallback.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index f4f4db750f..2db52e0d76 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -14,6 +14,7 @@ import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; import java.util.HashMap; import java.util.List; @@ -190,14 +191,14 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien /** * 小组积分详情 * - * @param groupId + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @author zhaoqifeng * @date 2021/4/21 16:30 */ @Override - public Result groupPointDetail(String groupId) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", groupId); + public Result groupPointDetail(@RequestBody GroupPointDetailFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", formDTO); } @Override