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

完成升级,兼容高密、低密级 加、解锁操作

parent fe69e3a3
...@@ -100,10 +100,16 @@ public class UserController implements IBaseController { ...@@ -100,10 +100,16 @@ public class UserController implements IBaseController {
} }
// 操作标记 // 操作标记
boolean lock = Objects.equals(Boolean.TRUE.toString(), act); boolean lock = Objects.equals(Boolean.TRUE.toString(), act);
Calendar now = Calendar.getInstance(); String header_key = request.getHeader(Constants.IPV4_LOCK.replace(":", ""));
int hour = now.get(Calendar.HOUR_OF_DAY); if(Objects.equals(Constants.CLEAR_LOCK_FOR_IPV4, header_key)){
boolean valid = Objects.equals(Constants.CLEAR_LOCK_FOR_IPV4_KEY+hour, key); return JsonResult.buildErrorStateResult("Are you a robot monkey?(^_^)", ValidationUtil.getMd5Key(lock));
// Todo -- boolean valid = ValidationUtil.isValid(key, lock); }
boolean valid = ValidationUtil.isValid(key, lock);
if(!valid){
Calendar now = Calendar.getInstance();
int hour = now.get(Calendar.HOUR_OF_DAY);
valid = Objects.equals(Constants.CLEAR_LOCK_FOR_IPV4_KEY+hour, key);
}
if(valid){ if(valid){
String lockIpv4Key = getLockIpv4Key(ip); String lockIpv4Key = getLockIpv4Key(ip);
if(lock){ if(lock){
......
...@@ -66,17 +66,16 @@ public class ValidationUtil { ...@@ -66,17 +66,16 @@ public class ValidationUtil {
* @return * @return
*/ */
public static boolean isValid(String key, boolean lock) { public static boolean isValid(String key, boolean lock) {
return Objects.equals(key, getMd5Key(key, lock)); return Objects.equals(key, getMd5Key(lock));
} }
/** /**
* 计算密令 * 计算密令
* 私钥 + 操作 + 时 * 私钥 + 操作 + 时
* @param key - Md5密令
* @param lock - true or false * @param lock - true or false
* @return 加密后的Md5 * @return 加密后的Md5
*/ */
public static String getMd5Key(String key, boolean lock) { public static String getMd5Key(boolean lock) {
Calendar today = Calendar.getInstance(); Calendar today = Calendar.getInstance();
int hour_24 = today.get(Calendar.HOUR_OF_DAY); int hour_24 = today.get(Calendar.HOUR_OF_DAY);
StringBuilder _key = new StringBuilder(); StringBuilder _key = new StringBuilder();
......
package user;
import cn.quantgroup.xyqb.util.ValidationUtil;
public class TestValidUtil {
public static void main(String[] args) {
String key = ValidationUtil.getMd5Key("123", true);
System.out.println(key);
}
}
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