From 139e8f9a1b1516e694d4744b84899ecc643eb25d Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Tue, 11 May 2021 16:38:35 +0800
Subject: [PATCH] registration fix

---
 .../resources/messages/message.properties     |  2 +-
 .../resources/messages/message_en.properties  |  2 +-
 .../messages/message_zh_CN.properties         |  2 +-
 .../templates/views/layout/footer.ftl         |  2 +-
 .../resources/messages/message.properties     |  2 +-
 .../resources/messages/message_en.properties  |  2 +-
 .../messages/message_zh_CN.properties         |  2 +-
 .../templates/views/layout/footer.ftl         |  2 +-
 .../templates/views/registration/register.ftl | 69 ++-----------------
 9 files changed, 13 insertions(+), 72 deletions(-)

diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties
index 6489ce1e9..40695bb5d 100644
--- a/maxkey-web-manage/src/main/resources/messages/message.properties
+++ b/maxkey-web-manage/src/main/resources/messages/message.properties
@@ -6,7 +6,7 @@ global.change.language.zh=\u4e2d\u6587
 global.text.welcome=\u6b22\u8fce\u60a8
 global.text.manage=\u7ba1\u7406
 global.text.copyright=\u7248\u6743\u6240\u6709
-global.text.copyright.content=Copyright 2021
+global.text.copyright.content=Copyright 
 global.text.copyright.license=Licensed under the Apache License, Version 2.0
 global.text.logout=\u9000\u51fa
 global.logout.tip=\u6ce8\u9500\u6210\u529f
diff --git a/maxkey-web-manage/src/main/resources/messages/message_en.properties b/maxkey-web-manage/src/main/resources/messages/message_en.properties
index ab4993420..691880fd8 100644
--- a/maxkey-web-manage/src/main/resources/messages/message_en.properties
+++ b/maxkey-web-manage/src/main/resources/messages/message_en.properties
@@ -6,7 +6,7 @@ global.change.language.zh=\u4e2d\u6587
 global.text.welcome=Welcome
 global.text.manage=Manage
 global.text.copyright=CopyRight
-global.text.copyright.content=Copyright 2021 
+global.text.copyright.content=Copyright  
 global.text.copyright.license=Licensed under the Apache License, Version 2.0
 global.text.logout=Logout
 global.logout.tip=Logout Tip
diff --git a/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties b/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
index fd5a52ae3..ce2503b86 100644
--- a/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
+++ b/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
@@ -6,7 +6,7 @@ global.change.language.zh=\u4e2d\u6587
 global.text.welcome=\u6b22\u8fce\u60a8
 global.text.manage=\u7ba1\u7406
 global.text.copyright=\u7248\u6743\u6240\u6709
-global.text.copyright.content=Copyright 2021 
+global.text.copyright.content=Copyright  
 global.text.copyright.license=Licensed under the Apache License, Version 2.0
 global.text.logout=\u9000\u51fa
 global.logout.tip=\u6ce8\u9500\u6210\u529f
diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl
index 49287a26b..c959cf2a5 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl
@@ -5,7 +5,7 @@
 		        <TR>
 		          <TD align="center" valign="middle" class="footer  ">
 		          	MaxKey&nbsp;&nbsp;<@locale code="global.application.version"/><br>
-		          	&copy; <@locale code="global.text.copyright.content"/>&nbsp;&nbsp; <a href="https://www.maxkey.top/" target="_blank">https://www.maxkey.top/</a><br>
+		          	&copy; <@locale code="global.text.copyright.content"/>${.now?string["yyyy"]}&nbsp;&nbsp; <a href="https://www.maxkey.top/" target="_blank">https://www.maxkey.top/</a><br>
 		          	<@locale code="global.text.copyright.license"/><br>
 		          </TD>
 		        </TR>
diff --git a/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-web-maxkey/src/main/resources/messages/message.properties
index 4f223af48..a34033fd0 100644
--- a/maxkey-web-maxkey/src/main/resources/messages/message.properties
+++ b/maxkey-web-maxkey/src/main/resources/messages/message.properties
@@ -6,7 +6,7 @@ global.change.language.zh=\u4e2d\u6587
 global.text.welcome=\u6b22\u8fce\u60a8
 global.text.manage=\u7ba1\u7406
 global.text.copyright=\u7248\u6743\u6240\u6709
-global.text.copyright.content=Copyright 2021 
+global.text.copyright.content=Copyright  
 global.text.copyright.license=Licensed under the Apache License, Version 2.0
 global.text.logout=\u9000\u51fa
 global.logout.tip=\u6ce8\u9500\u6210\u529f
diff --git a/maxkey-web-maxkey/src/main/resources/messages/message_en.properties b/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
index 416b24dd1..fee2814d5 100644
--- a/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
+++ b/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
@@ -6,7 +6,7 @@ global.change.language.zh=\u4e2d\u6587
 global.text.welcome=Welcome
 global.text.manage=Manage
 global.text.copyright=CopyRight
