diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/AppLoginController.java b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/AppLoginController.java index 5529818..83f8775 100644 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/AppLoginController.java +++ b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/AppLoginController.java @@ -3,7 +3,6 @@ package com.dsideal.sso.server.controller; import java.util.Map; import java.util.UUID; -import com.dsideal.sso.server.core.util.LoginLogUtil; import org.apache.commons.lang3.StringUtils; import com.alibaba.fastjson.JSONObject; @@ -56,14 +55,8 @@ public class AppLoginController extends Controller { resultJson.put("personName", loginMap.get("person_name").toString()); resultJson.put("bureauId", loginMap.get("bureau_id").toString()); resultJson.put("identityId", loginMap.get("identity_id").toString()); - - //记录人员登录日志 - LoginLogUtil.WriteLoginLog(loginMap.get("identity_id").toString(), loginMap.get("person_id").toString(), 2, LoginLogUtil.getIpAddr(getRequest())); - renderJson(resultJson); - - } catch (Exception e) { resultJson.put("success", false); resultJson.put("msg", "登录异常!"); @@ -101,7 +94,6 @@ public class AppLoginController extends Controller { resultJson.put("mainPersonId", Login.dao.getMainAccountPersonIdByPersonId(loginMap.get("person_id").toString())); } } - } else { resultJson.put("success", false); resultJson.put("msg", "sessionId 已失效!"); @@ -119,5 +111,4 @@ public class AppLoginController extends Controller { String sessionId = getPara("sessionId"); SsoLoginHelper.logout(sessionId); } - } diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/ThirdLoginController.java b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/ThirdLoginController.java index 9508330..f794ad9 100644 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/ThirdLoginController.java +++ b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/ThirdLoginController.java @@ -21,36 +21,27 @@ public class ThirdLoginController extends Controller { public void qqLogin() { HttpServletResponse response = getResponse(); JSONObject resultJson = new JSONObject(); - try { - String qqCode = getPara("code"); - String QqOpenId = ThirdUtil.getQqOpenId(qqCode); - Map loginMap = Login.dao.getLoginInfoByQqOpenId(QqOpenId); - if (loginMap == null) { - resultJson.put("success", false); - resultJson.put("openid", QqOpenId); - resultJson.put("msg", "需要绑定用户!"); - renderJson(resultJson); - return; - } - - String sessionId = UUID.randomUUID().toString(); - loginMap.put("login_type", "1"); - SsoLoginHelper.login(response, sessionId, loginMap); - - resultJson.put("success", true); - resultJson.put("sessionId", sessionId); - resultJson.put("personId", loginMap.get("person_id").toString()); - resultJson.put("personName", loginMap.get("person_name").toString()); - - //记录人员登录日志 - LoginLogUtil.WriteLoginLog(loginMap.get("identity_id").toString(), loginMap.get("person_id").toString(), 3, LoginLogUtil.getIpAddr(getRequest())); - - renderJson(resultJson); - } catch (Exception e) { + String qqCode = getPara("code"); + String QqOpenId = ThirdUtil.getQqOpenId(qqCode); + Map loginMap = Login.dao.getLoginInfoByQqOpenId(QqOpenId); + if (loginMap == null) { resultJson.put("success", false); - resultJson.put("msg", "登录异常,请重试!"); + resultJson.put("openid", QqOpenId); + resultJson.put("msg", "需要绑定用户!"); renderJson(resultJson); + return; } + + String sessionId = UUID.randomUUID().toString(); + loginMap.put("login_type", "1"); + SsoLoginHelper.login(response, sessionId, loginMap); + + resultJson.put("success", true); + resultJson.put("sessionId", sessionId); + resultJson.put("personId", loginMap.get("person_id").toString()); + resultJson.put("personName", loginMap.get("person_name").toString()); + + renderJson(resultJson); } /** @@ -59,31 +50,26 @@ public class ThirdLoginController extends Controller { public void wxLogin() { HttpServletResponse response = getResponse(); JSONObject resultJson = new JSONObject(); - try { - String wxCode = getPara("code"); - String wxOpenId = ThirdUtil.getWxOpenId(wxCode); - Map loginMap = Login.dao.getLoginInfoByWxOpenId(wxOpenId); - if (loginMap == null) { - resultJson.put("success", false); - resultJson.put("openid", wxOpenId); - resultJson.put("msg", "需要绑定用户!"); - renderJson(resultJson); - return; - } - String sessionId = UUID.randomUUID().toString(); - loginMap.put("login_type", "1"); - SsoLoginHelper.login(response, sessionId, loginMap); - resultJson.put("success", true); - resultJson.put("sessionId", sessionId); - resultJson.put("personId", loginMap.get("person_id").toString()); - resultJson.put("personName", loginMap.get("person_name").toString()); - renderJson(resultJson); - } catch (Exception e) { + String wxCode = getPara("code"); + String wxOpenId = ThirdUtil.getWxOpenId(wxCode); + Map loginMap = Login.dao.getLoginInfoByWxOpenId(wxOpenId); + if (loginMap == null) { resultJson.put("success", false); - resultJson.put("msg", "登录异常,请重试!"); + resultJson.put("openid", wxOpenId); + resultJson.put("msg", "需要绑定用户!"); renderJson(resultJson); + return; } + String sessionId = UUID.randomUUID().toString(); + loginMap.put("login_type", "1"); + SsoLoginHelper.login(response, sessionId, loginMap); + + resultJson.put("success", true); + resultJson.put("sessionId", sessionId); + resultJson.put("personId", loginMap.get("person_id").toString()); + resultJson.put("personName", loginMap.get("person_name").toString()); + renderJson(resultJson); } /** diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java index ae0f598..d455227 100644 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java +++ b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java @@ -107,9 +107,6 @@ public class WebLoginController extends Controller { SsoLoginHelper.login(response, sessionId, loginMap); resultJson.put("success", true); resultJson.put("sessionId", sessionId); - // 记录人员登录日志 - LoginLogUtil.WriteLoginLog(loginMap.get("identity_id").toString(), loginMap.get("person_id").toString(), 1, - LoginLogUtil.getIpAddr(getRequest())); renderJson(resultJson); } @@ -310,13 +307,7 @@ public class WebLoginController extends Controller { resultJson.put("success", true); resultJson.put("sessionId", sessionId); resultJson.put("identity_id", loginMap.get("identity_id").toString()); - - // 记录人员登录日志 - LoginLogUtil.WriteLoginLog(loginMap.get("identity_id").toString(), loginMap.get("person_id").toString(), 1, - LoginLogUtil.getIpAddr(getRequest())); - renderJson(resultJson); - } else { resultJson.put("success", false); resultJson.put("msg", "获取数据异常!"); diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/CommonUtil.java b/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/CommonUtil.java index 7d4664c..72e9dcd 100644 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/CommonUtil.java +++ b/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/CommonUtil.java @@ -38,7 +38,7 @@ public class CommonUtil { */ public static Map urlSplit(String strUrlParam) { Map mapRequest = new HashMap<>(); - String[] arrSplit = null; + String[] arrSplit; arrSplit = strUrlParam.split("[&]"); for (String strSplit : arrSplit) { String[] arrSplitEqual = null; @@ -54,34 +54,6 @@ public class CommonUtil { return mapRequest; } - /** - * 将一个Map转为Map - * - * @param mapValueStr - * @return - */ - public static Map MapValueStringToObject(Map mapValueStr) { - Map mapValueObj = new HashMap<>(); - for (Map.Entry entry : mapValueStr.entrySet()) { - mapValueObj.put(entry.getKey(), entry.getValue()); - } - return mapValueObj; - } - - /** - * 将一个Map转为Map - * - * @param mapValueObj - * @return - */ - public static Map MapValueObjectToString(Map mapValueObj) { - Map mapValueStr = new HashMap<>(); - for (Map.Entry entry : mapValueObj.entrySet()) { - mapValueStr.put(entry.getKey(), entry.getValue().toString()); - } - return mapValueStr; - } - /** * 获取6位随机数 * @@ -150,7 +122,6 @@ public class CommonUtil { * @return */ public static boolean getIsEmailLegal(String eMail) { - boolean flag = false; try { String regExp = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$"; Pattern p = Pattern.compile(regExp); @@ -288,7 +259,7 @@ public class CommonUtil { private static Map URLRequest(String URL) { Map mapRequest = new HashMap(); - String[] arrSplit = null; + String[] arrSplit; String strUrlParam = TruncateUrlPage(URL); if (strUrlParam == null) { @@ -317,10 +288,8 @@ public class CommonUtil { private static String TruncateUrlPage(String strURL) { String strAllParam = null; - String[] arrSplit = null; - + String[] arrSplit; strURL = strURL.trim(); - arrSplit = strURL.split("[?]"); if (strURL.length() > 1) { if (arrSplit.length > 1) { @@ -329,9 +298,6 @@ public class CommonUtil { } } } - return strAllParam; } - - } diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/LoginLogUtil.java b/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/LoginLogUtil.java deleted file mode 100644 index 275ae1a..0000000 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/core/util/LoginLogUtil.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.dsideal.sso.server.core.util; - -import com.jfinal.kit.PropKit; -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; - -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - -public class LoginLogUtil { - - public static Map map=new HashMap<>(); - /** - * 功能:记录用户登录日志 - * 作者:黄海 - * 时间: 2018-12-20 - * @param identity_id - * @param person_id - * @param type_id - */ - public static void WriteLoginLog(String identity_id,String person_id,int type_id,String ip) - { - //如果没有读取过配置文件,那么第一次读取进来 - if(map.size()==0) - { - //记录哪些身份的登录日志 - String loginLogIdentity=PropKit.get("loginLogIdentity"); - String[] loginLogIdentityIds=loginLogIdentity.split(","); - - for(int i=0;i