shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-18 10:05:40 +08:00
parent b7ad45d791
commit de796d8883
8 changed files with 190 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java
View File

@@ -4,7 +4,9 @@ import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.PhoneUtil;
import com.ruoyi.cai.auth.*;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.dto.app.vo.LoginVo;
import com.ruoyi.cai.enums.CodeEnum;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.SmsVerifyService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.annotation.Log;
@@ -36,10 +38,12 @@ public class AuthAppController {
private SmsVerifyService smsVerifyService;
@Autowired
private UserService userService;
@Autowired
private CurrentUserManager currentUserManager;
@PostMapping("/register")
@Operation(summary = "注册")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
@Log(title = "注册", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Map<String, Object>> register(@Validated @RequestBody CaiRegisterUser caiUser){
boolean mobile = PhoneUtil.isMobile(caiUser.getUsername());
if(!mobile){
@@ -53,7 +57,7 @@ public class AuthAppController {
@PostMapping("/register/code")
@Operation(summary = "获取注册验证码")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
@Log(title = "获取注册验证码", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Map<String,String>> registerCode(@Validated @RequestBody RegisterCode code){
boolean mobile = PhoneUtil.isMobile(code.getMobile());
if(!mobile){
@@ -65,7 +69,7 @@ public class AuthAppController {
@PostMapping("/resetPassword/code")
@Operation(summary = "获取重置密码验证码")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
@Log(title = "获取重置密码验证码", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Map<String,String>> resetPasswordCode(@Validated @RequestBody RegisterCode code){
boolean mobile = PhoneUtil.isMobile(code.getMobile());
if(!mobile){
@@ -81,17 +85,18 @@ public class AuthAppController {
@PostMapping("/login")
@Operation(summary = "登陆")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Map<String,Object>> login(@Validated @RequestBody LoginCaiUser loginBody){
Map<String, Object> ajax = new HashMap<>();
@Log(title = "登陆", businessType = BusinessType.OTHER, isSaveDb = false)
public R<LoginVo> login(@Validated @RequestBody LoginCaiUser loginBody){
LoginVo vo = new LoginVo();
String token = caiLoginManager.login(loginBody.getUsername(), loginBody.getPassword());
ajax.put("token",token);
return R.ok(ajax);
vo.setToken(token);
vo.setUserInfo(currentUserManager.currentInfo());
return R.ok(vo);
}
@PostMapping("/resetPassword")
@Operation(summary = "重置密码")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
@Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Boolean> resetPassword(@RequestBody ResetPasswordReq code){
caiLoginManager.resetPassword(code);
return R.ok(true);

14
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
View File

@@ -5,6 +5,7 @@ import com.ruoyi.cai.dto.app.query.AlbumResetReq;
import com.ruoyi.cai.dto.app.query.IdRes;
import com.ruoyi.cai.dto.app.query.UserUpdateReq;
import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo;
import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.UserAlbumService;
@@ -40,6 +41,13 @@ public class UserAppController {
return R.ok(currentUserManager.currentInfo());
}
@GetMapping("/info")
@Operation(summary = "当前用户信息(用于编辑用户的时候查询,带审核数据)")
@Log(title = "当前用户信息", businessType = BusinessType.OTHER, isSaveDb = false)
public R<CurrentUserUpdateInfoVo> currentUpdateInfo(){
return R.ok(currentUserManager.currentUpdateInfo());
}
@GetMapping("/member")
@Operation(summary = "当前会员信息")
@Log(title = "当前会员信息", businessType = BusinessType.OTHER, isSaveDb = false)
@@ -53,6 +61,12 @@ public class UserAppController {
return R.ok(userMemberService.memberApp(userId,type));
}
/*@PostMapping("/update/one")
@Operation(summary = "完善用户必填信息")
@Log(title = "完善用户必填信息", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Boolean> finishUser(@Validated @RequestBody FinishUserUpdateReq res){
return R.ok(currentUserManager.finishUser(res));
}*/
@PostMapping("/update")
@Operation(summary = "修改当前用户信息")