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-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
index 260d838..db60520 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -2,8 +2,7 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
@@ -17,7 +16,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
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.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -37,15 +35,15 @@
@Resource
private IMemberService iMemberService;
-
-
-
@PostMapping("/miniLogin")
- @ResponseBody
@ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
- return R.ok(iMemberService.loginThird(appMiniLoginDto));
- }
+ try {
+ return R.ok(iMemberService.loginThird(appMiniLoginDto));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
@PostMapping(value = "/miniRegister")
@ApiOperation(value = "用户端-小程序注册")
@@ -57,8 +55,7 @@
return R.ok(appUserRegisterVo);
}
- @PostMapping("/getMembeid")
- @ResponseBody
+ @PostMapping("/getMembeid")
@ApiOperation(value = "用户端-获取用户信息")
public R<Member> getMembeid(@RequestBody MemberDTO memberDTO) {
return R.ok(iMemberService.getMembeid(memberDTO));
@@ -82,7 +79,6 @@
}
@PostMapping("/updateMembeid")
- @ResponseBody
@ApiOperation(value = "用户端-修改用户信息")
public R updateMembeid(@RequestBody MemberDTO memberDTO) {
iMemberService.updateMembeid(memberDTO);
@@ -90,7 +86,6 @@
}
@PostMapping("/authentificationMembe")
- @ResponseBody
@ApiOperation(value = "用户端-用户认证")
public R authentificationMembe(@RequestBody MemberDTO memberDTO) {
iMemberService.authentificationMembe(memberDTO);
--
Gitblit v1.7.1