--no commit message

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/service/permissions/FgPermissionsServiceImpl.java

@@ -3,6 +3,7 @@ package com.zrqx.fg.member.service.permissions;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import sun.misc.BASE64Encoder;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.member.permissions.SecretSecurityQuestionEnum;
 import com.zrqx.core.enums.member.school.SchoolAuditStatusEnum;
@@ -93,6 +95,17 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		
 		String account = form.getAccount();
 		String redisCode = redis.get(form.getUuid());
+		//根据IP获取省市区
+		String address = "";
+		try {
+			address = CusAccessObjectUtil.getAddresses("","utf-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		JSONObject object = JSONObject.parseObject(address);
+		String str1 = object.getString("regionName") + object.getString("city");
+		
+		
 		String ip = CusAccessObjectUtil.getIpAddress(request);
 		String key = ip + account;
 		String errorCount = redis.get(key) == null ? "0" : redis.get(key);
@@ -185,7 +198,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			redis.delete(key);
 			redis.delete(form.getUuid());
 			logger.info("账号（" + account + "）成功登录");
-			fgMemberLoginLogManage.save(member.getId() , ip, form.getAccount(), form.getType(), 1, "成功登录");
+			fgMemberLoginLogManage.save(member.getId() , str1, form.getAccount(), form.getType(), 1, "成功登录");
 			
 			
 		}else if(student != null){
@@ -196,7 +209,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 				redis.set(key,errorCount, 60 * 5);
 				redis.delete(form.getUuid());
 				logger.info("账号（" + account + "）密码错误");
-				fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "密码错误");
+				fgMemberLoginLogManage.save(str1, form.getAccount(), form.getType(), 0, "密码错误");
 				throw new BusinessValidateException("账号或密码错误");
 			}
 			
@@ -212,11 +225,11 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			redis.delete(key);
 			redis.delete(form.getUuid());
 			logger.info("账号（" + account + "）成功登录");
-			fgMemberLoginLogManage.save(student.getId() , ip, form.getAccount(), form.getType(), 1, "成功登录");
+			fgMemberLoginLogManage.save(student.getId() , str1, form.getAccount(), form.getType(), 1, "成功登录");
 		}else{
 			logger.info("账号（" + account + "）不存在");
 			redis.delete(form.getUuid());
-			fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "账号不存在");
+			fgMemberLoginLogManage.save(str1, form.getAccount(), form.getType(), 0, "账号不存在");
 			throw new BusinessValidateException("账号不存在");
 		}