From ed0d65ab479dc190496b44a86b95671433e5fcda Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 24 Aug 2025 15:38:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(xxl-job-admin):=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 JobApiController 包名从 biz 到 openapi
- 优化 common.1.js 中的代码结构，增加模块化
- 调整 jobgroup.index.1.js 中的表格布局
- 移动 common.macro.ftl 中的初始化代码到 common.1.js
-
---
 .../{biz => openapi}/JobApiController.java    |  2 +-
 .../src/main/resources/static/js/common.1.js  | 29 ++++++++++++++++++-
 .../resources/static/js/jobgroup.index.1.js   |  4 +--
 .../templates/common/common.macro.ftl         | 11 -------
 .../templates/jobgroup/jobgroup.index.ftl     |  2 +-
 .../resources/templates/user/user.index.ftl   |  2 +-
 6 files changed, 33 insertions(+), 17 deletions(-)
 rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{biz => openapi}/JobApiController.java (98%)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/openapi/JobApiController.java
similarity index 98%
rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java
rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/openapi/JobApiController.java
index ad3f186d..1be49828 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/openapi/JobApiController.java
@@ -1,4 +1,4 @@
-package com.xxl.job.admin.controller.biz;
+package com.xxl.job.admin.controller.openapi;
 
 import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
 import com.xxl.job.core.biz.AdminBiz;
diff --git a/xxl-job-admin/src/main/resources/static/js/common.1.js b/xxl-job-admin/src/main/resources/static/js/common.1.js
index 675ff874..a601bbfd 100644
--- a/xxl-job-admin/src/main/resources/static/js/common.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/common.1.js
@@ -1,5 +1,8 @@
 $(function(){
 
+
+    // ---------------------- logout ----------------------
+
 	// logout
 	$("#logoutBtn").click(function(){
 		layer.confirm( I18n.logout_confirm , {
@@ -28,6 +31,9 @@ $(function(){
 
 	});
 
+
+    // ---------------------- update pwd ----------------------
+
     // update pwd
     $('#updatePwd').on('click', function(){
         $('#updatePwdModal').modal({backdrop: false, keyboard: false}).modal('show');
@@ -99,6 +105,9 @@ $(function(){
         $("#updatePwdModal .form .form-group").removeClass("has-error");
     });
 
+
+    // ---------------------- slideToTop ----------------------
+
 	// slideToTop
 	var slideToTop = $("<div />");
 	slideToTop.html('<i class="fa fa-chevron-up"></i>');
@@ -142,9 +151,27 @@ $(function(){
 	});
 
 
+    // ---------------------- body fixed ----------------------
+
+    // init body fixed
+    $('body').addClass('fixed');
+
+
+    // ---------------------- menu, sidebar-toggle ----------------------
+
+    // init menu speed
+    $('.sidebar-menu').attr('data-animation-speed', 1);		// default 300ms
+
+    // init menu status
+    if ( 'close' === $.cookie('sidebar_status') ) {
+        $('body').addClass('sidebar-collapse');
+    } else {
+        $('body').removeClass('sidebar-collapse');
+    }
+
     // change menu status
     $('.sidebar-toggle').click(function(){
-        if ( 'close' == $.cookie('sidebar_status') ) {
+        if ( 'close' === $.cookie('sidebar_status') ) {
             $.cookie('sidebar_status', 'open', { expires: 7 });
         } else {
             $.cookie('sidebar_status', 'close', { expires: 7 });	//$.cookie('the_cookie', '', { expires: -1 });
diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
index 0e5b2356..e9b16e41 100644
--- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
@@ -140,8 +140,8 @@ $(function() {
 		var html = '<table class="table table-bordered"><tbody>';
 		if (row.registryList) {
 			for (var index in row.registryList) {
-				html += '<tr><th>' + (parseInt(index)+1) + '</th>';
-				html += '<th><span class="badge bg-green" >' + row.registryList[index] + '</span></th><tr>';
+				html += '<tr><th class="col-md-3" >' + (parseInt(index)+1) + '</th>';
+				html += '<th class="col-md-9" ><span class="badge bg-green" >' + row.registryList[index] + '</span></th><tr>';
 			}
 		}
 		html += '</tbody></table>';
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 1e792944..2f2d1266 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
@@ -61,17 +61,6 @@
     <script>
 		var base_url = '${request.contextPath}';
         var I18n = ${I18nUtil.getMultString()};
-
-		// init menu status
-		if ( 'close' == $.cookie('sidebar_status') ) {
-			$('body').addClass('sidebar-collapse');
-		} else {
-			$('body').removeClass('sidebar-collapse');
-		}
-		// init body fixed
-		$('body').addClass('fixed');
-		// init menu speed
-		$('.sidebar-menu').attr('data-animation-speed', 1);
 	</script>
 
 	<!-- AdminLTE App -->
diff --git a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl
index 25f44c6a..2141abb1 100644
--- a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl
+++ b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl
@@ -87,7 +87,7 @@
 
             <!-- 注册列表查看.模态框 -->
             <div class="modal fade" id="showRegistryListModal" tabindex="-1" role="dialog"  aria-hidden="true">
-                <div class="modal-dialog modal-sm">
+                <div class="modal-dialog">
                     <div class="modal-content">
                         <div class="modal-header">
                             <h4 class="modal-title" >${I18n.jobinfo_opt_registryinfo}</h4>
diff --git a/xxl-job-admin/src/main/resources/templates/user/user.index.ftl b/xxl-job-admin/src/main/resources/templates/user/user.index.ftl
index 29df3137..005c0bcf 100644
--- a/xxl-job-admin/src/main/resources/templates/user/user.index.ftl
+++ b/xxl-job-admin/src/main/resources/templates/user/user.index.ftl
@@ -55,7 +55,7 @@
                         <input type="text" class="form-control" id="username" autocomplete="on" >
                     </div>
                 </div>
-	            <div class="col-xs-1">
+	            <div class="col-xs-2">
 	            	<button class="btn btn-block btn-info" id="searchBtn">${I18n.system_search}</button>
 	            </div>
 	            <div class="col-xs-2">