ui fix

maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl

@@ -96,9 +96,9 @@
 	var currentSwitchTab="normalLogin";
 	<#--submit form-->		
 	function doLoginSubmit(){
-		$.cookie("login_username", $("#"+currentSwitchTab+"Form input[name=username]").val(), { expires: 7 });
+		$.cookie("mxk_login_username", $("#"+currentSwitchTab+"Form input[name=username]").val(), { expires: 7 });
 		$("#"+currentSwitchTab+"SubmitButton").click();
-		$.cookie("login_switch_tab", currentSwitchTab, { expires: 7 });
+		$.cookie("mxk_login_switch_tab", currentSwitchTab, { expires: 7 });
 	};
 	
 	<#--switch Login Form-->
@@ -127,10 +127,10 @@
 		$(".doLoginSubmit").on("click",function(){
 				doLoginSubmit();
 		});
-		var cookieLoginUsername = $.cookie("login_username");
+		var cookieLoginUsername = $.cookie("mxk_login_username");
 		<#--read username cookie for login e-->		
 		if(cookieLoginUsername != undefined && cookieLoginUsername != ""){
-			var switch_tab=$.cookie("switch_tab")==undefined?"normalLogin":$.cookie("login_switch_tab");
+			var switch_tab=$.cookie("mxk_login_switch_tab")==undefined ? "normalLogin" : $.cookie("mxk_login_switch_tab");
 			$("#"+switch_tab).click();
 			$("#"+switch_tab+"Form input[name=username]").val(cookieLoginUsername ==undefined ? "" : cookieLoginUsername);
 			$("#div_"+switch_tab+" input[name=password]").focus();

maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/PasswordPolicyController.java

@@ -103,7 +103,7 @@ public class PasswordPolicyController {
 				return new Message(result);
 			}
 			
-			if(passwordPolicy.getDigits() + passwordPolicy.getLowerCase() + passwordPolicy.getUpperCase() + passwordPolicy.getSpecialChar() < passwordPolicy.getMinLength()) {
+			if(passwordPolicy.getDigits() + passwordPolicy.getLowerCase() + passwordPolicy.getUpperCase() + passwordPolicy.getSpecialChar() < 2) {
 				FieldError fe = new FieldError("passwordPolicy", "specialChar",
 						2, true,
 						new String[]{"ui.passwordpolicy.xe00000003"},//密码包含小写字母、大写字母、数字、特殊字符的个数不能小于2

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl

@@ -65,7 +65,7 @@
 					</div>
 					<div class="card-body">
 								<form  method="post" type="label" validate="true" action="<@base/>/config/passwordpolicy/update" id="actionForm"   class="needs-validation" novalidate>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.minlength" />：</label>
@@ -84,7 +84,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.lowercase" />：</label>
@@ -102,7 +102,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.digits" />：</label>
@@ -120,7 +120,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.occurances" />：</label>
@@ -142,7 +142,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												
@@ -167,7 +167,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												
@@ -193,7 +193,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.attempts" />：</label>
@@ -211,7 +211,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="row">
+									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.expiration" />(Unit:Day)：</label>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/orgs/orgsList.ftl

@@ -211,7 +211,7 @@ $(function () {
  	</div>
  									 
 	     <!-- content -->  
- <table class="datatable"   width="100%" >
+ <table class="table table-bordered"   width="100%" >
    <tr>
       <td valign="top"  class="td_1" style="vertical-align: top;">
       	<div id="orgsTree" class="ztree"></div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl

@@ -276,7 +276,7 @@ $('#datagrid').on('click-row.bs.table', function (row, element, field) {
             </form>
         </div>
         
-       <table class="datatable"   width="100%" >
+       <table class="table table-bordered"   width="100%" >
        <tr>
           <td valign="top"  class="td_1" style="vertical-align: top;width:450px;">
                 <table  data-url="<@base/>/roles/grid"

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/resourcesList.ftl

@@ -213,7 +213,7 @@ $(function () {
                     
                 </form>
             </div>
-             <table class="datatable"   width="100%" >
+             <table class="table table-bordered"   width="100%" >
            <tr>
               <td valign="top"  class="td_1" style="vertical-align: top;width:400px;">
                 <div id="resourcesTree" class="ztree"><b><@locale code="apps.select.tip"/></b></div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoSelect.ftl

@@ -153,7 +153,7 @@
  	<input class="button btn btn-primary mr-3"  style="float: right;" id="winClose" type="button" value="<@locale code="button.text.select" />" >
  </div>
      <!-- content -->  
-  <table class="datatable"   width="100%" >
+  <table class="table table-bordered"   width="100%" >
    <tr>
       <td valign="top"  class="td_1" style="vertical-align: top;">
       	<div id="orgsTree" class="ztree"></div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/usersList.ftl

@@ -276,7 +276,7 @@ $(function () {
         
     </div>
  	     <!-- content -->  
- <table class="datatable"   width="100%" >
+ <table class="table table-bordered"   width="100%" >
    <tr>
       <td valign="top"  class="td_1" style="vertical-align: top;">
       	<div id="orgsTree" class="ztree"></div>