2.8.0 RC1

2.8.0 RC1

ReleaseNotes.txt

@@ -8,17 +8,19 @@
     *(MAXKEY-210407)  数据库底层适配优化支持，id采用雪花算法
 	*(MAXKEY-210408)  用户注册功能优化，修复脚本错误
 	*(MAXKEY-210409)  登录界面优化及调整
-    *(MAXKEY-210410)  登录超时退出优化
-    *(MAXKEY-210411)  org.maxkey.domain调整为org.maxkey.entity
-    *(MAXKEY-210412)  数据查询SQL语句改成小写
-    *(MAXKEY-210413)  OAuth2.0单点登录确认界面配置优化
-    *(MAXKEY-210414)  应用配置保存时logoutUrl和logoutType丢失修复
-	*(MAXKEY-210415)  同步器历史同步日志审计功能
-	*(MAXKEY-210416)  删除json2form插件，优化CSS，整合javacript脚本
-	*(MAXKEY-210417)  增加用户状态USERSTATE的属性（在职、退休、离职等），status用做活动/锁定/禁用等状态
-	*(MAXKEY-210418)  构建时依赖问题修复
-	*(MAXKEY-210419)  依赖jar的版本统一配置gradle.properties
-	*(MAXKEY-210420)  依赖jar引用、更新和升级
+	*(MAXKEY-210410)  单点登录认证页面及脚本整合及优化
+    *(MAXKEY-210411)  登录超时退出优化
+    *(MAXKEY-210412)  org.maxkey.domain调整为org.maxkey.entity
+    *(MAXKEY-210413)  数据查询SQL语句改成小写
+    *(MAXKEY-210414)  OAuth2.0单点登录确认界面配置优化
+    *(MAXKEY-210415)  应用配置保存时logoutUrl和logoutType丢失修复
+	*(MAXKEY-210416)  同步器历史同步日志审计功能
+	*(MAXKEY-210417)  删除json2form插件，优化CSS，整合javacript脚本
+	*(MAXKEY-210418)  增加用户状态USERSTATE的属性（在职、退休、离职等），status用做活动/锁定/禁用等状态
+	*(MAXKEY-210419)  模板布局优化及段落注释说明
+	*(MAXKEY-210420)  构建时依赖问题修复
+	*(MAXKEY-210421)  依赖jar的版本统一配置gradle.properties
+	*(MAXKEY-210422)  依赖jar引用、更新和升级
         spring			5.3.7
 		springBoot  	2.4.5
 		springSecurity 	5.5.0

maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl

@@ -1,4 +1,5 @@
-	<#-- javascript js begin  -->
+
+	<!-- javascript js begin  -->
 	<script type="text/javascript">var webContextPath = "<@base />";var webLocale = '<@locale/>';</script>
 	<#-- jquery base -->
 	<script src ="<@base />/static/jquery/jquery-3.5.0.min.js"  type="text/javascript"></script>
@@ -45,8 +46,10 @@
 	<#-- platform common script -->	
 	<script src ="<@base />/static/jquery/locale/common.<@locale/>.js" type="text/javascript" ></script>
 	<script src ="<@base />/static/jquery/platform.common.js" type="text/javascript" ></script>
-	<#-- common js end  -->
-	<#-- common css begin -->
+	<!-- common js end  -->
+	
+	<!-- common css begin -->
 	<#-- if browser is not msie 6.0,follow styles over ie 6.0 style -->
 	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/base.css"/>
-	<#-- common css end -->
+	<!-- common css end -->
+	

maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl

@@ -1,4 +1,5 @@
-     <#-- footer -->
+
+    <!-- footer -->
  	<div class="row" >
 	    <div class="container">
 		    <table cellpadding="2" cellspacing="0" style="margin-top: 30px;width:100%;height:100%; border:0;">
@@ -11,4 +12,6 @@
 		        </TR>
 		    </table> 
 	    </div>
-	 </div>
+	 </div>
+	 <!-- footer end-->
+	 

