From 885a5836eb0fc1d7fcf54fbdb5f1969b9238a18c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 30 五月 2024 09:13:12 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 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..2b047a9 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,21 +2,21 @@
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.member.service.IMemberService;
+import com.ruoyi.system.api.domain.AppMiniLoginVO;
+import com.ruoyi.system.api.domain.Member;
+import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
+import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.apache.poi.ss.formula.functions.T;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import util.HuaWeiOBSUtil;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -31,17 +31,37 @@
public class MemberController {
@Resource
private IMemberService iMemberService;
- @RequestMapping("/loginThird")
+
+ @RequestMapping("/getMembeOne")
@ResponseBody
- @ApiOperation(value = "第三方登陸和註冊")
- public R<Member> loginThird(MemberDTO memberDTO) {
- return R.ok(iMemberService.loginThird(memberDTO));
+ @InnerAuth
+ @ApiOperation(value = "获取通过id用户信息")
+ public R<Member> getMembeOne(@RequestBody Long userId) {
+ return R.ok(iMemberService.getById(userId));
+ }
+
+
+ @RequestMapping("/miniLogin")
+ @ResponseBody
+ @ApiOperation(value = "第三方登陸")
+ public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
+ return R.ok(iMemberService.loginThird(appMiniLoginDto));
+ }
+
+ @PostMapping(value = "/miniRegister")
+ @ApiOperation(value = "小程序注册")
+ public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO) {
+ AppMiniLoginVO appUserRegisterVo = iMemberService.miniRegister(appMiniRegisterDTO);
+ if(appUserRegisterVo ==null){
+ return R.fail("注册失败！");
+ }
+ return R.ok(appUserRegisterVo);
}
@RequestMapping("/getMembeid")
@ResponseBody
@ApiOperation(value = "获取用户信息")
- public R<Member> getMembeid(MemberDTO memberDTO) {
+ public R<Member> getMembeid(@RequestBody MemberDTO memberDTO) {
return R.ok(iMemberService.getMembeid(memberDTO));
}
@@ -65,7 +85,7 @@
@RequestMapping("/updateMembeid")
@ResponseBody
@ApiOperation(value = "修改用户信息")
- public R<T> updateMembeid(MemberDTO memberDTO) {
+ public R updateMembeid(@RequestBody MemberDTO memberDTO) {
iMemberService.updateMembeid(memberDTO);
return R.ok();
}
@@ -73,7 +93,7 @@
@RequestMapping("/authentificationMembe")
@ResponseBody
@ApiOperation(value = "用户认证")
- public R<T> authentificationMembe(MemberDTO memberDTO) {
+ public R authentificationMembe(@RequestBody MemberDTO memberDTO) {
iMemberService.authentificationMembe(memberDTO);
return R.ok();
}
--
Gitblit v1.7.1