From 0c58331b4d8a5f53319ad6b8447bac396eb25c48 Mon Sep 17 00:00:00 2001 From: liyuqian <201963020@qq.com> Date: 星期二, 30 八月 2022 16:47:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java | 3 ++- phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java index 256188b..06104e6 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java @@ -8,6 +8,7 @@ import com.hx.resultTool.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� @@ -23,5 +24,5 @@ * @return */ @PostMapping(value = "/sync/project/promotion") - Result syncHisPromotion(JSONObject jsonObject); + Result syncHisPromotion(@RequestBody JSONObject jsonObject); } diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java index ba8af0c..4b9e7fb 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java @@ -4,10 +4,12 @@ * @Author */ +import net.sf.json.JSONObject; import org.springframework.cloud.openfeign.FeignClient; import com.hx.resultTool.Result; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -30,4 +32,9 @@ */ @PostMapping(value = "/sync/user/syncUserById") Result syncUserById(@RequestParam("userId") String userId); + + /** 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 淇敼鐢ㄦ埛ciq鍜屼細鍛樼瓑绾�*/ + @PostMapping("/sync/user/updateMembership") + Result updateMembership(@RequestBody JSONObject jsonObject); + } -- Gitblit v1.8.0