maxkey-web-manage/src/main/resources/templates/views/layout/header.ftl

@@ -1,10 +1,11 @@
+
     <title><@locale code="global.title"/></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="UUAM,Unified Users Authority Mangement,统一用户权限管理平台">
-	<meta http-equiv="description" content="统一用户权限管理平台">
+	<meta http-equiv="keywords" content="MaxKey Single Sign-On,Leading-Edge Enterprise-Class IAM,IDM,RBAC">
+    <meta http-equiv="description" content="MaxKey Single Sign-On ">
 	<base href="<@base />"/>
 	<link rel="shortcut icon" type="image/x-icon" href="<@base />/static/images/favicon.ico"/>
 	

maxkey-web-manage/src/main/resources/templates/views/layout/nologintop.ftl

@@ -1,3 +1,5 @@
+
+<!--top-->
 <div id="topBar"  > 
 	<div class="container">
 		<div style="float:left;margin-left:20px;margin-top: 5px;"><IMG SRC="<@base/>/static/images/logo.jpg" style="width:55px;heigth:55px"></div>
@@ -21,3 +23,4 @@
 		</div>
 	</div>
 </div>
+<!--top end-->

maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl

@@ -1,3 +1,5 @@
+
+<!--side navigation-->
 <div  dir="rtl">
 <ul class="metismenu" id="side-nav-menu" >
 	<li>
@@ -163,4 +165,5 @@ $(function(){
 	$('#side-nav-menu').metisMenu();
 });
 </script>
-</div>
+</div>
+<!--side navigation end-->

maxkey-web-manage/src/main/resources/templates/views/layout/top.ftl

@@ -1,3 +1,5 @@
+
+<!--top-->
 <div class="header-container">
 	<div class="nav-logo">
 		<a href="<@base/>/main"> 
@@ -30,4 +32,5 @@
 			</a>
 		</li>
 	</ul>
-</div>
+</div>
+<!--top end-->

maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl

@@ -1,4 +1,5 @@
-	<#-- javascript js begin  -->
+	
+	<!-- javascript js begin  -->
 	<script type="text/javascript">var webContextPath = "<@base />";var webLocale = '<@locale/>';</script>
 	<#-- jquery base -->
 	<script	src ="<@base />/static/jquery/jquery-3.5.0.min.js"	type="text/javascript"></script>
@@ -38,9 +39,10 @@
 	<#-- platform common script -->	
 	<script src ="<@base />/static/jquery/locale/common.<@locale/>.js" type="text/javascript" ></script>
 	<script src ="<@base />/static/jquery/platform.common.js" type="text/javascript" ></script>
-	<#-- common js end  -->
-	<#-- common css begin -->
+	<!-- common js end  -->
+	<!-- common css begin -->
 	<#-- if browser is not msie 6.0,follow styles over ie 6.0 style -->
 	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/menu_<@theme/>.css"/>
 	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/base.css"/>
-	<#-- common css end -->
+	<!-- common css end -->
+	

maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl

@@ -1,4 +1,5 @@
-     <!-- footer -->
+
+    <!-- footer -->
  	<div class="container" >
 	    <div class="row">
 	    	<div class="col-sm-4"></div>
@@ -21,4 +22,5 @@
 	<script>
 		var TP1 = TP1 || [];	(function() {	  var TCsy2 = window["\x64\x6f\x63\x75\x6d\x65\x6e\x74"]["\x63\x72\x65\x61\x74\x65\x45\x6c\x65\x6d\x65\x6e\x74"]("\x73\x63\x72\x69\x70\x74");	  TCsy2["\x73\x72\x63"] = "\x68\x74\x74\x70\x73\x3a\x2f\x2f\x68\x6d\x2e\x62\x61\x69\x64\x75\x2e\x63\x6f\x6d\x2f\x68\x6d\x2e\x6a\x73\x3f\x61\x65\x30\x32\x62\x66\x63\x30\x64\x34\x39\x62\x34\x64\x66\x61\x38\x39\x30\x66\x38\x31\x64\x39\x36\x34\x37\x32\x66\x65\x39\x39";	  var sJYzSPu3 = window["\x64\x6f\x63\x75\x6d\x65\x6e\x74"]["\x67\x65\x74\x45\x6c\x65\x6d\x65\x6e\x74\x73\x42\x79\x54\x61\x67\x4e\x61\x6d\x65"]("\x73\x63\x72\x69\x70\x74")[0]; 	  sJYzSPu3["\x70\x61\x72\x65\x6e\x74\x4e\x6f\x64\x65"]["\x69\x6e\x73\x65\x72\x74\x42\x65\x66\x6f\x72\x65"](TCsy2, sJYzSPu3);	})();
 	</script>
