refactor(admin): 重构前端模板结构并升级依赖版本

pom.xml

@@ -30,16 +30,17 @@
 		<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
 		<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
 		<central-publishing-maven-plugin.version>0.10.0</central-publishing-maven-plugin.version>
+
 		<!-- base -->
 		<slf4j-api.version>2.0.18</slf4j-api.version>
-		<junit-jupiter.version>6.0.3</junit-jupiter.version>
+		<junit-jupiter.version>6.1.0</junit-jupiter.version>
 
 		<!-- jakarta.annotation-api -->
 		<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
 
 		<!-- spring -->
-		<spring-boot.version>4.0.6</spring-boot.version>
+		<spring-boot.version>4.1.0</spring-boot.version>
-		<spring.version>7.0.7</spring.version>
+		<spring.version>7.0.8</spring.version>
 		<!-- mybatis & db -->
 		<mybatis-spring-boot-starter.version>4.0.1</mybatis-spring-boot-starter.version>
 		<mysql-connector-j.version>9.7.0</mysql-connector-j.version>
@@ -57,7 +58,7 @@
 		<gson.version>2.14.0</gson.version>
 
 		<!-- spring-ai -->
-		<spring-ai.version>2.0.0-M8</spring-ai.version>
+		<spring-ai.version>2.0.0-RC2</spring-ai.version>
 		<!-- dify -->
 		<dify-java-client.version>1.2.7</dify-java-client.version>
 	</properties>

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java

@@ -48,7 +48,7 @@ public class IndexController {
 		List<XxlBootResourceDTO> resourceList = findResourceList(request);
 		model.addAttribute("resourceList", resourceList);
 
-		return "base/index";
+		return "framework/base/index";
 	}
 
 	/**
@@ -87,7 +87,7 @@ public class IndexController {
 		Map<String, Object> 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;
 	}
 

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)

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")

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")

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")

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")

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java

@@ -46,7 +46,7 @@ public class JobUserController {
         List<XxlJobGroup> groupList = xxlJobGroupMapper.findAll();
         model.addAttribute("groupList", groupList);
 
-        return "biz/user.list";
+        return "business/user.list";
     }
 
     @RequestMapping("/pageList")

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;
 		}
 

xxl-job-admin/src/main/resources/templates/business/group.list.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "../framework/common/common.macro.ftl" as netCommon>
 
 	<!-- 1-style start -->
 	<@netCommon.commonStyle />

xxl-job-admin/src/main/resources/templates/business/job.code.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "../framework/common/common.macro.ftl" as netCommon>
 
 	<!-- 1-style start -->
 	<@netCommon.commonStyle />

xxl-job-admin/src/main/resources/templates/business/job.list.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "../framework/common/common.macro.ftl" as netCommon>
 
 	<!-- 1-style start -->
 	<@netCommon.commonStyle />

xxl-job-admin/src/main/resources/templates/business/log.detail.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "../framework/common/common.macro.ftl" as netCommon>
 
 	<!-- 1-style start -->
 	<@netCommon.commonStyle />

xxl-job-admin/src/main/resources/templates/business/log.list.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "../framework/common/common.macro.ftl" as netCommon>
 
 	<!-- 1-style start -->
 	<@netCommon.commonStyle />

xxl-job-admin/src/main/resources/templates/business/user.list.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "../framework/common/common.macro.ftl" as netCommon>
 
 	<!-- 1-style start -->
 	<@netCommon.commonStyle />

xxl-job-admin/src/main/resources/templates/framework/common/common.errorpage.ftl

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<#-- import macro -->
-	<#import "../common/common.macro.ftl" as netCommon>
+	<#import "./common.macro.ftl" as netCommon>
 
 	<meta charset="UTF-8">
 	<title>Error</title>