From 89c1c5d8ddca497df3094d84d307322e3a685bfd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 六月 2024 18:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 25 ++++++++++++-------------
1 files changed, 12 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 48e54af..8801954 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,15 +2,15 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.dto.CustomConfigDTO;
-import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.service.IMemberService;
+import com.ruoyi.system.api.RemoteFileService;
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.domain.dto.CustomConfigDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MobileDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
@@ -40,6 +40,8 @@
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RemoteFileService remoteFileService;
@PostMapping("/miniLogin")
@ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
@@ -50,14 +52,11 @@
}
}
- @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);
+ @PostMapping(value = "/mobile")
+ @ApiOperation(value = "用户端-小程序获取电话号码")
+ public R<String> mobile(@RequestBody MobileDTO mobileDTO) {
+
+ return R.ok(iMemberService.mobile(mobileDTO));
}
@PostMapping("/getMembeid")
@@ -73,7 +72,7 @@
try {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) multipartRequest.getFile("images");
- String url=HuaWeiOBSUtil.obsUpload(file);
+ String url = remoteFileService.obsUpload(file).getData();
Member member=new Member();
member.setAvatar(url);
return R.ok(member);
--
Gitblit v1.7.1