From 92520a0ffe8de2eadcf912fe4bdf03bb116acd4a Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期一, 25 五月 2020 15:52:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/AuthController.java | 7 +++++++
src/main/java/com/zy/common/entity/Parameter.java | 10 ++++++++++
src/main/webapp/views/login.html | 27 ++++++++++++++++++++-------
src/main/java/com/zy/system/controller/ConfigController.java | 2 ++
4 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 29e1226..e290983 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -49,4 +49,14 @@
return instance;
}
+ // 楠岃瘉鐮佸紑鍏�
+ private String codeSwitch;
+
+ public String getCodeSwitch() {
+ return codeSwitch;
+ }
+
+ public void setCodeSwitch(String codeSwitch) {
+ this.codeSwitch = codeSwitch;
+ }
}
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 7963e9c..4563cc5 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.zy.common.CodeRes;
+import com.zy.common.entity.Parameter;
import com.zy.common.model.PowerDto;
import com.zy.common.model.enums.HtmlNavIconType;
import com.zy.common.utils.RandomValidateCodeUtil;
@@ -79,10 +80,16 @@
return R.ok(res);
}
+ @RequestMapping("/code/switch.action")
+ public R code() {
+ return R.ok().add(Parameter.get().getCodeSwitch());
+ }
+
@RequestMapping("/code.action")
public void code(@RequestParam String sd, HttpServletResponse response) {
RandomValidateCodeUtil.getRandcode(sd, response);
}
+
@RequestMapping("/code.do")
public String codeDo(@RequestParam String sd) throws Exception {
String code = null;
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index d13caec..9b847be 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -70,6 +70,7 @@
configService.insert(config);
} else {
configService.updateById(config);
+ Parameter.reset();
}
return R.ok();
}
@@ -98,6 +99,7 @@
}
}
configService.updateById(config);
+ Parameter.reset();
return R.ok();
}
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index c61e906..ddcefa8 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -115,7 +115,7 @@
<label class="layui-icon layui-icon-password layadmin-user-login-icon"></label>
<input id="password" class="layui-input" type="password" name="password" lay-verify="password" placeholder="瀵嗙爜">
</div>
- <div id="code-box" class="layui-form-item">
+ <div id="code-box" class="layui-form-item" style="">
<label id="code-label" class="layui-icon layui-icon-vercode layadmin-user-login-icon"></label>
<input id="code" class="layui-input" type="text" name="password" lay-verify="code" placeholder="楠岃瘉鐮�">
<img id="codeImg" title="鐪嬩笉娓咃紵鐐瑰嚮鎹竴寮犮��">
@@ -135,7 +135,24 @@
<script type="text/javascript" src="../static/js/tools/md5.js"></script>
<script type="text/javascript">
+ // 楠岃瘉鐮佸紑鍏�
+ var codeSwitch = 'Y';
+ $.ajax({
+ url: baseUrl+"/code/switch.action",
+ async: false,
+ success: function (res) {
+ codeSwitch = res.data;
+ if (codeSwitch === 'N'){
+ $('#code-box').css("display", "none");
+ }
+ }
+ });
+
// 鍒濆鍖栭獙璇佺爜
+ initCode();
+ $('#codeImg').click(function () {
+ initCode();
+ });
function initCode() {
var random = Math.random();
$('#codeImg').attr("src", baseUrl+"/code.action?sd="+random);
@@ -151,10 +168,6 @@
});
}, 100);
}
- initCode();
- $('#codeImg').click(function () {
- initCode();
- });
layui.use(['form','layer'],function () {
var form = layui.form,
@@ -173,11 +186,11 @@
return;
}
var code = $("#code").val();
- if (code === "") {
+ if (code === "" && codeSwitch === 'Y') {
layer.msg("璇疯緭鍏ラ獙璇佺爜", {offset: '150px'});
return;
}
- if (sessionStorage.getItem("code").toUpperCase() !== code.toUpperCase()){
+ if (sessionStorage.getItem("code").toUpperCase() !== code.toUpperCase()&&codeSwitch==='Y'){
layer.msg("楠岃瘉鐮侀敊璇�", {offset: '150px'});
return;
}
--
Gitblit v1.9.1