diff --git a/net/src/main/java/com/zfoo/net/packet/common/Message.java b/net/src/main/java/com/zfoo/net/packet/common/Message.java index a553267a..5f4e7340 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/Message.java +++ b/net/src/main/java/com/zfoo/net/packet/common/Message.java @@ -27,7 +27,7 @@ public class Message implements IPacket { public static final transient short PROTOCOL_ID = 100; public static final Message SUCCESS = valueSuccess(null); - public static final Message FAIL = valueSuccess(null); + public static final Message FAIL = valueFail(null); private byte module; @@ -58,12 +58,6 @@ public class Message implements IPacket { return Message.valueOf(packet, code, null); } - public static Message valueOf(String message) { - var mess = new Message(); - mess.message = message; - return mess; - } - public static Message valueFail(String message) { var mess = new Message(); mess.code = 0; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java b/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java index 825edee4..0bf7cf07 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java +++ b/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java @@ -17,6 +17,7 @@ import com.zfoo.protocol.IPacket; import java.util.concurrent.ConcurrentNavigableMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.atomic.AtomicLong; +import java.util.function.BiConsumer; /** * @author jaysunxiao @@ -67,4 +68,9 @@ public class ConcurrentHeapMap implements LpMap { public long getIncrementIndex() { return maxIndexAtomic.incrementAndGet(); } + + @Override + public void forEach(BiConsumer biConsumer) { + map.forEach(biConsumer); + } } diff --git a/scheduler/src/main/java/com/zfoo/scheduler/util/TimeUtils.java b/scheduler/src/main/java/com/zfoo/scheduler/util/TimeUtils.java index 903f901f..8a5326f8 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/util/TimeUtils.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/util/TimeUtils.java @@ -198,6 +198,10 @@ public abstract class TimeUtils { return DATE_FORMAT_FOR_DAY.get().format(new Date(time)); } + public static String dateFormatForDayTimeString(long time) { + return DATE_FORMAT.get().format(new Date(time)); + } + /** * 判断两个日期是否是同一周,设置周一为一周的第一天 *