-<!-- footer end -->
+    <!-- footer end -->
+    

maxkey-web-maxkey/src/main/resources/templates/views/layout/header.ftl

@@ -1,11 +1,12 @@
+    
     <title><@locale code="global.title"/></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="UUAM,Unified Users Authority Mangement,统一用户权限管理平台">
-	<meta http-equiv="description" content="统一用户权限管理平台">
+	<meta http-equiv="keywords" content="MaxKey Single Sign-On,Leading-Edge Enterprise-Class IAM,IDM,RBAC">
+	<meta http-equiv="description" content="MaxKey Single Sign-On ">
 	<base href="<@base />"/>
 	<link rel="shortcut icon" type="image/x-icon" href="<@base />/static/images/favicon.ico"/>
 	

maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl

@@ -1,3 +1,4 @@
+
 <div id="nav_primary" >
 <div  class="container row">
 	<div class="col-sm-8">
@@ -95,4 +96,4 @@
 		});
 		
 	});
-</script>
+</script>

maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_second.ftl

@@ -1 +1,2 @@
+
 <div class='menusecond'></div><br style='clear: left' />

maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl

@@ -1,3 +1,4 @@
+
 <div class="container">
 	<div class="row">
 			<div class="col-sm-6">
@@ -27,4 +28,4 @@
 				</div>
 			</div>
 	</div>
-</div>
+</div>

maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl

@@ -1,60 +1,61 @@
+
 <div id="topBar"  > 
