From c23f48c5ec15476299edadd91fa18f908d710a4f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 18 七月 2024 08:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 84 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 17 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 f4ae3d8..ccdde28 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
@@ -5,17 +5,21 @@
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.auth.utils.HuaWeiSMSUtil;
+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.annotation.InnerAuth;
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 io.swagger.annotations.Api;
@@ -23,6 +27,7 @@
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;
@@ -42,7 +47,7 @@
* @author ruoyi
*/
@RestController
-@Api(tags = "认证授权")
+@Api(tags = "管理后台和小程序登录")
@Slf4j
public class TokenController
{
@@ -55,24 +60,54 @@
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);
@@ -81,7 +116,7 @@
}
@DeleteMapping("logout")
- @ApiOperation(value = "用户登出")
+ @ApiOperation(value = "管理后台-用户登出")
public R<?> logout(HttpServletRequest request)
{
String token = SecurityUtils.getToken(request);
@@ -96,8 +131,21 @@
return R.ok();
}
+ @InnerAuth
+ @GetMapping("/inner/logout")
+ @ApiOperation(value = "设置用户token失效")
+ public R<?> logout(@RequestParam("") String token) {
+ if (StringUtils.isNotEmpty(token)) {
+ String username = JwtUtils.getUserName(token);
+ // 删除用户缓存记录
+ AuthUtil.logoutByToken(token);
+ // 记录用户退出日志
+ sysLoginService.logout(username);
+ }
+ return R.ok();
+ }
@PostMapping("refresh")
- @ApiOperation(value = "刷新令牌有效期")
+ @ApiOperation(value = "管理后台-刷新令牌有效期")
public R<?> refresh(HttpServletRequest request)
{
LoginUser loginUser = tokenService.getLoginUser(request);
@@ -111,7 +159,6 @@
}
@PostMapping("register")
- @ApiOperation(value = "用户注册")
public R<?> register(@RequestBody RegisterBody registerBody)
{
// 用户注册
@@ -120,18 +167,21 @@
}
@GetMapping("send-verification-code")
- @ApiOperation(value = "发送验证码")
+ @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("用户不存在");
+ return R.fail("账号不存在");
}
String code = RandomUtil.randomNumbers(6);
try {
- //TODO 发送短信未配置
- HuaWeiSMSUtil.sendSms(code, sysUser.getUserName(), "8823121426646",
- "cf1707ec44694627b1b483b0277e12fd");
+ JuTongDaSMSUtil.smsSend(sysUser.getUserName(), code, "", "");
} catch (Exception e) {
log.error("【修改密码】发送短信失败", e);
return R.fail("发送失败");
@@ -144,7 +194,7 @@
}
@PutMapping("change-password")
- @ApiOperation(value = "用户修改密码")
+ @ApiOperation(value = "管理后台-用户修改密码")
public R<?> changePassword(@RequestBody ChangePasswordBody changePasswordBody) {
// 用户修改密码
sysLoginService.changePassword(changePasswordBody.getUsername(),
--
Gitblit v1.7.1