From 217dc6879dfb2ba5980169be086a82f0e6ba0b83 Mon Sep 17 00:00:00 2001 From: Xiang Date: Fri, 23 Jan 2026 09:58:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:glados=E7=AD=BE=E5=88=B0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/glados/common/URLConstants.java | 2 +- .../glados/controller/GLaDOSController.java | 4 ++-- .../glados/service/GLaDOSServiceImpl.java | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java b/script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java index c277023..625bd36 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java @@ -5,7 +5,7 @@ public class URLConstants { /** * glados 主域名 */ - public static final String GLADOS_URL_PREFIX = "https://www.glados.cloud"; + public static final String GLADOS_URL_PREFIX = "https://glados.cloud"; /** * 签到 diff --git a/script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java b/script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java index 9dcf7c0..b21d101 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java @@ -3,7 +3,7 @@ package com.xiang.xservice.application.script.glados.controller; import com.xiang.xservice.application.script.glados.service.GLaDOSService; import com.xiang.xservice.basic.common.resp.Result; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,7 +19,7 @@ public class GLaDOSController { private final GLaDOSService glaDOSService; - @PostMapping("/checkIn") + @GetMapping("/checkIn") public Result checkIn() { glaDOSService.checkInV2(); return Result.success(); diff --git a/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java index 52128f2..9c59c0c 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java @@ -126,6 +126,27 @@ public class GLaDOSServiceImpl implements GLaDOSService{ return Boolean.TRUE; } } + + if (gLaDOSResponse.getMessage().contains("Repeats")) { + if (!CollectionUtils.isEmpty(gLaDOSResponse.getList())) { + dingTalkService.sendScriptMsg("用户:" + user.getEmail() + "当前已签到。结果：" + gLaDOSResponse.getList().get(0)); + GladosRunLog build = GladosRunLog.builder().time(LocalDateTime.now()).status(1).code(Integer.valueOf(gLaDOSResponse.getCode().toString())).response(response).user(user.getEmail()).userId(user.getId()).build(); + gladosMapper.insertScriptRunLog(build); + return true; + } + } + + if (-2 == gLaDOSResponse.getCode()) { + log.warn("签到失败，用户:{}, cookie过期:{}", user.getEmail(), gLaDOSResponse.getMessage()); + String message = "[时间：" + LocalDateTime.now() + "] 用户: " + user.getEmail() + "，签到消息: " + gLaDOSResponse.getMessage() + "手动请求：http://general.xiangtech.xyz:30026/system/glados/checkIn"; + try { + dingTalkService.sendScriptMsg(message); + return true; + } catch (Exception e) { + log.error("发送钉钉消息失败", e); + } + } + // 请求异常 dingTalkService.sendScriptMsg("用户:" + user.getEmail() + "请求异常，响应结果:" + gLaDOSResponse.getMessage()); GladosRunLog build = GladosRunLog.builder().time(LocalDateTime.now()).status(0).code(Integer.valueOf(gLaDOSResponse.getCode().toString())).response(response).user(user.getEmail()).userId(user.getId()).build();