修复单元测试

entropy-cloud · Jan 3, 2024 · f78bc30 · f78bc30
1 parent 42ef296
commit f78bc30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/nop-commons/src/main/java/io/nop/commons/crypto/HashHelper.java b/nop-commons/src/main/java/io/nop/commons/crypto/HashHelper.java
@@ -161,7 +161,7 @@ public static int murmur3_32(String str) {
     }
 
     public static IHash64Function<String> murmur3_64_string() {
-        HashFunction h = Hashing.murmur3_32();
+        HashFunction h = Hashing.murmur3_128();
         return str -> {
             return h.hashString(str, StringHelper.CHARSET_UTF8).asLong();
         };

diff --git a/nop-ooxml/nop-ooxml-xlsx/src/test/resources/io/nop/ooxml/xlsx/parse/format-demo.txt b/nop-ooxml/nop-ooxml-xlsx/src/test/resources/io/nop/ooxml/xlsx/parse/format-demo.txt
@@ -1,5 +1,5 @@
 1:[0]44563       |[1]333         |[2]ABCDEFG...
-2:[0]44563.8...
+2:[0]2022-01...
 3:[0]sss1        |[1]2           |[2]3
 4:[0]4           |[1]5           |[2]6
 5:

diff --git a/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/seq/SysSequenceGenerator.java b/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/seq/SysSequenceGenerator.java
@@ -98,7 +98,7 @@ public void removeCache(String cacheKey) {
         cache.remove(cacheKey);
     }
 
-    @InjectValue("@cfg:nop.sys.seq.snowflake-worker-id:0")
+    @InjectValue("@cfg:nop.sys.seq.snowflake-worker-id|0")
     public void setSnowflakeWorkerId(long snowflakeWorkerId) {
         this.workerId = snowflakeWorkerId;
     }
@@ -120,7 +120,7 @@ public void afterPropertiesSet() {
             String hostId = CFG_HOST_ID.get();
             if (StringHelper.isEmpty(hostId))
                 hostId = NetHelper.findLocalIp();
-            workerId = HashHelper.murmur3_64_string().hash64(hostId);
+            workerId = HashHelper.murmur3_32(hostId) % 1024;
         }
         this.snowflakeGenerator = new SnowflakeSequenceGeneator(workerId);
     }

diff --git a/nop-sys/nop-sys-service/src/test/java/io/nop/sys/service/TestCodeRule.java b/nop-sys/nop-sys-service/src/test/java/io/nop/sys/service/TestCodeRule.java
@@ -16,10 +16,11 @@
 import io.nop.sys.dao.entity.NopSysCodeRule;
 import io.nop.sys.dao.entity.NopSysNoticeTemplate;
 import io.nop.xlang.api.XLang;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
-import jakarta.inject.Inject;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -51,6 +52,7 @@ public void testCodeRule() {
         entity.setName("abc");
         scope.setLocalValue("entity", entity);
         String code = codeRuleGenerator.generate("test", scope);
-        assertEquals("D2023abc001", code);
+        int year = LocalDate.now().getYear();
+        assertEquals("D" + year + "abc001", code);
     }
 }