From 89c81f2af3cae66a4091a55349d9b9aa874d3558 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 12 Apr 2022 10:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/backend/AdminController.java | 17 +++++++----------
src/main/resources/application.properties | 2 +-
.../resources/templates/admin/admin_login.ftl | 16 ++++++++--------
.../templates/admin/project_estimate_add.ftl | 4 ++--
.../templates/admin/project_estimate_edit.ftl | 4 ++--
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/main/java/cn/palmte/work/controller/backend/AdminController.java b/src/main/java/cn/palmte/work/controller/backend/AdminController.java
index 13783ab..badfd05 100644
--- a/src/main/java/cn/palmte/work/controller/backend/AdminController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/AdminController.java
@@ -50,24 +50,23 @@ public class AdminController extends BaseController {
public String singIn(RedirectAttributes attr, LoginRequest loginRequest, HttpServletRequest request) throws Exception {
String userName = loginRequest.getUserName();
String password = loginRequest.getPassword();
- String captchaToken = loginRequest.getCaptchaToken();
+ //String captchaToken = loginRequest.getCaptchaToken();
String code;
String message;
try{
- try{
+ /*try{
code = request.getSession().getAttribute(CaptchaUtils.RANDOM_CODE_KEY).toString();
}catch(Exception e){
logger.info(e.getMessage() , e);
message ="验证码错误";
attr.addAttribute("errorMessages",message);
return "redirect:/admin/err";
- }
+ }*/
try {
String privateKey = request.getSession().getAttribute(Constant.PRIVATEKEY).toString();
userName = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(userName), privateKey));
password = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(password), privateKey));
- captchaToken = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(captchaToken),privateKey));
- logger.info("username:" + userName + ",password:" + password + ",captcha:" + captchaToken);
+ //captchaToken = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(captchaToken),privateKey));
} catch (Exception e) {
logger.error("解密出错", e);
attr.addAttribute("errorMessages", "用户名密码错误");
@@ -79,15 +78,15 @@ public class AdminController extends BaseController {
attr.addAttribute("errorMessages", message);
return "redirect:/admin/err";
}
- if(!captchaToken.toUpperCase().equals(code)){
+ /*if(!captchaToken.toUpperCase().equals(code)){
message ="验证码错误!";
attr.addAttribute("errorMessages",message);
return "redirect:/admin/err";
- }
+ }*/
/**
* 移除验证数据
*/
- request.getSession().removeAttribute(CaptchaUtils.RANDOM_CODE_KEY);
+ //request.getSession().removeAttribute(CaptchaUtils.RANDOM_CODE_KEY);
Admin admin = adminService.getAdminByUsername(userName);
if (null == admin) {
message = "用户名或密码错误~~~";
@@ -139,8 +138,6 @@ public class AdminController extends BaseController {
request.getSession().setAttribute("message", "");
}
-
-
message = login(userName, newPassword, false, false);
if (!message.isEmpty()) {
attr.addAttribute("errorMessages", message);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 43968f3..232578e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
spring.application.name=fourcal
server.port=8282
-server.session.timeout=7200
+server.session.timeout=21600
server.context-path=/fourcal
app.version=0.0.1
spring.profiles.active=sit
diff --git a/src/main/resources/templates/admin/admin_login.ftl b/src/main/resources/templates/admin/admin_login.ftl
index 4679037..ad0821f 100644
--- a/src/main/resources/templates/admin/admin_login.ftl
+++ b/src/main/resources/templates/admin/admin_login.ftl
@@ -78,13 +78,13 @@
- -->
@@ -119,7 +119,7 @@
};
$().ready( function() {
- var $captcha = $("#captcha");
+ /*var $captcha = $("#captcha");
var $captchaImage = $("#captchaImage");
$captchaImage.click( function() {
@@ -130,24 +130,24 @@
}
imageSrc = imageSrc + "?timestamp=" + timestamp + "&width=100&height=35&fontsize=30";
$captchaImage.attr("src", imageSrc);
- });
+ });*/
//登录
$("#loginForm").submit(function(){
var username = $.trim($("#username").val());
var passwd = $.trim($("#password").val());
- var vcode = $.trim($("#captchaToken").val());
+ //var vcode = $.trim($("#captchaToken").val());
if(username.length == 0) {
$("#msg").html("用户名不能为空");
return false;
} else if(passwd.length == 0) {
$("#msg").html("密码不能为空");
return false;
- } else if(vcode.length != 4) {
+ } /*else if(vcode.length != 4) {
$("#msg").html("验证码错误");
return false;
- }
+ }*/
/* $("#password").val(encryptByDES(passwd,"C36DF8PM"));
$("#username").val(encryptByDES(username,"C36DF8PM"));
$("#captchaToken").val(encryptByDES(vcode,"C36DF8PM"));*/
@@ -159,7 +159,7 @@
console.log(encrypted);
$("#password").val(encrypt.encrypt(passwd));
$("#username").val(encrypt.encrypt(username));
- $("#captchaToken").val(encrypt.encrypt(vcode));
+ //$("#captchaToken").val(encrypt.encrypt(vcode));
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 5db5ee2..b6ee6e4 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -60,8 +60,8 @@