From cd55aff7eea06f77a8f712cef1ad2744c44d0f8a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 六月 2024 18:56:16 +0800
Subject: [PATCH] 1.修改bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 135 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 108 insertions(+), 27 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 7c64d3e..8bdb915 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -1,32 +1,44 @@
package com.ruoyi.auth.controller;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import javax.servlet.http.HttpServletRequest;
-
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.SysUserClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import cn.hutool.core.util.RandomUtil;
+import com.ruoyi.auth.form.ChangePasswordBody;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
+import com.ruoyi.auth.utils.JuTongDaSMSUtil;
+import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.AppMiniLoginVO;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
-
-import java.util.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
* token 控制
@@ -34,7 +46,8 @@
* @author ruoyi
*/
@RestController
-@Api(tags = "认证授权")
+@Api(tags = "管理后台和小程序登录")
+@Slf4j
public class TokenController
{
@Autowired
@@ -44,25 +57,56 @@
private SysLoginService sysLoginService;
@Autowired
private SysUserClient userClient;
+ @Autowired
+ private RedisService redisService;
+
+
+
+ @ApiOperation("小程序登录")
+ @PostMapping("miniLogin")
+ public R<?> miniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto)
+ {
+ // 小程序用户登录
+ AppMiniLoginVO appMiniLoginVo = sysLoginService.miniLogin(appMiniLoginDto);
+ // 获取登录token
+ return R.ok(tokenService.createMiniToken(appMiniLoginVo));
+ }
+
+
+
+ @ApiOperation("拍卖师小程序登录")
+ @PostMapping("actionMiniLogin")
+ public R<?> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto)
+ {
+ // 小程序用户登录
+ AppMiniLoginVO appMiniLoginVo = sysLoginService.actionMiniLogin(appMiniLoginDto);
+ // 获取登录token
+ return R.ok(tokenService.createMiniToken1(appMiniLoginVo));
+ }
+
@PostMapping("login")
- @ApiOperation(value = "用户登录")
+ @ApiOperation(value = "管理后台-用户登录")
public R<?> login(@RequestBody LoginBody form)
{
// 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+ SysUser sysUser1 = userInfo.getSysUser();
HashMap<String, Object> map = new HashMap<>();
map.put("token",tokenService.createToken(userInfo));
- List<SysRole> roles = userInfo.getSysUser().getRoles();
- if(CollectionUtils.isEmpty(roles)){
- return R.fail("请关联角色!");
+ List<SysRole> roles = sysUser1.getRoles();
+ if (Objects.equals("00", sysUser1.getUserType())) {
+ if (CollectionUtils.isEmpty(roles)) {
+ return R.fail("请关联角色!");
+ }
+ map.put("roleName", roles.get(0).getRoleName());
}
- map.put("roleName",roles.get(0).getRoleName());
map.put("info",userInfo);
+ map.put("userType", sysUser1.getUserType());
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
- sysUser.setUserId(userInfo.getSysUser().getUserId());
+ sysUser.setUserId(sysUser1.getUserId());
sysUser.setLoginDate(new Date());
System.out.println("修改用户登录时间"+sysUser);
userClient.updateSysUser(sysUser);
@@ -71,7 +115,7 @@
}
@DeleteMapping("logout")
- @ApiOperation(value = "用户登出")
+ @ApiOperation(value = "管理后台-用户登出")
public R<?> logout(HttpServletRequest request)
{
String token = SecurityUtils.getToken(request);
@@ -87,7 +131,7 @@
}
@PostMapping("refresh")
- @ApiOperation(value = "刷新令牌有效期")
+ @ApiOperation(value = "管理后台-刷新令牌有效期")
public R<?> refresh(HttpServletRequest request)
{
LoginUser loginUser = tokenService.getLoginUser(request);
@@ -101,11 +145,48 @@
}
@PostMapping("register")
- @ApiOperation(value = "用户注册")
public R<?> register(@RequestBody RegisterBody registerBody)
{
// 用户注册
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
return R.ok();
}
+
+ @GetMapping("send-verification-code")
+ @ApiOperation(value = "管理后台-发送验证码")
+ public R<?> changePassword(@RequestParam("username") String username) {
+ Boolean result = redisService.hasKey(
+ CacheConstants.CHANGE_PASSWORD_CAPTCHA_CODE_KEY + username);
+ if (result) {
+ throw new ServiceException("请勿重复发送验证码");
+ }
+ //校验手机号码
+ SysUser sysUser = userClient.queryUserByUserName(username).getData();
+ if (StringUtils.isNull(sysUser)) {
+ return R.fail("用户不存在");
+ }
+ String code = RandomUtil.randomNumbers(6);
+ try {
+ JuTongDaSMSUtil.smsSend(sysUser.getUserName(), code, "", "");
+ } catch (Exception e) {
+ log.error("【修改密码】发送短信失败", e);
+ return R.fail("发送失败");
+ }
+ //将验证码放入redis
+ redisService.setCacheObject(
+ CacheConstants.CHANGE_PASSWORD_CAPTCHA_CODE_KEY + sysUser.getUserName(), code, 5L,
+ TimeUnit.MINUTES);
+ return R.ok();
+ }
+
+ @PutMapping("change-password")
+ @ApiOperation(value = "管理后台-用户修改密码")
+ public R<?> changePassword(@RequestBody ChangePasswordBody changePasswordBody) {
+ // 用户修改密码
+ sysLoginService.changePassword(changePasswordBody.getUsername(),
+ changePasswordBody.getPassword(), changePasswordBody.getVerificationCode());
+ return R.ok();
+ }
}
+
+
--
Gitblit v1.7.1