Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-31 c743f4413a00fc063bbbd9d851b6d0c3fff10581

 cloud-server-management/src/main/webapp/WEB-INF/view/login.html

@@ -70,15 +70,15 @@
                <img src="${ctxPath}/img/password.png" />
                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入密码" required="" value="">
            </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="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>-->
            <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>