From 357bf93f7fa56e414ad54d4fbfbf6bd97da5b1d2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 26 七月 2024 08:57:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 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..7cbf5f0 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,14 +2,15 @@
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.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.util.HuaWeiOBSUtil;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
@@ -17,7 +18,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,33 +37,33 @@
@Resource
private IMemberService iMemberService;
+ @Resource
+ private SysUserClient sysUserClient;
-
-
+ @Resource
+ private RemoteFileService remoteFileService;
@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 = "/mobile")
+ @ApiOperation(value = "用户端-小程序获取电话号码")
+ public R<String> mobile(@RequestBody MobileDTO mobileDTO) {
+
+ return R.ok(iMemberService.mobile(mobileDTO));
}
- @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("/getMembeid")
- @ResponseBody
+ @PostMapping("/getMembeid")
@ApiOperation(value = "用户端-获取用户信息")
public R<Member> getMembeid(@RequestBody MemberDTO memberDTO) {
return R.ok(iMemberService.getMembeid(memberDTO));
}
-
@PostMapping("/saveUserImg")
@ApiOperation(value = "用户端-修改头像")
@@ -71,7 +71,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);
@@ -82,7 +82,6 @@
}
@PostMapping("/updateMembeid")
- @ResponseBody
@ApiOperation(value = "用户端-修改用户信息")
public R updateMembeid(@RequestBody MemberDTO memberDTO) {
iMemberService.updateMembeid(memberDTO);
@@ -90,10 +89,25 @@
}
@PostMapping("/authentificationMembe")
- @ResponseBody
@ApiOperation(value = "用户端-用户认证")
public R authentificationMembe(@RequestBody MemberDTO memberDTO) {
iMemberService.authentificationMembe(memberDTO);
return R.ok();
}
+
+ @PostMapping("/customConfig")
+ @ApiOperation(value = "获取配置")
+ public R<String> customConfig(@RequestBody CustomConfigDTO customConfigDTO) {
+ String string="";
+ if(customConfigDTO.getType()==1){
+ string=sysUserClient.getconfig("PLATFORM_SERVICE_PHONE").getData().getConfigValue();
+ }
+ if(customConfigDTO.getType()==2){
+ string=sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData().getConfigValue();
+ }
+ if(customConfigDTO.getType()==3){
+ string=sysUserClient.getconfig("RETURN_CYCLE").getData().getConfigValue();
+ }
+ return R.ok(string);
+ }
}
--
Gitblit v1.7.1