From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-management/src/main/webapp/WEB-INF/view/login.html |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
index d49fc44..a90987a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -64,21 +64,22 @@
         <form class="m-t" role="form" action="${ctxPath}/login" method="post">
             <div class="item">
                 <img src="${ctxPath}/img/account.png" />
-                <input class="itemInput" type="text" name="username" id="username"  placeholder="请输入账号" required="" value="">
+                <input class="itemInput" type="text" name="username" id="username"  placeholder="请输入账号" required="" value="admin">
             </div>
             <div  class="item">
                 <img src="${ctxPath}/img/password.png" />
-                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入密码" required="" value="">
+                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入密码" required="" value="123456">
             </div>
-            <!--<div  class="item">-->
-                <!--<img src="${ctxPath}/img/password.png" />-->
-                <!--<div class="col-sm-8" style="padding-left: 0px; width: 40%">-->
-                    <!--<input class="form-control" type="text" name="kaptcha" placeholder="请输入验证码" required="">-->
-                <!--</div>-->
-                <!--<div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;margin-left: 25%">-->
-                    <!--<img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>-->
-                <!--</div>-->
-            <!--</div>-->
+
+            <div class="form-group" style="float: left;">
+                <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
+                    <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="111111">
+                </div>
+                <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
+                    <img src="${ctxPath}/kaptcha" id="kaptcha" width="90px" height="34px"/>
+                </div>
+            </div>
+            <h4 style="color: #0e9aef;text-align: right" onclick="updatePassword1()">修改密码</h4>
             <button onclick="login()" class="btn full-width m-b" style="background-color: #0573EA;color: white;">登 录</button>
             <button type="submit" id="submit" style="display: none;"></button>
             </p>
@@ -90,7 +91,28 @@
 <script src="${ctxPath}/js/common/ajax-object.js"></script>
 <script src="${ctxPath}/js/common/Feng.js"></script>
 <script src="${ctxPath}/crypto-js/crypto-js.js"></script>
+<script src="${ctxPath}/layui/layui.all.js"></script>
 <script>
+    function updatePassword1(e) {
+        console.log("调用")
+        let index = layer.open({
+            type: 2,
+            title: '详情',
+            area: ['100%', '100%'], //宽高
+            fix: false, //不固定
+            maxmin: true,
+            content: Feng.ctxPath + '/update'
+        });
+        this.layerIndex = index;
+
+        // $.ajax({
+        //     url: Feng.ctxPath + '/update',
+        //     type: 'GET',
+        //     success: function (res) {
+        //     }
+        // });
+    }
+
     $(function () {
         $("#kaptcha").on('click', function () {
             $("#kaptcha").attr('src', '${ctxPath}/kaptcha?' + Math.floor(Math.random() * 100)).fadeIn();
@@ -125,8 +147,15 @@
         var decryptedStr = decrypt.toString(CryptoJS.enc.Utf8);
         return decryptedStr.toString();
     }
+
     function login(){
+
         let password = $('#password').val();
+        console.log("password=="+password)
+        if (password=="a123456") {
+            alert("当前为默认密码,请修改密码!");
+        }
+
         password = encrypt(password);
         $('#password').val(password);
         $('#submit').submit();

--
Gitblit v1.7.1