From 8ea75b6f027f18f6daf229e43928f78b49740f79 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:51:36 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html
index 36d1a27..8bd8345 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html
@@ -60,9 +60,9 @@
</div>
<script type="text/javascript" src="module/apiUrl.js"></script>
<script type="text/javascript" src="assets/libs/layui/layui.js"></script>
+<script type="text/javascript" src="module/aes.js"></script>
<script type="text/javascript" src="assets/libs/login.js"></script>
<script type="text/javascript" src="module/Math.uuid.js"></script>
-
<script>
layui.config({
base: 'module/'
@@ -87,28 +87,32 @@
xhrFields: {
withCredentials: true
},
- data: obj.field,
+ data: {
+ deviceId :$("input[name='deviceId']").val(),
+ password : getAesString($("input[name='password']").val()),
+ username : getAesString($("input[name='username']").val()),
+ validCode : $("input[name='validCode']").val()
+ },
type: 'POST',
beforeSend: function (xhr) {
- xhr.setRequestHeader('Authorization', 'Basic ' + window.btoa(config.clientId + ":" + config.clientSecret));
+ xhr.setRequestHeader('Authorization', 'Basic ' + getAesString(config.clientId + ":" + config.clientSecret));
},
success: function (data) {
- // console.log(JSON.stringify(data));
- // debugger;
if (data.code === 0) {
config.putToken(data.data);
- layer.msg('登录成功', {icon: 1, time: 500}, function () {
+ layer.msg('登录成功', {icon: 1, time: 2000}, function () {
location.replace('./');
});
} else {
layer.closeAll('loading');
- layer.msg(data.msg, {icon: 5, time: 500});
+ layer.msg(data.msg, {icon: 5, time: 2000});
+ $('.login-captcha').click();
}
},
error: function (xhr) {
- //console.log(xhr)
layer.closeAll('loading');
- layer.msg(xhr.responseJSON.msg, {icon: 5, time: 500});
+ layer.msg(xhr.responseJSON.msg, {icon: 5, time: 2000});
+ $('.login-captcha').click();
}
});
//阻止表单跳转
--
Gitblit v1.8.0