From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:48:43 +0800
Subject: [PATCH] Merge branch 'mitao-dev'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 1 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 bfbdf67..27569a2 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
@@ -1,9 +1,26 @@
package com.ruoyi.member.controller;
+import com.ruoyi.common.core.domain.R;
+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 com.ruoyi.system.api.util.HuaWeiOBSUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+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;
/**
* <p>
@@ -15,6 +32,74 @@
*/
@RestController
@RequestMapping("/member")
+@Api(value = "用户端-用户信息相关接口", tags = "用户端-用户信息相关接口", description = "用户端-用户信息相关接口")
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("/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(@RequestBody MemberDTO memberDTO) {
+ return R.ok(iMemberService.getMembeid(memberDTO));
+ }
+
+
+ @RequestMapping("/saveUserImg")
+ @ApiOperation(value = "用户端-修改头像")
+ public R<Member> saveNotice(HttpServletRequest request) {
+ try {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) multipartRequest.getFile("images");
+ String url=HuaWeiOBSUtil.obsUpload(file);
+ Member member=new Member();
+ member.setAvatar(url);
+ return R.ok(member);
+ } catch (Exception e) {
+ return R.fail("保存图片失败");
+ }
+
+ }
+
+ @RequestMapping("/updateMembeid")
+ @ResponseBody
+ @ApiOperation(value = "用户端-修改用户信息")
+ public R updateMembeid(@RequestBody MemberDTO memberDTO) {
+ iMemberService.updateMembeid(memberDTO);
+ return R.ok();
+ }
+
+ @RequestMapping("/authentificationMembe")
+ @ResponseBody
+ @ApiOperation(value = "用户端-用户认证")
+ public R authentificationMembe(@RequestBody MemberDTO memberDTO) {
+ iMemberService.authentificationMembe(memberDTO);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1