up

RockyLOMO · Jul 5, 2024 · a35cdf7 · a35cdf7
1 parent 5b55ecf
commit a35cdf7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/rxlib/src/main/java/org/rx/core/Reflects.java b/rxlib/src/main/java/org/rx/core/Reflects.java
@@ -88,7 +88,7 @@ Class<?> stackClass(int depth) {
  registerConvert(Number.class, Decimal.class, (sv, tt) -> Decimal.valueOf(sv.doubleValue()));
  registerConvert(NEnum.class, Integer.class, (sv, tt) -> sv.getValue());
  registerConvert(Long.class, Date.class, (sv, tt) -> new Date(sv));
- registerConvert(Long.class, DateTime.class, (sv, tt) -> new DateTime(sv));
+ registerConvert(Long.class, DateTime.class, (sv, tt) -> new DateTime(sv, TimeZone.getDefault()));
  registerConvert(Date.class, Long.class, (sv, tt) -> sv.getTime());
  registerConvert(Date.class, DateTime.class, (sv, tt) -> DateTime.of(sv));
  registerConvert(String.class, BigDecimal.class, (sv, tt) -> new BigDecimal(sv));

diff --git a/rxlib/src/test/java/org/rx/bean/TestBean.java b/rxlib/src/test/java/org/rx/bean/TestBean.java
@@ -15,6 +15,7 @@
 import java.time.Month;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.concurrent.CountDownLatch;
 
 import static org.rx.core.Extends.eq;
@@ -182,8 +183,8 @@ public void decimal() {
  public void dateTime() {
  DateTime now = DateTime.now();
  DateTime utc = DateTime.utcNow();
- DateTime d = new DateTime(2010, Month.AUGUST, 24, 11, 12, 13);
- DateTime d3 = new DateTime(2010, Month.AUGUST, 23, 11, 12, 13);
+ DateTime d = new DateTime(2010, Month.AUGUST, 24, 11, 12, 13, TimeZone.getDefault());
+ DateTime d3 = new DateTime(2010, Month.AUGUST, 23, 11, 12, 13, TimeZone.getDefault());
 
  assert now.getTime() == utc.getTime();
  assert d.getYear() == 2010;
@@ -212,7 +213,7 @@ public void dateTime() {
  assert nd.getDayOfWeek() == DayOfWeek.WEDNESDAY;
  log.info("{} nextDayOfWeek {}", nd, nd.nextDayOfWeek());
  log.info("{} lastDayOfMonth {}", nd, nd.lastDayOfMonth());
- log.info("{} isToday {}", nd, nd.isToday());
+// log.info("{} isToday {}", nd, nd.isToday());
  }
 
  @Test

diff --git a/rxlib/src/test/java/org/rx/core/TestAgent.java b/rxlib/src/test/java/org/rx/core/TestAgent.java
@@ -32,6 +32,7 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
@@ -72,7 +73,7 @@ public void agentTime2() {
  static void ntp() {
  long ts = System.currentTimeMillis();
  System.out.println(ts);
- System.out.println(new DateTime(ts));
+ System.out.println(new DateTime(ts, TimeZone.getDefault()));
 
  //inject
  NtpClock.transform();
@@ -81,7 +82,7 @@ static void ntp() {
  System.out.println(ts);
  ts = NtpClock.UTC.millis();
  System.out.println(ts);
- System.out.println(new DateTime(ts));
+ System.out.println(new DateTime(ts, TimeZone.getDefault()));
  }
 
  static void fjp() throws Throwable {