Merge pull request #9550 from thingsboard/fix_bug_tbDate_now_11

[fix bug][master]_tbDate_now()

common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java

@@ -218,10 +218,9 @@ public class TbDate implements Serializable, Cloneable {
         return opt;
     }
 
-    public long now() {
+    public static long now() {
         return Instant.now().toEpochMilli();
     }
-
     public long parseSecond() {
         return instant.getEpochSecond();
     }

common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java

@@ -21,6 +21,8 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.data.Offset;
 import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -28,8 +30,8 @@ import org.mvel2.ConversionException;
 import org.thingsboard.common.util.JacksonUtil;
 
 import java.time.DateTimeException;
+import java.time.Instant;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -764,6 +766,11 @@ class TbDateTest {
         Assert.assertEquals("22:15:30 Eastern Standard Time", d1.toTimeString("UTC", "America/New_York"));
     }
 
+    @Test
+    public void testNow() {
+        Assertions.assertThat(TbDate.now()).isCloseTo(Instant.now().toEpochMilli(), Offset.offset(1000L));
+    }
+
     private void testResultChangeDateTime(TbDate d) {
         int localOffset = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds();
         TbDateTestEntity tbDateTestEntity = new TbDateTestEntity(d.getFullYear(), d.getMonth(), d.getDate(), (d.getHours() - (localOffset/60/60)));