Commit 37533248 authored by 技术部-任文超's avatar 技术部-任文超

重构方法

parent 1094ea89
...@@ -118,7 +118,7 @@ public class UserController implements IBaseController { ...@@ -118,7 +118,7 @@ public class UserController implements IBaseController {
String header_key = request.getHeader(Constants.CLEAR_LOCK_FOR_IPV4); String header_key = request.getHeader(Constants.CLEAR_LOCK_FOR_IPV4);
byte[] buf = Base64.decodeBase64(header_key); byte[] buf = Base64.decodeBase64(header_key);
header_key = new String(buf, Charset.forName("UTF-8")); header_key = new String(buf, Charset.forName("UTF-8"));
boolean valid = isValid(header_key, lock); boolean valid = ValidationUtil.isValid(header_key, lock);
if(valid){ if(valid){
String lockIpv4Key = getLockIpv4Key(ip); String lockIpv4Key = getLockIpv4Key(ip);
stringRedisTemplate.delete(lockIpv4Key); stringRedisTemplate.delete(lockIpv4Key);
...@@ -129,21 +129,6 @@ public class UserController implements IBaseController { ...@@ -129,21 +129,6 @@ public class UserController implements IBaseController {
return JsonResult.buildErrorStateResult("Are you a robot monkey?(^_^)",null); return JsonResult.buildErrorStateResult("Are you a robot monkey?(^_^)",null);
} }
/**
* 验证密令
* 私钥 + 操作 + 时
* @param key - Md5密令
* @param lock - true or false
* @return
*/
private boolean isValid(String key, boolean lock) {
Calendar today = Calendar.getInstance();
int hour_24 = today.get(Calendar.HOUR_OF_DAY);
StringBuilder _key = new StringBuilder();
_key.append(Constants.CLEAR_LOCK_FOR_IPV4_KEY).append(lock).append(hour_24);
return Objects.equals(key, MD5Util.build(_key.toString()));
}
@RequestMapping("/login/fast") @RequestMapping("/login/fast")
public JsonResult loginFast( public JsonResult loginFast(
@RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel, @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
......
package cn.quantgroup.xyqb.util; package cn.quantgroup.xyqb.util;
import cn.quantgroup.xyqb.Constants; import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.util.encrypt.MD5Util;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.util.Calendar; import java.util.Calendar;
import java.util.Objects;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -56,6 +58,21 @@ public class ValidationUtil { ...@@ -56,6 +58,21 @@ public class ValidationUtil {
return matcher.find(); return matcher.find();
} }
/**
* 验证密令
* 私钥 + 操作 + 时
* @param key - Md5密令
* @param lock - true or false
* @return
*/
public static boolean isValid(String key, boolean lock) {
Calendar today = Calendar.getInstance();
int hour_24 = today.get(Calendar.HOUR_OF_DAY);
StringBuilder _key = new StringBuilder();
_key.append(Constants.CLEAR_LOCK_FOR_IPV4_KEY).append(lock).append(hour_24);
return Objects.equals(key, MD5Util.build(_key.toString()));
}
public static boolean isAtDangerousTime() { public static boolean isAtDangerousTime() {
Calendar now = Calendar.getInstance(); Calendar now = Calendar.getInstance();
int hour = now.get(Calendar.HOUR_OF_DAY); int hour = now.get(Calendar.HOUR_OF_DAY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment