From b7f2db358384ef1403850deb417ee767c916dc8e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 16:48:24 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 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 a8092a0..1bf3dae 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
@@ -1,20 +1,5 @@
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;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
@@ -24,8 +9,22 @@
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.goods.api.domain.TLotteryEvent;
+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;
import com.ruoyi.system.api.model.LoginUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -78,11 +77,12 @@
Map<String, Object> miniToken = tokenService.createMiniToken(appMiniLoginVo);
//判断新用户是都符合抽奖条件
miniToken.put("lotteryDraw", false);
- List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(1).getData();
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(1).getData();
if (data.size() > 0) {
miniToken.put("lotteryDraw", true);
+ miniToken.put("lotteryEventId", data.get(0).getId());
}
- return R.ok();
+ return R.ok(miniToken);
}
@DeleteMapping("logout")
--
Gitblit v1.7.1