From 1299f3da759637560470cf366dc4f88d70d2c27a Mon Sep 17 00:00:00 2001
From: peijianbo <peijainbo3006@163.com>
Date: Mon, 14 Sep 2020 10:47:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(authentication):=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BB=85=E6=8F=90=E4=BA=A4=E6=97=B6=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/authentication/login.html       | 31 ++++++++++++++-----
 .../templates/authentication/xpack_login.html | 29 ++++++++++++-----
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/apps/authentication/templates/authentication/login.html b/apps/authentication/templates/authentication/login.html
index a6dec7d9d..3e632dd82 100644
--- a/apps/authentication/templates/authentication/login.html
+++ b/apps/authentication/templates/authentication/login.html
@@ -46,7 +46,7 @@
         <div>
             {{ form.captcha }}
         </div>
-        <button type="submit" class="btn btn-primary block full-width m-b" onclick="doLogin();return false;">{% trans 'Login' %}</button>
+        <button id="submit-id" type="button" class="btn btn-primary block full-width m-b" onclick="doLogin()">{% trans 'Login' %}</button>
 
         {% if demo_mode %}
             <p class="text-muted font-bold" style="color: red">
@@ -82,12 +82,27 @@
         return jsencrypt.encrypt(password); //加密
     }
     function doLogin() {
-        //公钥加密
-        var rsaPublicKey = "{{ rsa_public_key }}"
-        var password =$('#password').val(); //明文密码
-        var passwordEncrypted = encryptLoginPassword(password, rsaPublicKey)
-        $('#password').val(passwordEncrypted); //返回给密码输入input
-        $('#form').submit();//post提交
-    }
+        var rsaPublicKey = "{{ rsa_public_key }}";
+        var password =$('#password').val();
+        var passwordEncrypted = encryptLoginPassword(password, rsaPublicKey);
+        var serialize_array = $('#form').serializeArray();
+        $.each(serialize_array, function(index,obj){
+            if(obj.name=='password'){
+                obj.value=passwordEncrypted};
+        });
+
+        $.ajax({
+            type: 'POST',
+            url: '',
+            data: serialize_array,
+            success: function(data){
+                $('body').html(data);
+            },
+            error: function(data){
+                alert('服务器异常');
+            },
+        });
+    };
+
     </script>
 {% endblock %}
diff --git a/apps/authentication/templates/authentication/xpack_login.html b/apps/authentication/templates/authentication/xpack_login.html
index 32f12e9b5..4c1c46938 100644
--- a/apps/authentication/templates/authentication/xpack_login.html
+++ b/apps/authentication/templates/authentication/xpack_login.html
@@ -127,7 +127,7 @@
                                         {{ form.captcha }}
                                     </div>
                                     <div class="form-group" style="margin-top: 10px">
-                                        <button type="submit" class="btn btn-transparent" onclick="doLogin();return false;">{% trans 'Login' %}</button>
+                                        <button id="submit-id" type="button" class="btn btn-transparent" onclick="doLogin()">{% trans 'Login' %}</button>
                                     </div>
                                     <div style="text-align: center">
                                         <a href="{% url 'authentication:forgot-password' %}">
@@ -153,12 +153,27 @@
         return jsencrypt.encrypt(password); //加密
     }
     function doLogin() {
-        //公钥加密
-        var rsaPublicKey = "{{ rsa_public_key }}"
-        var password =$('#password').val(); //明文密码
-        var passwordEncrypted = encryptLoginPassword(password, rsaPublicKey)
-        $('#password').val(passwordEncrypted); //返回给密码输入input
-        $('#contact-form').submit();//post提交
+        var rsaPublicKey = "{{ rsa_public_key }}";
+        var password =$('#password').val();
+        var passwordEncrypted = encryptLoginPassword(password, rsaPublicKey);
+        var serialize_array = $('#form').serializeArray();
+        $.each(serialize_array, function(index,obj){
+            if(obj.name=='password'){
+                obj.value=passwordEncrypted};
+        });
+
+        $.ajax({
+            type: 'POST',
+            url: '',
+            data: serialize_array,
+            success: function(data){
+                $('body').html(data);
+            },
+            error: function(data){
+                alert('服务器异常');
+            },
+        });
+    };
     }
 </script>
 </html>