1.修改bug 2.对接聚通达短信服务

mitao

2024-06-17 6f7507665afbf3a3a985c0554cb4031d3b84a1a7

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -5,16 +5,20 @@
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 io.swagger.annotations.Api;
@@ -54,6 +58,32 @@
    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 = "管理后台-用户登录")
    public R<?> login(@RequestBody LoginBody form)
@@ -120,6 +150,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)) {
@@ -127,9 +162,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("发送失败");