From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 05 六月 2024 20:04:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java index 33fe3ab..f87af09 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java @@ -1,21 +1,43 @@ package com.ruoyi.system.api.feignClient; +import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.domain.MemberAddress; +import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; +import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO; import com.ruoyi.system.api.factory.MemberFallbackFactory; +import java.util.List; +import java.util.Set; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; @FeignClient(contextId = "memberClient", value = ServiceNameConstants.RUOYI_MEMBER, fallbackFactory = MemberFallbackFactory.class) public interface MemberClient { @PostMapping("/member-address/getMemberAddressOne") - R<MemberAddress> getMemberAddressOne(@RequestBody Long userId); + R<MemberAddress> getMemberAddressOne(@RequestBody Long userId, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/member/getMembeOne") - R<Member> getMembeOne(@RequestBody Long userId); + R<Member> getMembeOne(@RequestBody Long userId, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/member/list-by-ids") + R<List<Member>> getMemberListByIds(@RequestParam("memberIdList") Set<Long> memberIdList, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PostMapping("/forepart/member/miniLogin") + public R<AppMiniLoginVO> miniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto); + + + + + @PostMapping("/forepart/member/miniRegister") + public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appUserRegisterDto); } -- Gitblit v1.7.1