-global.text.copyright.content=Copyright 2021 
+global.text.copyright.content=Copyright  
 global.text.copyright.license=Licensed under the Apache License, Version 2.0
 global.text.logout=Logout
 global.logout.tip=Tip
diff --git a/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties b/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
index 4f223af48..a34033fd0 100644
--- a/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
+++ b/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
@@ -6,7 +6,7 @@ global.change.language.zh=\u4e2d\u6587
 global.text.welcome=\u6b22\u8fce\u60a8
 global.text.manage=\u7ba1\u7406
 global.text.copyright=\u7248\u6743\u6240\u6709
-global.text.copyright.content=Copyright 2021 
+global.text.copyright.content=Copyright  
 global.text.copyright.license=Licensed under the Apache License, Version 2.0
 global.text.logout=\u9000\u51fa
 global.logout.tip=\u6ce8\u9500\u6210\u529f
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl
index 6eedcbc4a..56a2c58fe 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl
@@ -7,7 +7,7 @@
 			        <TR>
 			          <TD align="center" valign="middle" class="footer  ">
 			          	MaxKey&nbsp;&nbsp;<@locale code="global.application.version"/><br>
-			          	&copy; <@locale code="global.text.copyright.content"/>&nbsp;&nbsp; <a href="https://www.maxkey.top/" target="_blank">https://www.maxkey.top/</a>
+			          	&copy; <@locale code="global.text.copyright.content"/>${.now?string["yyyy"]}&nbsp;&nbsp; <a href="https://www.maxkey.top/" target="_blank">https://www.maxkey.top/</a>
 			          	<br>
 			          	<@locale code="global.text.copyright.license"/><br>
 			          </TD>
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl
index 1791976ef..664c2c160 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl
@@ -6,71 +6,9 @@
 <#include  "../layout/common.cssjs.ftl">
 <script type="text/javascript"> 
 $(function(){
-
 	$('#j_captchaimg').click(function () {//
            $(this).attr("src", "<@base />/captcha"); 
 	}); 
-	
-	$('#btn_save').on('click',function(){
-		if($('#emailMobile').val()==''){
-		 	alert('<@locale code="forgotpassword.emailmobile"/>'+': empty');
-		 	return false;
-		}
-		if($('#username').val()==''){
-		 	alert('<@locale code="userinfo.username"/>'+': empty');
-		 	return false;
-		}
-		if($('#displayName').val()==''){
-		 	alert('<@locale code="userinfo.displayName"/>'+': empty');
-		 	return false;
-		}
-		
-		
-		if($('#password').val()==''){
-		 	alert('<@locale code="login.text.password"/>'+': empty');
-		 	return false;
-		}
-		if($('#confirmpassword').val()==''){
-		 	alert('<@locale code="login.password.confirmPassword"/>'+': empty');
-		 	return false;
-		}
-		if($('#password').val()!=$('#confirmpassword').val()){
-			alert('<@locale code="login.password.confirmPassword"/>'+'、'+'<@locale code="login.text.password"/>'+': error');
-		 	return false;
-		}
-		formSubmit();
-		
-	})
-	
-	function formSubmit(){
-		var uname=$('#username').val();
-		var pwd=$('#password').val();
-		var eMobile=$('#emailMobile').val();
-		var dName=$('#displayName').val();
-		$.ajax({ 
-	        type:"POST", 
-	        url:"<@base/>/registeron",
-	        data:{
-	        	username:uname,
-	        	password:pwd,
-	        	emailMobile:eMobile,
-	        	displayName:dName
-	        },
-	        success:function(data){ 
-	           if(data.code=='0'){ 
-	               alert(data.message);
-	               window.location.href="<@base/>/login";
-	           }else{ 
-	          	 alert(data.message);
-	           } 
-	        }, 
-	        error:function(jqXHR){ 
-	           alert("error："+ jqXHR.status); 
-	        } 
-		}); 
-	}
-	
-	
 });
 </script>
 </head>
@@ -82,7 +20,10 @@ $(function(){
 <div class="row">
 <div class="col-md-2"></div>
 <div class="col-md-8">
-				<form action="<@base/>/registration/registeron" method="post"   class="needs-validation" novalidate>
+				<form id="actionForm" 
+					action="<@base/>/registration/registeron"
+					forward="<@base/>/login"
+					method="post"   class="needs-validation" novalidate>
 					<table  class="table table-bordered">
 						<tr>
 							<td><@locale code="forgotpassword.emailmobile"/></td>
@@ -110,7 +51,7 @@ $(function(){
 							<td><input  required="" class="form-control"   type='password' id="confirmpassword" name="confirmpassword"  tabindex="2"  value="" /></td>
 						</tr>
 						<tr>
-							<td  colspan="2"><input id="btn_save"  class="button btn btn-lg btn-primary btn-block" type="button" value="<@locale code="login.text.register" />"/></td>
+							<td  colspan="2"><input   class="button btn btn-lg btn-primary btn-block" type="submit" value="<@locale code="login.text.register" />"/></td>
 						</tr>					
 					</table>
 				</form>