From 183df82a75e9ba4141a6be9b4f615c9b9c3ab7d5 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 30 Jun 2020 18:14:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(login=20password=20ecrypt):=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86=E4=BC=A0=E8=BE=93?=
 =?UTF-8?q?=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authentication/templates/authentication/login.html  | 9 ++++++---
 .../templates/authentication/xpack_login.html            | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/authentication/templates/authentication/login.html b/apps/authentication/templates/authentication/login.html
index 60b365d9e..14978e426 100644
--- a/apps/authentication/templates/authentication/login.html
+++ b/apps/authentication/templates/authentication/login.html
@@ -66,13 +66,16 @@
     </form>
     <script type="text/javascript" src="/static/js/plugins/jsencrypt/jsencrypt.min.js"></script>
     <script>
+    function encryptLoginPassword(password, rsaPublicKey){
+        var jsencrypt = new JSEncrypt(); //加密对象
+        jsencrypt.setPublicKey(rsaPublicKey); // 设置密钥
+        return jsencrypt.encrypt(password); //加密
+    }
     function doLogin() {
         //公钥加密
         var rsaPublicKey = "{{ rsa_public_key }}"
         var password =$('#password').val(); //明文密码
-        var jsencrypt = new JSEncrypt(); //加密对象
-        jsencrypt.setPublicKey(rsaPublicKey); // 设置密钥
-        var passwordEncrypted = jsencrypt.encrypt(password); //加密
+        var passwordEncrypted = encryptLoginPassword(password, rsaPublicKey)
         $('#password').val(passwordEncrypted); //返回给密码输入input
         $('#form').submit();//post提交
     }
diff --git a/apps/authentication/templates/authentication/xpack_login.html b/apps/authentication/templates/authentication/xpack_login.html
index c6a919c60..5929650df 100644
--- a/apps/authentication/templates/authentication/xpack_login.html
+++ b/apps/authentication/templates/authentication/xpack_login.html
@@ -129,13 +129,16 @@
 </body>
 <script type="text/javascript" src="/static/js/plugins/jsencrypt/jsencrypt.min.js"></script>
 <script>
+    function encryptLoginPassword(password, rsaPublicKey){
+        var jsencrypt = new JSEncrypt(); //加密对象
+        jsencrypt.setPublicKey(rsaPublicKey); // 设置密钥
+        return jsencrypt.encrypt(password); //加密
+    }
     function doLogin() {
         //公钥加密
         var rsaPublicKey = "{{ rsa_public_key }}"
         var password =$('#password').val(); //明文密码
-        var jsencrypt = new JSEncrypt(); //加密对象
-        jsencrypt.setPublicKey(rsaPublicKey); // 设置密钥
-        var passwordEncrypted = jsencrypt.encrypt(password); //加密
+        var passwordEncrypted = encryptLoginPassword(password, rsaPublicKey)
         $('#password').val(passwordEncrypted); //返回给密码输入input
         $('#contact-form').submit();//post提交
     }