|
|
@@ -48,6 +48,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.net.URL;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -106,7 +107,7 @@ public class AuthController {
|
|
|
Long userId = LoginHelper.getUserId();
|
|
|
scheduledExecutorService.schedule(() -> {
|
|
|
SseMessageDto dto = new SseMessageDto();
|
|
|
- dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
|
|
|
+ dto.setMessage(DateUtils.getTodayHour(new Date()) + "好,欢迎登录 RuoYi-Vue-Plus 后台管理系统");
|
|
|
dto.setUserIds(List.of(userId));
|
|
|
SseMessageUtils.publishMessage(dto);
|
|
|
}, 5, TimeUnit.SECONDS);
|
|
|
@@ -147,8 +148,8 @@ public class AuthController {
|
|
|
StpUtil.checkLogin();
|
|
|
// 获取第三方登录信息
|
|
|
AuthResponse<AuthUser> response = SocialUtils.loginAuth(
|
|
|
- loginBody.getSource(), loginBody.getSocialCode(),
|
|
|
- loginBody.getSocialState(), socialProperties);
|
|
|
+ loginBody.getSource(), loginBody.getSocialCode(),
|
|
|
+ loginBody.getSocialState(), socialProperties);
|
|
|
AuthUser authUserData = response.getData();
|
|
|
// 判断授权响应是否成功
|
|
|
if (!response.ok()) {
|