diff --git a/script/src/main/java/com/xiang/ServiceScriptApplication.java b/script/src/main/java/com/xiang/ServiceScriptApplication.java index 9c3325e..c366891 100644 --- a/script/src/main/java/com/xiang/ServiceScriptApplication.java +++ b/script/src/main/java/com/xiang/ServiceScriptApplication.java @@ -17,7 +17,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; "com.xiang.xservice.application.script.glados.repository", "com.xiang.xservice.application.script.xb.repository", "com.xiang.xservice.common.mapper", - "com.xiang.xservice.application.script.jntyzx.mapper" }) @ConfigurationPropertiesScan(basePackages = { "com.xiang.xservice.config" 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 18c203c..c277023 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.one"; + public static final String GLADOS_URL_PREFIX = "https://www.glados.cloud"; /** * 签到 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 5af649f..92edc29 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 @@ -83,18 +83,26 @@ public class GLaDOSServiceImpl implements GLaDOSService{ log.info("http do post success, response:{}", response); // 成功签到记录 - if (0 == gLaDOSResponse.getCode() && Objects.nonNull(gLaDOSResponse.getPoints())) { - log.info("签到成功, 签到积分:{}, 签到消息:{}", gLaDOSResponse.getPoints(), gLaDOSResponse.getMessage()); - sb.append(user.getEmail()).append("签到成功,获得积分:").append(gLaDOSResponse.getPoints()).append("\n"); - try { - dingTalkService.sendScriptMsg("[时间:" + LocalDateTime.now() + "] 用户: " + - user.getEmail() + "签到成功,获得积分:" + gLaDOSResponse.getPoints()); - } catch (Exception e) { - log.error("发送钉钉消息失败", e); + if (0 == gLaDOSResponse.getCode()) { + if (Objects.nonNull(gLaDOSResponse.getPoints())) { + log.info("签到成功, 签到积分:{}, 签到消息:{}", gLaDOSResponse.getPoints(), gLaDOSResponse.getMessage()); + sb.append(user.getEmail()).append("签到成功,获得积分:").append(gLaDOSResponse.getPoints()).append("\n"); + try { + dingTalkService.sendScriptMsg("[时间:" + LocalDateTime.now() + "] 用户: " + + user.getEmail() + "签到成功,获得积分:" + gLaDOSResponse.getPoints()); + } catch (Exception e) { + log.error("发送钉钉消息失败", e); + } + 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 Boolean.TRUE; + } else { + log.info("签到异常, 签到消息:{}", gLaDOSResponse.getMessage()); + sb.append(user.getEmail()).append("签到异常,消息:").append(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(); + gladosMapper.insertScriptRunLog(build); + return Boolean.FALSE; } - 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 Boolean.TRUE; } // 重复签到,表示当日签到成功