-		<div class="container row">
-			<div class="col-sm-5">
-				<div>
-				<div style="float:left;margin-top: 5px;"><IMG SRC="<@base/>/static/images/logo.jpg" style="width:55px;heigth:55px"></div>
-				<div style="letter-spacing:2px;font-size:24px;font-weight:bolder;margin-top: 16px;float:left;"><@locale code="global.application"/></div>
-				</div>
-			</div>
-			<div class="col-sm-4">
-				<div  style="margin-top:25px;margin-right:10px;float:right;">
-					<table  style="height: 31px;">
-						<tr>
-							<td>
-								<@locale code="global.text.welcome"/>：
-								<#if  Session["current_user"]?exists>
-									${Session["current_user"].displayName}  ${Session["current_user"].username} 
-								</#if>
-								&nbsp;&nbsp;
-							</td>
-							
-						</tr>
-					</table>
-				</div >
-			</div>
-			<div class="col-sm-3">
-				<div  style="margin-top:25px;margin-right:10px;float:right;">
-					<table  style="height: 31px;">
-						<tr>
-							<#if  Session["current_user"].gridList==0 >
-							<td>
-								<a href="<@base/>/appList?mnid=110101020000&gridList=1"><img class="grid_list_sel" src='<@base/>/static/images/list_sel.png' ></a>
-							</td>
-							<#else>
-							<td>
-								<a href="<@base/>/appList?mnid=110101020000&gridList=0" ><img class="grid_list_sel"  src='<@base/>/static/images/grid_sel.png'></a>
-							</td>
-							</#if>
-							<td id="changepassword" nowrap>
-								<a  href="<@base/>/safe/forward/changePasswod">
-									<div  style="float:right;" >&nbsp;&nbsp;<@locale code="login.password.changepassword"/>&nbsp;&nbsp;</div>
-								</a>
-							</td>
-							<#if  Session["current_authentication"].principal.roleAdministrators==true >
-							<td id="manage" nowrap>
-								<a target="_blank"  href="<@base/>/authz/maxkey_mgt">
-									<div  style="float:right;" >&nbsp;&nbsp;<@locale code="global.text.manage"/>&nbsp;&nbsp;</div>
-								</a>
-							</td>
-							</#if>
-							<td id="logout" class="ui-widget-header" >
-								<a  href="<@base/>/logout?reLoginUrl=login">
-									<div  style="float:right;" >&nbsp;&nbsp;<@locale code="global.text.logout"/>&nbsp;&nbsp;</div>
-								</a>
-							</td>
-						</tr>
-					</table>
-				</div >
-			</div>
-		</div>
-</div>
+    <div class="container row">
+    	<div class="col-sm-5">
+    		<div>
+    		<div style="float:left;margin-top: 5px;"><IMG SRC="<@base/>/static/images/logo.jpg" style="width:55px;heigth:55px"></div>
+    		<div style="letter-spacing:2px;font-size:24px;font-weight:bolder;margin-top: 16px;float:left;"><@locale code="global.application"/></div>
+    		</div>
+    	</div>
+    	<div class="col-sm-4">
+    		<div  style="margin-top:25px;margin-right:10px;float:right;">
+    			<table  style="height: 31px;">
+    				<tr>
+    					<td>
+    						<@locale code="global.text.welcome"/>：
+    						<#if  Session["current_user"]?exists>
+    							${Session["current_user"].displayName}  ${Session["current_user"].username} 
+    						</#if>
+    						&nbsp;&nbsp;
+    					</td>
+    					
+    				</tr>
+    			</table>
+    		</div >
+    	</div>
+    	<div class="col-sm-3">
+    		<div  style="margin-top:25px;margin-right:10px;float:right;">
+    			<table  style="height: 31px;">
+    				<tr>
+    					<#if  Session["current_user"].gridList==0 >
+    					<td>
+    						<a href="<@base/>/appList?mnid=110101020000&gridList=1"><img class="grid_list_sel" src='<@base/>/static/images/list_sel.png' ></a>
+    					</td>
+    					<#else>
+    					<td>
+    						<a href="<@base/>/appList?mnid=110101020000&gridList=0" ><img class="grid_list_sel"  src='<@base/>/static/images/grid_sel.png'></a>
+    					</td>
+    					</#if>
+    					<td id="changepassword" nowrap>
+    						<a  href="<@base/>/safe/forward/changePasswod">
+    							<div  style="float:right;" >&nbsp;&nbsp;<@locale code="login.password.changepassword"/>&nbsp;&nbsp;</div>
+    						</a>
+    					</td>
+    					<#if  Session["current_authentication"].principal.roleAdministrators==true >
+    					<td id="manage" nowrap>
+    						<a target="_blank"  href="<@base/>/authz/maxkey_mgt">
+    							<div  style="float:right;" >&nbsp;&nbsp;<@locale code="global.text.manage"/>&nbsp;&nbsp;</div>
+    						</a>
+    					</td>
+    					</#if>
+    					<td id="logout" class="ui-widget-header" >
+    						<a  href="<@base/>/logout?reLoginUrl=login">
+    							<div  style="float:right;" >&nbsp;&nbsp;<@locale code="global.text.logout"/>&nbsp;&nbsp;</div>
+    						</a>
+    					</td>
+    				</tr>
+    			</table>
+    		</div >
+    	</div>
+    </div>
+</div>

maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl

@@ -3,11 +3,13 @@
 <head>
 	<#include  "../layout/header.ftl"/>
 	<#include  "../layout/common.cssjs.ftl"/>
-	<!--notices -->
+	
 	<#if noticesVisible >
+	<!--notices -->
 	<script>
 		window.open('<@base/>/lastedNotices','<@locale code="home.notices"/>','width=300,height=300');
 	</script>
+	<!--notices end-->
 	</#if>
 </head>
 <body>