--no commit message

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/mapper/supervise/SuperviseMapper.java

+package com.zrqx.fg.member.mapper.supervise;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.member.supervise.Supervise;
+
+@Mapper
+public interface SuperviseMapper extends BaseMapper<Supervise>{
+
+}

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

@@ -21,10 +21,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 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.MemberTypeEnum;
 import com.zrqx.core.enums.member.permissions.SecretSecurityQuestionEnum;
 import com.zrqx.core.enums.member.school.SchoolAuditStatusEnum;
 import com.zrqx.core.enums.sysuser.member.MemberStatusEnum;
@@ -35,16 +34,18 @@ import com.zrqx.core.form.member.fg.permissions.FgUpdatePasswordForm;
 import com.zrqx.core.form.member.fg.permissions.LoginForm;
 import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
 import com.zrqx.core.form.member.fg.permissions.MemberSecretSecurityForm;
+import com.zrqx.core.model.member.distributor.Distributor;
 import com.zrqx.core.model.member.member.Member;
 import com.zrqx.core.model.member.member.MemberSecretSecurity;
+import com.zrqx.core.model.member.press.Press;
 import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.model.member.student.Student;
+import com.zrqx.core.model.member.supervise.Supervise;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.datatype.UUIDUtil;
 import com.zrqx.core.util.datatype.VerifyUtil;
 import com.zrqx.core.util.encry.MD5Util;
 import com.zrqx.core.util.ip.CusAccessObjectUtil;
-import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.fg.member.FgMemberVo;
 import com.zrqx.core.vo.member.fg.permissions.AccountCheckVo;
 import com.zrqx.core.vo.member.permissions.QuestionVo;
@@ -53,7 +54,12 @@ import com.zrqx.fg.member.manage.permissions.FgMemberLoginLogManage;
 import com.zrqx.fg.member.manage.permissions.FgMemberSecretSecurityManage;
 import com.zrqx.fg.member.mapper.member.FgMemberMapper;
 import com.zrqx.fg.member.mapper.permissions.FgMemberSecretSecurityMapper;
+import com.zrqx.fg.member.mapper.press.FgPressMapper;
 import com.zrqx.fg.member.mapper.school.FgSchoolMapper;
+import com.zrqx.fg.member.mapper.supervise.SuperviseMapper;
+import com.zrqx.fg.member.mapper.supplier.SupplierMapper;
+
+import sun.misc.BASE64Encoder;
 
 @Service
 public class FgPermissionsServiceImpl  implements FgPermissionsService {
@@ -76,6 +82,21 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 	@Autowired
 	private FgSchoolMapper fgSchoolMapper;
 	
+	@Autowired
+	private FgMemberMapper memberMapper;
+	
+	@Autowired
+	private FgSchoolMapper schoolMapper;
+	
+	@Autowired
+	private FgPressMapper pressMapper;
+	
+	@Autowired
+	private SupplierMapper distributorMapper;
+	
+	@Autowired
+	private SuperviseMapper superviseMapper;
+	
 	@Override
 	public String getErrorCount(String account, HttpServletRequest request) {
 		String ip = CusAccessObjectUtil.getIpAddress(request);
@@ -105,14 +126,13 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		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);
 		
 		// 验证码
 		if (redisCode == null || (!form.getCode().toLowerCase().equals(redisCode.toLowerCase()))) {
-			fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "验证码错误");
+			fgMemberLoginLogManage.save(str1, account, form.getType(), 0, "验证码错误");
 			redis.delete(form.getUuid());
 			throw new BusinessValidateException("验证码错误");
 		}
@@ -144,7 +164,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			if(!MemberStatusEnum.OPEN.getCode().equals(String.valueOf(member.getStatus()))){
 				logger.info("账号（" + account + "）被禁用");
 				redis.delete(form.getUuid());
-				fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "账号禁用");
+				fgMemberLoginLogManage.save(str1, account, form.getType(), 0, "账号禁用");
 				throw new BusinessValidateException("账号禁用，请联系管理员");
 			}
 			
@@ -165,7 +185,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, account, form.getType(), 0, "密码错误");
 				throw new BusinessValidateException("账号或密码错误");
 			}
 			
@@ -198,7 +218,8 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			redis.delete(key);
 			redis.delete(form.getUuid());
 			logger.info("账号（" + account + "）成功登录");
-			fgMemberLoginLogManage.save(member.getId() , str1, form.getAccount(), form.getType(), 1, "成功登录");
+			String name = this.fmtMember(member.getId());
+			fgMemberLoginLogManage.save(member.getId() , str1, name, form.getType(), 1, "成功登录");
 			
 			
 		}else if(student != null){
@@ -225,11 +246,12 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			redis.delete(key);
 			redis.delete(form.getUuid());
 			logger.info("账号（" + account + "）成功登录");
-			fgMemberLoginLogManage.save(student.getId() , str1, form.getAccount(), form.getType(), 1, "成功登录");
+			String name = this.fmtMember(student.getId());
+			fgMemberLoginLogManage.save(student.getId() , str1, name, form.getType(), 1, "成功登录");
 		}else{
 			logger.info("账号（" + account + "）不存在");
 			redis.delete(form.getUuid());
-			fgMemberLoginLogManage.save(str1, form.getAccount(), form.getType(), 0, "账号不存在");
+			fgMemberLoginLogManage.save(str1, account, form.getType(), 0, "账号不存在");
 			throw new BusinessValidateException("账号不存在");
 		}
 		
@@ -289,6 +311,33 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		fgMemberLoginLogManage.save(member.getId() , ip, form.getAccount(), form.getType(), 1, "成功登录");*/
 		/*return info;*/
 	}
+	
+	
+	public String fmtMember(Integer memberId) {
+		String name = "";//机构名称
+		Member member = memberMapper.selectByPrimaryKey(memberId);
+		if(member != null) {
+			if(MemberTypeEnum.SCHOOL.getCode().equals(member.getType())) {//学校
+				School school = schoolMapper.selectByPrimaryKey(member.getRelationId());
+				name = school.getName();
+			}
+			if(MemberTypeEnum.PUBLISHER.getCode().equals(member.getType())) {
+				Press press = pressMapper.selectByPrimaryKey(member.getRelationId());
+				name = press.getName();
+			}
+			if(MemberTypeEnum.BUSNESS.getCode().equals(member.getType())) {
+				Distributor distributor = distributorMapper.selectByPrimaryKey(member.getRelationId());
+				name = distributor.getName();
+			}
+			if(MemberTypeEnum.SUPERVISE.getCode().equals(member.getType())) {
+				Supervise supervise = superviseMapper.selectByPrimaryKey(member.getRelationId());
+				name = supervise.getUserName();
+			}
+			return name + "\n" + member.getName();
+		}
+		return null;
+		
+	}
 
 	@Override
 	public Map<String, String> code() {