From d4f159d60acf6f263bfa4508a113c0feacd2f5b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 六月 2024 18:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 13d88d2..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,12 +2,15 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.dto.*;
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.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;
@@ -37,6 +40,8 @@
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RemoteFileService remoteFileService;
@PostMapping("/miniLogin")
@ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
@@ -49,9 +54,9 @@
@PostMapping(value = "/mobile")
@ApiOperation(value = "用户端-小程序获取电话号码")
- public R mobile(@RequestBody MobileDTO mobileDTO) {
- iMemberService.mobile(mobileDTO);
- return R.ok();
+ public R<String> mobile(@RequestBody MobileDTO mobileDTO) {
+
+ return R.ok(iMemberService.mobile(mobileDTO));
}
@PostMapping("/getMembeid")
@@ -67,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