--no commit message

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

@@ -90,7 +90,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		
 		// 验证码
 		if (redisCode == null || (!form.getCode().toLowerCase().equals(redisCode.toLowerCase()))) {
-			fgMemberLoginLogManage.save(form.getAccount(), ip, form.getType(), 0, "验证码错误");
+			fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "验证码错误");
 			redis.delete(form.getUuid());
 			throw new BusinessValidateException("验证码错误");
 		}
@@ -109,7 +109,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		if(member == null){
 			logger.info("账号（" + account + "）不存在");
 			redis.delete(form.getUuid());
-			fgMemberLoginLogManage.save(form.getAccount(), ip, form.getType(), 0, "账号不存在");
+			fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "账号不存在");
 			throw new BusinessValidateException("账号不存在");
 		}
 		
@@ -117,7 +117,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		if(!MemberStatusEnum.OPEN.getCode().equals(String.valueOf(member.getStatus()))){
 			logger.info("账号（" + account + "）被禁用");
 			redis.delete(form.getUuid());
-			fgMemberLoginLogManage.save(form.getAccount(), ip, form.getType(), 0, "账号禁用");
+			fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "账号禁用");
 			throw new BusinessValidateException("账号禁用，请联系管理员");
 		}
 		
@@ -138,7 +138,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			redis.set(key,errorCount, 60 * 5);
 			redis.delete(form.getUuid());
 			logger.info("账号（" + account + "）密码错误");
-			fgMemberLoginLogManage.save(form.getAccount(), ip, form.getType(), 0, "密码错误");
+			fgMemberLoginLogManage.save(ip, form.getAccount(), form.getType(), 0, "密码错误");
 			throw new BusinessValidateException("账号或密码错误");
 		}
 		LoginMemberInfo	info = fgMemberManage.getMemberInfo(member);
@@ -154,7 +154,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		redis.delete(key);
 		redis.delete(form.getUuid());
 		logger.info("账号（" + account + "）成功登录");
-		fgMemberLoginLogManage.save(member.getId() ,form.getAccount(), ip, form.getType(), 1, "成功登录");
+		fgMemberLoginLogManage.save(member.getId() , ip, form.getAccount(), form.getType(), 1, "成功登录");
 		return info;
 	}