diff --git a/Doc/统一认证服务接入系统集成开发手册V2.0.doc b/Doc/11、统一认证服务接入系统集成开发手册V2.0.doc similarity index 100% rename from Doc/统一认证服务接入系统集成开发手册V2.0.doc rename to Doc/11、统一认证服务接入系统集成开发手册V2.0.doc diff --git a/Doc/统一认证的流程示意图.vsdx b/Doc/12、统一认证的流程示意图.vsdx similarity index 100% rename from Doc/统一认证的流程示意图.vsdx rename to Doc/12、统一认证的流程示意图.vsdx diff --git a/dsSso/WebRoot/html/login.html b/dsSso/WebRoot/html/login.html index a8e787aa..8480c639 100644 --- a/dsSso/WebRoot/html/login.html +++ b/dsSso/WebRoot/html/login.html @@ -50,9 +50,11 @@ - 点击图片刷新校验码 - 换一张 + 换一张
@@ -84,29 +86,11 @@ } return ""; } - window.checkYzm=function(){ - //通过阅读cookie中的error_count是否存在，是否大于3来决定是否显示验证码 - if (getCookie("error_count") == "" || parseInt(getCookie("error_count")) < 3) { - //隐藏掉验证码 - $("#captchaTxt").val("1234"); - $("#yzm").hide(); - }else{ - $("#yzm").show(); - $("#captchaTxt").val(""); - } - } - checkYzm(); - - $("#smsLoginBtn").click(function () { - var smsFlag = $("#smsFlagHidden").val(); - var smsCode = $("#smsCode").val(); - var phonenum = $("#phoneTxt").val(); - smsLogin(smsFlag, smsCode, phonenum); - }); + $("#yzm").show(); + $("#captchaTxt").val(""); //获取页面信息，包括系统名称，版权信息 getPageInfo(); - }); $(document).keydown(function (event) { @@ -347,6 +331,7 @@ } }); } + // 找回密码 $("#findPwd").click(function () { window.open('./pwdfind/pwdfind.html'); diff --git a/dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java b/dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java index c6a1b8e5..995826a8 100644 --- a/dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java @@ -12,7 +12,6 @@ import javax.servlet.http.HttpSession; import com.dsideal.Sso.Interceptor.EmptyInterface; import com.dsideal.Sso.Model.LoginModel; import com.dsideal.Sso.Util.*; -import com.dsideal.SsoApplication; import com.jfinal.aop.Before; import com.jfinal.ext.interceptor.GET; import com.jfinal.ext.interceptor.POST; @@ -57,30 +56,23 @@ public class WebLoginController extends Controller { HttpServletResponse response = getResponse(); JSONObject resultJson = new JSONObject(); String requestCaptcha = captcha.toLowerCase(); - //看看系统中是不是存在着cookie,记录本机尝试登录的失败次数 - int error_count = 0; - if (getCookie("error_count") != null) { - error_count = Integer.parseInt(getCookie("error_count")); + // 获取真实验证码 + if (getRequest().getSession().getAttribute("captcha") == null) { + resultJson.put("success", false); + resultJson.put("msg", "验证码错误！"); + renderJson(resultJson); + return; } - //如果大于3次 - if (error_count >= 3) { - // 获取真实验证码 - if (getRequest().getSession().getAttribute("captcha") == null) { - resultJson.put("success", false); - resultJson.put("msg", "验证码错误！"); - renderJson(resultJson); - return; - } - String realCaptcha = getRequest().getSession().getAttribute("captcha").toString().toLowerCase(); + String realCaptcha = getRequest().getSession().getAttribute("captcha").toString().toLowerCase(); - if (StringUtils.isBlank(requestCaptcha) || !realCaptcha.equals(requestCaptcha)) { - resultJson.put("success", false); - resultJson.put("msg", "验证码错误！"); - renderJson(resultJson); - return; - } + if (StringUtils.isBlank(requestCaptcha) || !realCaptcha.equals(requestCaptcha)) { + resultJson.put("success", false); + resultJson.put("msg", "验证码错误！"); + renderJson(resultJson); + return; } + try { password = AesUtil.aesDecrypt(password); } catch (Exception e) { @@ -99,12 +91,6 @@ public class WebLoginController extends Controller { && !password.equals("DsideaL4r5t6y7u")) { resultJson.put("success", false); resultJson.put("msg", "账户或密码错误！"); - //增加一次失败次数 - if (getCookie("error_count") != null) { - setCookie("error_count", String.valueOf(Integer.parseInt(getCookie("error_count")) + 1), -1); - } else { - setCookie("error_count", "1", -1); - } renderJson(resultJson); return; } @@ -112,8 +98,6 @@ public class WebLoginController extends Controller { SsoLoginHelper.login(response, sessionId, loginMap); resultJson.put("success", true); resultJson.put("sessionId", sessionId); - //清除cookie - setCookie("error_count", "1", 0); // 记录人员登录日志 LoginLogUtil.WriteLoginLog(loginMap.get("identity_id"), loginMap.get("person_id"), LoginLogUtil.getIpAddr(getRequest())); renderJson(resultJson); diff --git a/dsSso/src/main/java/com/dsideal/Sso/Model/LoginModel.java b/dsSso/src/main/java/com/dsideal/Sso/Model/LoginModel.java index 0e6d6f81..12136e40 100644 --- a/dsSso/src/main/java/com/dsideal/Sso/Model/LoginModel.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Model/LoginModel.java @@ -68,5 +68,4 @@ public class LoginModel { } return result; } - } diff --git a/dsSso/src/main/java/Plugin/LogBackLog.java b/dsSso/src/main/java/com/dsideal/Sso/Plugin/LogBackLog.java similarity index 98% rename from dsSso/src/main/java/Plugin/LogBackLog.java rename to dsSso/src/main/java/com/dsideal/Sso/Plugin/LogBackLog.java index 480c7f5d..6c573984 100644 --- a/dsSso/src/main/java/Plugin/LogBackLog.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Plugin/LogBackLog.java @@ -1,4 +1,4 @@ -package Plugin; +package com.dsideal.Sso.Plugin; import com.jfinal.log.Log; import org.slf4j.Logger; diff --git a/dsSso/src/main/java/Plugin/LogBackLogFactory.java b/dsSso/src/main/java/com/dsideal/Sso/Plugin/LogBackLogFactory.java similarity index 90% rename from dsSso/src/main/java/Plugin/LogBackLogFactory.java rename to dsSso/src/main/java/com/dsideal/Sso/Plugin/LogBackLogFactory.java index 2f9fd1e4..d58acf90 100644 --- a/dsSso/src/main/java/Plugin/LogBackLogFactory.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Plugin/LogBackLogFactory.java @@ -1,4 +1,4 @@ -package Plugin; +package com.dsideal.Sso.Plugin; import com.jfinal.log.ILogFactory; import com.jfinal.log.Log; diff --git a/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java b/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java index d3c42a25..20c06969 100644 --- a/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.dsideal.SsoApplication; -import com.jfinal.kit.PropKit; public class SsoLoginHelper { diff --git a/dsSso/src/main/java/com/dsideal/SsoApplication.java b/dsSso/src/main/java/com/dsideal/SsoApplication.java index e0ee4872..79d0b02a 100644 --- a/dsSso/src/main/java/com/dsideal/SsoApplication.java +++ b/dsSso/src/main/java/com/dsideal/SsoApplication.java @@ -1,6 +1,6 @@ package com.dsideal; -import Plugin.LogBackLogFactory; +import com.dsideal.Sso.Plugin.LogBackLogFactory; import cn.hutool.core.io.FileUtil; import com.dsideal.Sso.Interceptor.EmptyInterceptor; import com.dsideal.Sso.Util.YamlProp; @@ -8,7 +8,6 @@ import com.jfinal.config.*; import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; -import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.druid.DruidPlugin; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.server.undertow.UndertowServer; diff --git a/dsSso/target/classes/application_pro.yaml b/dsSso/target/classes/application_pro.yaml index 21a76b79..b5219132 100644 --- a/dsSso/target/classes/application_pro.yaml +++ b/dsSso/target/classes/application_pro.yaml @@ -13,9 +13,8 @@ redis: sso: sessionid: ds_sso_sessionid -log: - # 记录登录日志的范围 - loginLogIdentity: 1,2,3,4,5,6,7 +# 可以登录的身份 +loginLogIdentity: 1,2,3,4,5,6,7 password: # MysqlAES加密解密的密码