From 639a49354954185548c45744e1dd51043679daab Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 13 Jun 2026 18:45:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E9=87=8D=E6=9E=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A8=A1=E6=9D=BF=E7=BB=93=E6=9E=84=E5=B9=B6=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +++++---- .../xxl/job/admin/controller/base/IndexController.java | 8 ++++---- .../xxl/job/admin/controller/base/LoginController.java | 2 +- .../xxl/job/admin/controller/biz/JobCodeController.java | 2 +- .../xxl/job/admin/controller/biz/JobGroupController.java | 2 +- .../xxl/job/admin/controller/biz/JobInfoController.java | 2 +- .../xxl/job/admin/controller/biz/JobLogController.java | 4 ++-- .../xxl/job/admin/controller/biz/JobUserController.java | 2 +- .../job/admin/web/error/WebHandlerExceptionResolver.java | 2 +- .../resources/templates/{biz => business}/group.list.ftl | 2 +- .../resources/templates/{biz => business}/job.code.ftl | 2 +- .../resources/templates/{biz => business}/job.list.ftl | 2 +- .../resources/templates/{biz => business}/log.detail.ftl | 2 +- .../resources/templates/{biz => business}/log.list.ftl | 2 +- .../resources/templates/{biz => business}/user.list.ftl | 2 +- .../templates/{ => framework}/base/dashboard.ftl | 0 .../resources/templates/{ => framework}/base/help.ftl | 0 .../resources/templates/{ => framework}/base/index.ftl | 0 .../resources/templates/{ => framework}/base/login.ftl | 0 .../{ => framework}/common/common.errorpage.ftl | 2 +- .../templates/{ => framework}/common/common.macro.ftl | 0 21 files changed, 24 insertions(+), 23 deletions(-) rename xxl-job-admin/src/main/resources/templates/{biz => business}/group.list.ftl (99%) rename xxl-job-admin/src/main/resources/templates/{biz => business}/job.code.ftl (99%) rename xxl-job-admin/src/main/resources/templates/{biz => business}/job.list.ftl (99%) rename xxl-job-admin/src/main/resources/templates/{biz => business}/log.detail.ftl (98%) rename xxl-job-admin/src/main/resources/templates/{biz => business}/log.list.ftl (99%) rename xxl-job-admin/src/main/resources/templates/{biz => business}/user.list.ftl (99%) rename xxl-job-admin/src/main/resources/templates/{ => framework}/base/dashboard.ftl (100%) rename xxl-job-admin/src/main/resources/templates/{ => framework}/base/help.ftl (100%) rename xxl-job-admin/src/main/resources/templates/{ => framework}/base/index.ftl (100%) rename xxl-job-admin/src/main/resources/templates/{ => framework}/base/login.ftl (100%) rename xxl-job-admin/src/main/resources/templates/{ => framework}/common/common.errorpage.ftl (95%) rename xxl-job-admin/src/main/resources/templates/{ => framework}/common/common.macro.ftl (100%) diff --git a/pom.xml b/pom.xml index 94bbb527..f68449e3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,16 +30,17 @@ 3.12.0 3.2.8 0.10.0 + 2.0.18 - 6.0.3 + 6.1.0 3.0.0 - 4.0.6 - 7.0.7 + 4.1.0 + 7.0.8 4.0.1 9.7.0 @@ -57,7 +58,7 @@ 2.14.0 - 2.0.0-M8 + 2.0.0-RC2 1.2.7 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java index 3b7537b5..d62c786e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java @@ -48,7 +48,7 @@ public class IndexController { List resourceList = findResourceList(request); model.addAttribute("resourceList", resourceList); - return "base/index"; + return "framework/base/index"; } /** @@ -87,7 +87,7 @@ public class IndexController { Map dashboardMap = xxlJobService.dashboardInfo(); model.addAllAttributes(dashboardMap); - return "base/dashboard"; + return "framework/base/dashboard"; } @RequestMapping("/chartInfo") @@ -103,7 +103,7 @@ public class IndexController { @RequestMapping("/help") @XxlSso public String help() { - return "base/help"; + return "framework/base/help"; } @RequestMapping(value = "/errorpage") @@ -113,7 +113,7 @@ public class IndexController { String exceptionMsg = "HTTP Status Code: "+response.getStatus(); mv.addObject("exceptionMsg", exceptionMsg); - mv.setViewName("common/common.errorpage"); + mv.setViewName("framework/common/common.errorpage"); return mv; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java index fcdc344a..dc5dfef5 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java @@ -42,7 +42,7 @@ public class LoginController { modelAndView.setView(new RedirectView("/",true,false)); return modelAndView; } - return new ModelAndView("base/login"); + return new ModelAndView("framework/base/login"); } @RequestMapping(value="/doLogin", method=RequestMethod.POST) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java index 04e7f78c..12ddb5bd 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java @@ -58,7 +58,7 @@ public class JobCodeController { model.addAttribute("jobInfo", jobInfo); model.addAttribute("jobLogGlues", jobLogGlues); - return "biz/job.code"; + return "business/job.code"; } @RequestMapping("/save") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java index 52a83d98..195814ba 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java @@ -42,7 +42,7 @@ public class JobGroupController { @RequestMapping @XxlSso(role = Consts.ADMIN_ROLE) public String index(Model model) { - return "biz/group.list"; + return "business/group.list"; } @RequestMapping("/pageList") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java index d611456c..b10943ab 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java @@ -75,7 +75,7 @@ public class JobInfoController { model.addAttribute("JobGroupList", jobGroupList); model.addAttribute("jobGroup", jobGroup); - return "biz/job.list"; + return "business/job.list"; } @RequestMapping("/pageList") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index 591e2079..efa80f8a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -104,7 +104,7 @@ public class JobLogController { model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobId", jobId); - return "biz/log.list"; + return "business/log.list"; } @RequestMapping("/pageList") @@ -284,7 +284,7 @@ public class JobLogController { model.addAttribute("handleCode", jobLog.getHandleCode()); model.addAttribute("logId", jobLog.getId()); model.addAttribute("jobInfo", jobInfo); - return "biz/log.detail"; + return "business/log.detail"; } @RequestMapping("/logDetailCat") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java index 3bd06fde..8be2e5fa 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java @@ -46,7 +46,7 @@ public class JobUserController { List groupList = xxlJobGroupMapper.findAll(); model.addAttribute("groupList", groupList); - return "biz/user.list"; + return "business/user.list"; } @RequestMapping("/pageList") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java index d9b77bb1..a4fe3113 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java @@ -56,7 +56,7 @@ public class WebHandlerExceptionResolver implements HandlerExceptionResolver { } else { mv.addObject("exceptionMsg", ex.toString()); - mv.setViewName("common/common.errorpage"); + mv.setViewName("framework/common/common.errorpage"); return mv; } diff --git a/xxl-job-admin/src/main/resources/templates/biz/group.list.ftl b/xxl-job-admin/src/main/resources/templates/business/group.list.ftl similarity index 99% rename from xxl-job-admin/src/main/resources/templates/biz/group.list.ftl rename to xxl-job-admin/src/main/resources/templates/business/group.list.ftl index 35dd1198..5c87a653 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/group.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/group.list.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "../framework/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> diff --git a/xxl-job-admin/src/main/resources/templates/biz/job.code.ftl b/xxl-job-admin/src/main/resources/templates/business/job.code.ftl similarity index 99% rename from xxl-job-admin/src/main/resources/templates/biz/job.code.ftl rename to xxl-job-admin/src/main/resources/templates/business/job.code.ftl index 4a0700e8..5ddd5ea5 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/job.code.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/job.code.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "../framework/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> diff --git a/xxl-job-admin/src/main/resources/templates/biz/job.list.ftl b/xxl-job-admin/src/main/resources/templates/business/job.list.ftl similarity index 99% rename from xxl-job-admin/src/main/resources/templates/biz/job.list.ftl rename to xxl-job-admin/src/main/resources/templates/business/job.list.ftl index 6d9f9d22..5167af8e 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/job.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/job.list.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "../framework/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> diff --git a/xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl b/xxl-job-admin/src/main/resources/templates/business/log.detail.ftl similarity index 98% rename from xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl rename to xxl-job-admin/src/main/resources/templates/business/log.detail.ftl index 97ae089d..4ec92ee3 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/log.detail.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "../framework/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> diff --git a/xxl-job-admin/src/main/resources/templates/biz/log.list.ftl b/xxl-job-admin/src/main/resources/templates/business/log.list.ftl similarity index 99% rename from xxl-job-admin/src/main/resources/templates/biz/log.list.ftl rename to xxl-job-admin/src/main/resources/templates/business/log.list.ftl index 9a6ec166..88b6f8fc 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/log.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/log.list.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "../framework/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> diff --git a/xxl-job-admin/src/main/resources/templates/biz/user.list.ftl b/xxl-job-admin/src/main/resources/templates/business/user.list.ftl similarity index 99% rename from xxl-job-admin/src/main/resources/templates/biz/user.list.ftl rename to xxl-job-admin/src/main/resources/templates/business/user.list.ftl index 4f9ff773..4a0ae8db 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/user.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/user.list.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "../framework/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> diff --git a/xxl-job-admin/src/main/resources/templates/base/dashboard.ftl b/xxl-job-admin/src/main/resources/templates/framework/base/dashboard.ftl similarity index 100% rename from xxl-job-admin/src/main/resources/templates/base/dashboard.ftl rename to xxl-job-admin/src/main/resources/templates/framework/base/dashboard.ftl diff --git a/xxl-job-admin/src/main/resources/templates/base/help.ftl b/xxl-job-admin/src/main/resources/templates/framework/base/help.ftl similarity index 100% rename from xxl-job-admin/src/main/resources/templates/base/help.ftl rename to xxl-job-admin/src/main/resources/templates/framework/base/help.ftl diff --git a/xxl-job-admin/src/main/resources/templates/base/index.ftl b/xxl-job-admin/src/main/resources/templates/framework/base/index.ftl similarity index 100% rename from xxl-job-admin/src/main/resources/templates/base/index.ftl rename to xxl-job-admin/src/main/resources/templates/framework/base/index.ftl diff --git a/xxl-job-admin/src/main/resources/templates/base/login.ftl b/xxl-job-admin/src/main/resources/templates/framework/base/login.ftl similarity index 100% rename from xxl-job-admin/src/main/resources/templates/base/login.ftl rename to xxl-job-admin/src/main/resources/templates/framework/base/login.ftl diff --git a/xxl-job-admin/src/main/resources/templates/common/common.errorpage.ftl b/xxl-job-admin/src/main/resources/templates/framework/common/common.errorpage.ftl similarity index 95% rename from xxl-job-admin/src/main/resources/templates/common/common.errorpage.ftl rename to xxl-job-admin/src/main/resources/templates/framework/common/common.errorpage.ftl index 9e81e419..4f0e5a85 100644 --- a/xxl-job-admin/src/main/resources/templates/common/common.errorpage.ftl +++ b/xxl-job-admin/src/main/resources/templates/framework/common/common.errorpage.ftl @@ -2,7 +2,7 @@ <#-- import macro --> - <#import "../common/common.macro.ftl" as netCommon> + <#import "./common.macro.ftl" as netCommon> Error diff --git a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/xxl-job-admin/src/main/resources/templates/framework/common/common.macro.ftl similarity index 100% rename from xxl-job-admin/src/main/resources/templates/common/common.macro.ftl rename to xxl-job-admin/src/main/resources/templates/framework/common/common.macro.ftl