From 5a9a23eb9c9a3ec91d1732f067a2a8d755546212 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 6 Sep 2023 11:14:49 +0800
Subject: [PATCH 1/4] fix

---
 fs_template/reset_confirm.tpl | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/fs_template/reset_confirm.tpl b/fs_template/reset_confirm.tpl
index 9beaa5ea..60bffd68 100644
--- a/fs_template/reset_confirm.tpl
+++ b/fs_template/reset_confirm.tpl
@@ -59,7 +59,6 @@ button:hover {
   background-color: #0056b3;
 }
 
-
 /* Mobile */
 @media screen and (max-width: 767px) {
   .container {
@@ -102,31 +101,34 @@ button:hover {
 </head>
 
 <body>
+
 <div class="container">
 <h2>Reset Password</h2>
+
 <form id="resetForm">
   <div class="form-group">
     <label for="new_password">New Password</label>
-    <input id="new_password" type="password" placeholder="New password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$">
+    <input id="new_password" type="password" placeholder="New password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
   </div>
+
   <div class="form-group">  
     <label for="confirm_password">Confirm Password</label>
-    <input id="confirm_password" type="password" placeholder="Confirm password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$">
+    <input id="confirm_password" type="password" placeholder="Confirm password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
   </div>
   <button type="button" onclick="resetPassword()">Reset Password</button>
 </form>
 </div>
 
 <script>
+
+
 function resetPassword() {
   const new_password = document.getElementById("new_password").value;
   const confirm_password = document.getElementById("confirm_password").value;
-
   if (new_password !== confirm_password) {
     alert("Passwords do not match");
     return;
   }
-  
   sha256ToBase64(new_password).then((hash) => {
     const data = {
       new_password: hash,
@@ -144,25 +146,25 @@ function resetPassword() {
     .then(data => {
       if (data.code == 200 ) {
         alert(data.msg);
-        window.location.href = "{{.HomePage}}";
+        {{/* window.location.href = "{{.HomePage}}"; */}}
+        setTimeout(function() {
+          window.location.href = "{{.HomePage}}";
+        }, 1000);
       } else {
         alert(data.msg);
       }
     })
     .catch(error => {
       console.error('Error:', error);
-      // 在这里处理其他错误情况
     });
   });
 }
 
 function sha256ToBase64(message) {
   const msgBuffer = new TextEncoder().encode(message);
-
   return crypto.subtle.digest('SHA-256', msgBuffer).then((hashBuffer) => {
     const hashArray = Array.from(new Uint8Array(hashBuffer));
     const hashBase64 = btoa(hashArray.reduce((str, byte) => str + String.fromCharCode(byte), ''));
-
     return hashBase64;
   });
 }

From 944c81687a8645bd9fb16583f4e054ccb43574e5 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 6 Sep 2023 11:22:35 +0800
Subject: [PATCH 2/4] fix

---
 fs_template/reset_confirm.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_template/reset_confirm.tpl b/fs_template/reset_confirm.tpl
index 60bffd68..b0c5d893 100644
--- a/fs_template/reset_confirm.tpl
+++ b/fs_template/reset_confirm.tpl
@@ -108,12 +108,12 @@ button:hover {
 <form id="resetForm">
   <div class="form-group">
     <label for="new_password">New Password</label>
-    <input id="new_password" type="password" placeholder="New password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
+    <input id="new_password" type="password" placeholder="New Password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
   </div>
 
   <div class="form-group">  
     <label for="confirm_password">Confirm Password</label>
-    <input id="confirm_password" type="password" placeholder="Confirm password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
+    <input id="confirm_password" type="password" placeholder="Confirm Password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
   </div>
   <button type="button" onclick="resetPassword()">Reset Password</button>
 </form>

From 982b9580a6e1e13fc4f47f91a21e31939b15d391 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 6 Sep 2023 11:30:20 +0800
Subject: [PATCH 3/4] fix

---
 fs_template/reset_confirm.tpl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/fs_template/reset_confirm.tpl b/fs_template/reset_confirm.tpl
index b0c5d893..071f8e30 100644
--- a/fs_template/reset_confirm.tpl
+++ b/fs_template/reset_confirm.tpl
@@ -51,7 +51,7 @@ button {
   background-color: #007bff;
   color: #fff;
   border: none;
-  border-radius: 3px;
+  border-radius: 5px;
   cursor: pointer; 
 }
 
@@ -125,6 +125,12 @@ button:hover {
 function resetPassword() {
   const new_password = document.getElementById("new_password").value;
   const confirm_password = document.getElementById("confirm_password").value;
+
+  if (!/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$/.test(new_password)) {
+  alert("The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter.");
+  return;
+  }
+
   if (new_password !== confirm_password) {
     alert("Passwords do not match");
     return;
@@ -145,11 +151,11 @@ function resetPassword() {
     .then(response => response.json())
     .then(data => {
       if (data.code == 200 ) {
-        alert(data.msg);
-        {{/* window.location.href = "{{.HomePage}}"; */}}
-        setTimeout(function() {
+        alert("reset password success");
+        window.location.href = "{{.HomePage}}";
+        {{/* setTimeout(function() {
           window.location.href = "{{.HomePage}}";
-        }, 1000);
+        }, 1000); */}}
       } else {
         alert(data.msg);
       }

From 6d452932077eacd0f45e77832aa7354fc8d3b87f Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 6 Sep 2023 11:41:25 +0800
Subject: [PATCH 4/4] fix

---
 server/auth/internal/logic/userregisterlogic.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/auth/internal/logic/userregisterlogic.go b/server/auth/internal/logic/userregisterlogic.go
index b6107754..d9ed3fa3 100644
--- a/server/auth/internal/logic/userregisterlogic.go
+++ b/server/auth/internal/logic/userregisterlogic.go
@@ -41,10 +41,10 @@ func (l *UserRegisterLogic) UserRegister(req *types.RequestUserRegister, userinf
 		return resp.SetStatus(basic.CodeOAuthEmailErr)
 	}
 
-	_, err := l.svcCtx.AllModels.FsUser.FindUserByEmail(l.ctx, req.Email)
-	if err == nil {
-		return resp.SetStatus(basic.CodeEmailExistsErr)
-	}
+	// _, err := l.svcCtx.AllModels.FsUser.FindUserByEmail(l.ctx, req.Email)
+	// if err == nil {
+	// 	return resp.SetStatus(basic.CodeEmailExistsErr)
+	// }
 
 	if !TimeLimit.Is(req.Email) {
 		return resp.SetStatus(basic.CodeEmailTimeShortErr)
