From be44018394976c62ce51b34e5c9912a300d03630 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 24 Aug 2025 05:58:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor(xxl-job):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A8=A1=E6=9D=BF=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 commonHeader、commonFooter 和 commonLeft宏 - 更新 jobcode、jobgroup、jobinfo 和 joblog 页面结构 - 统一页面样式和布局 - 优化代码可读性和可维护性 --- .../com/xxl/job/admin/controller/login/LoginController.java | 2 +- .../src/main/resources/templates/common/common.macro.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java index bcfe8ee7..53eec5c2 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java @@ -38,7 +38,7 @@ public class LoginController { public ModelAndView login(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView) { // xxl-sso, logincheck - Response loginInfoResponse = XxlSsoHelper.loginCheckWithCookie(request, response); + Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); if (loginInfoResponse.isSuccess()) { modelAndView.setView(new RedirectView("/",true,false)); return modelAndView; diff --git a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl index 840bdbfd..1e792944 100644 --- a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl +++ b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl @@ -104,7 +104,7 @@ <#-- login user -->