新增加注册抽奖校验

Pu Zhibing

2025-05-08 afdd96be3f266ee04e7c4a427eb010708e1cace3

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

@@ -1,7 +1,10 @@
package com.ruoyi.auth.controller;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.ruoyi.goods.api.domain.LotteryEvent;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
@@ -23,6 +26,9 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;

import java.util.List;
import java.util.Map;

/**
 * token 控制
 * 
@@ -31,18 +37,23 @@
@RestController
@Api(value = "系统和小程序登录", tags = "系统和小程序登录")

public class TokenController
{
public class TokenController {
    @Autowired
    private TokenService tokenService;

    @Autowired
    private SysLoginService sysLoginService;

   @Resource
   private LotteryEventClient lotteryEventClient;
	
	
	
	
	
    @ApiOperation("系统登录")
    @PostMapping("login")
    public R<?> login(@RequestBody LoginBody form)
    {
   public R<?> login(@RequestBody LoginBody form) {
        // 用户登录
        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
        // 获取登录token
@@ -51,30 +62,33 @@

    @ApiOperation("小程序登录")
    @PostMapping("miniLogin")
    public R<?> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto)
    {
   public R<?> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto) {
        // 小程序用户登录
        AppMiniLoginVo appMiniLoginVo = sysLoginService.miniLogin(appMiniLoginDto);
        // 获取登录token
        return R.ok(tokenService.createMiniToken(appMiniLoginVo));
      Map<String, Object> miniToken = tokenService.createMiniToken(appMiniLoginVo);
      return R.ok(miniToken);
    }

    @ApiOperation("小程序注册")
   @ApiOperation("小程序注册【2.0】")
    @PostMapping("miniRegister")
    public R<?> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto)
    {
   public R<?> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto) {
        // 小程序用户登录
        AppMiniLoginVo appMiniLoginVo = sysLoginService.miniRegister(appUserRegisterDto);
        // 获取登录token
        return R.ok(tokenService.createMiniToken(appMiniLoginVo));
        Map<String, Object> miniToken = tokenService.createMiniToken(appMiniLoginVo);
        //判断新用户是都符合抽奖条件
        miniToken.put("lotteryDraw", false);
      List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(1).getData();
      if (data.size() > 0) {
            miniToken.put("lotteryDraw", true);
        }
      return R.ok();
    }

    @DeleteMapping("logout")
    public R<?> logout(HttpServletRequest request)
    {
   public R<?> logout(HttpServletRequest request) {
        String token = SecurityUtils.getToken(request);
        if (StringUtils.isNotEmpty(token))
        {
      if (StringUtils.isNotEmpty(token)) {
            String username = JwtUtils.getUserName(token);
            // 删除用户缓存记录
            AuthUtil.logoutByToken(token);
@@ -85,11 +99,9 @@
    }

    @PostMapping("refresh")
    public R<?> refresh(HttpServletRequest request)
    {
   public R<?> refresh(HttpServletRequest request) {
        LoginUser loginUser = tokenService.getLoginUser(request);
        if (StringUtils.isNotNull(loginUser))
        {
      if (StringUtils.isNotNull(loginUser)) {
            // 刷新令牌有效期
            tokenService.refreshToken(loginUser);
            return R.ok();
@@ -98,8 +110,7 @@
    }

    @PostMapping("register")
    public R<?> register(@RequestBody RegisterBody registerBody)
    {
   public R<?> register(@RequestBody RegisterBody registerBody) {
        // 用户注册
        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
        return R.ok();