v2.9.0 & sql structure and data

v2.9.0 & sql structure and data

maxkey-common/src/main/java/org/maxkey/util/SnowFlakeId.java

@@ -203,17 +203,4 @@ public class SnowFlakeId {
 	public void setDateTime(String dateTime) {
 		this.dateTime = dateTime;
 	}
-
-	public static void main(String[] args) {
-        SnowFlakeId snowFlake = new SnowFlakeId(20, 30);
-
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < 1000000; i++) {
-            System.out.println(snowFlake.nextId());
-        }
-
-        System.out.println(System.currentTimeMillis() - start);
-
-
-    }
 }

maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java

@@ -33,4 +33,16 @@ public class SonwFlakeIdTest {
 		System.out.println(seq);
 		System.out.println(snowFlake.parse(seq).getDateTime());
 	}
+	
+	@Test
+	public void performance()  {
+        SnowFlakeId snowFlake = new SnowFlakeId(1, 1);
+    
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < 1000000; i++) {
+            System.out.println(snowFlake.nextId());
+        }
+    
+        System.out.println(System.currentTimeMillis() - start);
+	}
 }

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

@@ -35,9 +35,9 @@
 	 <div class="" style="width:100%;">
 		<div class="top">
 			<ul class="switch_tab"  style="width:100%" >
-				<li id="switch_basic" value="table_switch_basic" style="width:30%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><@locale code="userinfo.tab.basic" /></a></li>
-				<li id="switch_company"  value="table_switch_company" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.business" /></a></li>
-				<li id="switch_home"  value="table_switch_home" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.personal" /></a></li>
+				<li id="table_switch_basic"    style="width:30%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><@locale code="userinfo.tab.basic" /></a></li>
+				<li id="table_switch_company"  style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.business" /></a></li>
+				<li id="table_switch_home"     style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.personal" /></a></li>
 				
 			</ul>
 		</div>
@@ -46,7 +46,7 @@
 	    <div class="mainin">			 
   	        <!-- content -->    
   	      	<!--table-->
-			 <table id="table_switch_basic" width="980" class="table table-bordered" >
+			 <table id="div_table_switch_basic" width="980" class="table table-bordered" >
 	<tbody>				
 	<tr>
 		<td style="width:15%;"><@locale code="userinfo.username" />：</td>
@@ -285,7 +285,7 @@
 	</tr>
 	</tbody>
  </table>
- <table  class="table table-bordered"  style="display:none" id="table_switch_company" width="980">
+ <table  class="table table-bordered"  style="display:none" id="div_table_switch_company" width="980">
 	<tbody>				
 		<tr>
 			<td style="width:15%;"><@locale code="userinfo.organization" />：</td>
@@ -398,7 +398,7 @@
 		</tr>					
 	</tbody>
 </table>
-<table  class="table table-bordered"  style="display:none" id="table_switch_home" width="980">
+<table  class="table table-bordered"  style="display:none" id="div_table_switch_home" width="980">
 	<tbody>				
 		<tr>
 			<td style="width:15%;"><@locale code="userinfo.idtype" />：</td>

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

@@ -31,9 +31,9 @@
 	 <div class="" style="width:100%;">
 		<div class="top">
 			<ul class="switch_tab"  style="width:100%" >
-				<li id="switch_basic" value="table_switch_basic" style="width:30%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><@locale code="userinfo.tab.basic" /></a></li>
-				<li id="switch_company"  value="table_switch_company" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.business" /></a></li>
-				<li id="switch_home"  value="table_switch_home" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.personal" /></a></li>
+				<li id="table_switch_basic"   style="width:30%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><@locale code="userinfo.tab.basic" /></a></li>
+				<li id="table_switch_company" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.business" /></a></li>
+				<li id="table_switch_home"    style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.personal" /></a></li>
 				
 			</ul>
 		</div>
@@ -42,7 +42,7 @@
 	    <div class="mainin">			 
   	        <!-- content -->    
   	      	<!--table-->
-			 <table id="table_switch_basic" width="980" class="table table-bordered" >
+			 <table id="div_table_switch_basic" width="980" class="table table-bordered" >
 	<tbody>				
 	<tr>
 		<td style="width:15%;"><@locale code="userinfo.username" />：</td>
@@ -283,7 +283,7 @@
 	</tr>
 	</tbody>
  </table>
- <table  class="table table-bordered"  style="display:none" id="table_switch_company" width="980">
+ <table  class="table table-bordered"  style="display:none" id="div_table_switch_company" width="980">
 	<tbody>				
 		<tr>
 			<td style="width:15%;"><@locale code="userinfo.organization" />：</td>
@@ -396,7 +396,7 @@
 		</tr>					
 	</tbody>
 </table>
-<table  class="table table-bordered"  style="display:none" id="table_switch_home" width="980">
+<table  class="table table-bordered"  style="display:none" id="div_table_switch_home" width="980">
 	<tbody>				
 		<tr>
 			<td style="width:15%;"><@locale code="userinfo.idtype" />：</td>