diff --git a/pom.xml b/pom.xml index 11147f7..c74436d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,14 @@ redbbs 1.0-SNAPSHOT + src org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 1.8 + 1.8 diff --git a/src/com/lxyer/bbs/base/TaskQueue.java b/src/com/lxyer/bbs/base/TaskQueue.java index cb891db..fa3e8e0 100644 --- a/src/com/lxyer/bbs/base/TaskQueue.java +++ b/src/com/lxyer/bbs/base/TaskQueue.java @@ -24,6 +24,7 @@ import org.redkale.source.Flipper; import org.redkale.util.AnyValue; import org.redkale.util.Comment; import org.redkale.util.Sheet; +import org.redkale.util.Utility; import javax.annotation.Resource; import java.util.*; @@ -138,7 +139,7 @@ public class TaskQueue extends BaseService implements Runnable " sort total desc\n" + " limit 10\n" + " return {name: uri,total:total}", - Map.of("time", cal.getTimeInMillis()), + Utility.ofMap("time", cal.getTimeInMillis()), Count.class); Function, List> deal = (counts) -> { diff --git a/src/com/lxyer/bbs/base/user/UserRecord.java b/src/com/lxyer/bbs/base/user/UserRecord.java index 9189eba..95c0dc2 100644 --- a/src/com/lxyer/bbs/base/user/UserRecord.java +++ b/src/com/lxyer/bbs/base/user/UserRecord.java @@ -225,17 +225,6 @@ public class UserRecord implements java.io.Serializable { } public static String md5IfNeed(String password){ - if (password == null || password.isEmpty()) return ""; - if (password.length() == 32) return password; - MessageDigest md5 = null; - try { - md5 = MessageDigest.getInstance("MD5"); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - - byte[] bytes = password.trim().getBytes(); - bytes = md5.digest(bytes); - return new String(Utility.binToHex(bytes)); + return Utility.md5Hex(password); } }