瀏覽代碼

refactor(xxl-job): 重构页面模板结构

- 新增 commonHeader、commonFooter 和 commonLeft宏
- 更新 jobcode、jobgroup、jobinfo 和 joblog 页面结构
- 统一页面样式和布局
- 优化代码可读性和可维护性
xuxueli 2 月之前
父節點
當前提交
be44018394

+ 1 - 1
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<LoginInfo> loginInfoResponse = XxlSsoHelper.loginCheckWithCookie(request, response);
+		Response<LoginInfo> loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request);
 		if (loginInfoResponse.isSuccess()) {
 			modelAndView.setView(new RedirectView("/",true,false));
 			return modelAndView;

+ 1 - 1
xxl-job-admin/src/main/resources/templates/common/common.macro.ftl

@@ -104,7 +104,7 @@
 					<#-- login user -->
                     <li class="dropdown">
                         <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" style="font-weight: bold;">
-                            ${I18n.system_welcome} ${xxl_sso_user.userName!}
+                            ${I18n.system_welcome}${xxl_sso_user.userName!}
                             <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu" role="menu">