Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-18 c23f48c5ec15476299edadd91fa18f908d710a4f

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

@@ -5,16 +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.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;
@@ -22,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;
@@ -54,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 = "管理后台-用户登录")
    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);
@@ -95,6 +131,19 @@
        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 = "管理后台-刷新令牌有效期")
    public R<?> refresh(HttpServletRequest request)
@@ -120,16 +169,19 @@
    @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("用户不存在");
            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("发送失败");