huanghai
/
FengHuang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 2 years ago
parent e4f53430a6
commit 1435ee76c1
12 changed files with 37 additions and 200 deletions
Show Stats Download Patch File Download Diff File

9
dsssoserver/src/main/java/com/dsideal/sso/server/controller/AppLoginController.java
Unescape View File

@ -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);
}
}

16
dsssoserver/src/main/java/com/dsideal/sso/server/controller/ThirdLoginController.java
Unescape View File

@ -21,7 +21,6 @@ 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);
@ -42,16 +41,8 @@ public class ThirdLoginController extends Controller {
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) {
resultJson.put("success", false);
resultJson.put("msg", "登录异常，请重试！");
renderJson(resultJson);
}
}
/**
* 微信登录
@ -59,7 +50,7 @@ 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);
@ -79,11 +70,6 @@ public class ThirdLoginController extends Controller {
resultJson.put("personId", loginMap.get("person_id").toString());
resultJson.put("personName", loginMap.get("person_name").toString());
renderJson(resultJson);
} catch (Exception e) {
resultJson.put("success", false);
resultJson.put("msg", "登录异常，请重试！");
renderJson(resultJson);
}
}
/**

9
dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java
Unescape View File

@ -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", "获取数据异常！");

40
dsssoserver/src/main/java/com/dsideal/sso/server/core/util/CommonUtil.java
Unescape View File

@ -38,7 +38,7 @@ public class CommonUtil {
*/
public static Map<String, String> urlSplit(String strUrlParam) {
Map<String, String> 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<String, Object>转为Map<String, String>
*
* @param mapValueStr
* @return
*/
public static Map<String, Object> MapValueStringToObject(Map<String, String> mapValueStr) {
Map<String, Object> mapValueObj = new HashMap<>();
for (Map.Entry<String, String> entry : mapValueStr.entrySet()) {
mapValueObj.put(entry.getKey(), entry.getValue());
}
return mapValueObj;
}
/**
* 将一个Map<String, String>转为Map<String, Object>
*
* @param mapValueObj
* @return
*/
public static Map<String, String> MapValueObjectToString(Map<String, Object> mapValueObj) {
Map<String, String> mapValueStr = new HashMap<>();
for (Map.Entry<String, Object> 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<String, String> URLRequest(String URL) {
Map<String, String> mapRequest = new HashMap<String, String>();
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;
}
}

83
dsssoserver/src/main/java/com/dsideal/sso/server/core/util/LoginLogUtil.java
Unescape View File

@ -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<String,String> 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<loginLogIdentityIds.length;i++)
{
map.put(loginLogIdentityIds[i],"1");
}
}
//如果是需要处理的身份号
if(map.containsKey(identity_id))
{
Record record=new Record();
record.set("identity_id",identity_id);
record.set("person_id",person_id);
String sql=Db.getSql("login.getPersonInfoByPersonId");
Record personrecord=Db.find(sql,person_id).get(0);
record.set("person_name",personrecord.getStr("person_name"));
record.set("city_id",personrecord.getStr("city_id"));
record.set("area_id",personrecord.getStr("area_id"));
record.set("main_school_id",personrecord.getStr("main_school_id"));
record.set("bureau_id",personrecord.getStr("bureau_id"));
record.set("create_time",CommonUtil.GetCurrentTimeString());
record.set("ip_address",IpUtil.ipToLong(ip));
Db.save("t_sys_login_log",record);
}
}
/**
* 通过HttpServletRequest返回IP地址
*
* @param request
* HttpServletRequest
* @return ip String
* @throws Exception
*/
public static String getIpAddr(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
return ip;
}
}

7
dsssoserver/src/main/resources/config.properties
Unescape View File

@ -1,7 +0,0 @@
send_api = http://api.sendcloud.net/apiv2/mail/send
send_template_api = http://api.sendcloud.net/apiv2/mail/sendtemplate
send_sms_api = http://www.sendcloud.net/smsapi/send
send_voice_api = http://www.sendcloud.net/smsapi/sendVoice
api_user = dsideal
api_key = 3Q1pvn43iqt9S6ng

BIN
dsssoserver/target/classes/com/dsideal/sso/server/controller/AppLoginController.class
View File

Binary file not shown.

BIN
dsssoserver/target/classes/com/dsideal/sso/server/controller/ThirdLoginController.class
View File

Binary file not shown.

BIN
dsssoserver/target/classes/com/dsideal/sso/server/controller/WebLoginController.class
View File

Binary file not shown.

BIN
dsssoserver/target/classes/com/dsideal/sso/server/core/util/CommonUtil.class
View File

Binary file not shown.

BIN
dsssoserver/target/classes/com/dsideal/sso/server/core/util/LoginLogUtil.class
View File

Binary file not shown.

7
dsssoserver/target/classes/config.properties
Unescape View File

@ -1,7 +0,0 @@
send_api = http://api.sendcloud.net/apiv2/mail/send
send_template_api = http://api.sendcloud.net/apiv2/mail/sendtemplate
send_sms_api = http://www.sendcloud.net/smsapi/send
send_voice_api = http://www.sendcloud.net/smsapi/sendVoice
api_user = dsideal
api_key = 3Q1pvn43iqt9S6ng
Write Preview
Loading…
Cancel
Save