Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-06-23 c9e0af4886731ad0315b75a27d0fe3eaaa93bde3

 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,14 +87,17 @@
                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 () {
@@ -123,6 +126,9 @@
        $('.login-captcha').click(function () {
            this.src = this.src + '?t=' + (new Date).getTime();
        });



    });
</script>
</body>