From f66cd5340a8c9a5264c82549f25e4d88cf2d815a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 五月 2024 15:54:18 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
index 78b708c..4ce35b6 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
@@ -2,11 +2,13 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.member.DTO.MemberDTO;
-import com.ruoyi.member.domain.pojo.Member;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.member.service.IMemberService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,6 +33,18 @@
public class MemberController {
@Resource
private IMemberService iMemberService;
+
+
+
+ @RequestMapping("/getMembeOne")
+ @ResponseBody
+ @InnerAuth
+ @ApiOperation(value = "获取通过id用户信息")
+ public R<Member> getMembeOne(@RequestBody Long userId) {
+ return R.ok(iMemberService.getById(userId));
+ }
+
+
@RequestMapping("/loginThird")
@ResponseBody
@ApiOperation(value = "第三方登陸和註冊")
--
Gitblit v1.7.1