From 83761554ac841d584e7cbce014ac5cb39e1d547f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 10:24:08 +0800
Subject: [PATCH] 1.切换OBS为天翼云 2.修改bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 0a44c6f..e471fe6 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,8 +5,10 @@
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;
@@ -17,7 +19,6 @@
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.domain.dto.AppMiniRegisterDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
@@ -70,15 +71,6 @@
return R.ok(tokenService.createMiniToken(appMiniLoginVo));
}
- @ApiOperation("小程序注册")
- @PostMapping("miniRegister")
- public R<?> miniRegister(@RequestBody AppMiniRegisterDTO appUserRegisterDto)
- {
- // 小程序用户登录
- AppMiniLoginVO appMiniLoginVo = sysLoginService.miniRegister(appUserRegisterDto);
- // 获取登录token
- return R.ok(tokenService.createMiniToken(appMiniLoginVo));
- }
@ApiOperation("拍卖师小程序登录")
@@ -88,7 +80,7 @@
// 小程序用户登录
AppMiniLoginVO appMiniLoginVo = sysLoginService.actionMiniLogin(appMiniLoginDto);
// 获取登录token
- return R.ok(tokenService.createMiniToken(appMiniLoginVo));
+ return R.ok(tokenService.createMiniToken1(appMiniLoginVo));
}
@@ -107,6 +99,7 @@
map.put("roleName",roles.get(0).getRoleName());
map.put("info",userInfo);
+ map.put("userType", userInfo.getSysUser().getUserType());
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
sysUser.setUserId(userInfo.getSysUser().getUserId());
@@ -158,6 +151,11 @@
@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)) {
@@ -165,9 +163,7 @@
}
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("发送失败");
--
Gitblit v1.7.1