修改 版本号

Author: linzhijun

csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest_dateTime.cs

@@ -35,6 +35,14 @@ public void DATEVALUE_Test()
             // chinese time
             dt = engine.TryEvaluate("DATEVALUE('1691234899',0)", DateTime.Now);
             Assert.AreEqual(dt, new DateTime(2023, 8, 5, 19, 28, 19));
+
+            // chinese time
+            dt = engine.TryEvaluate("DATEVALUE('1691234899000')", DateTime.Now);
+            Assert.AreEqual(dt, new DateTime(2023, 8, 5, 19, 28, 19));
+
+            // chinese time
+            dt = engine.TryEvaluate("DATEVALUE('1691234899')", DateTime.Now);
+            Assert.AreEqual(dt, new DateTime(2023, 8, 5, 19, 28, 19));
         }
         [Test]
         public void TIMESTAMP_Test()

csharp/ToolGood.Algorithm2/ToolGood.Algorithm2.csproj

@@ -20,7 +20,7 @@
     <Product>ToolGood.Algorithm</Product>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <SignAssembly>true</SignAssembly>
-    <Version>3.4.0.5</Version>
+    <Version>3.4.1</Version>
     <AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\ToolGood.Algorithm.xml</DocumentationFile>

csharp/ToolGood.Algorithm2/math/mathLexer.cs

@@ -28,7 +28,6 @@
 using DFA = Antlr4.Runtime.Dfa.DFA;
 
 [System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.0")]
-[System.CLSCompliant(false)]
  partial class mathLexer : Lexer {
 	protected static DFA[] decisionToDFA;
 	protected static PredictionContextCache sharedContextCache = new PredictionContextCache();

csharp/ToolGood.Algorithm2/math/mathParser.cs

@@ -6,7 +6,7 @@
 
   <groupId>io.github.toolgood</groupId>
   <artifactId>toolgood-algorithm</artifactId>
-  <version>3.4.0.5</version>
+  <version>3.4.1.0</version>
   <packaging>jar</packaging>
 
   <name>toolgood.algorithm</name>

csharp/ToolGood.Algorithm2/math/mathVisitor.cs

@@ -36,6 +36,14 @@ public void DATEVALUE_Test()
         // chinese time
         dt = engine.TryEvaluate("DATEVALUE('1691234899',0)", DateTime.now());
         assertEquals(dt, new DateTime(2023, 8, 5, 19, 28, 19,DateTimeZone.getDefault()));
+
+        // chinese time
+        dt = engine.TryEvaluate("DATEVALUE('1691234899000')", DateTime.now());
+        assertEquals(dt, new DateTime(2023, 8, 5, 19, 28, 19,DateTimeZone.getDefault()));
+
+        // chinese time
+        dt = engine.TryEvaluate("DATEVALUE('1691234899')", DateTime.now());
+        assertEquals(dt, new DateTime(2023, 8, 5, 19, 28, 19,DateTimeZone.getDefault()));
     }
 
     @Test

java/toolgood.algorithm/pom.xml

@@ -48,7 +48,7 @@ static void Main(string[] args)
 		ENDSWITH=228, ISNULLOREMPTY=229, ISNULLORWHITESPACE=230, REMOVESTART=231, 
 		REMOVEEND=232, JSON=233, VLOOKUP=234, LOOKUP=235, ARRAY=236, ADDYEARS=237, 
 		ADDMONTHS=238, ADDDAYS=239, ADDHOURS=240, ADDMINUTES=241, ADDSECONDS=242, 
-		PARAMETER=243, PARAMETER2=244, WS=245, COMMENT=246, LINE_COMMENT=247;
+		TIMESTAMP=243, PARAMETER=244, PARAMETER2=245, WS=246, COMMENT=247, LINE_COMMENT=248;
 
 RULE_prog=0, RULE_expr=1, RULE_parameter2=2;
 ";
@@ -59,7 +59,7 @@ static void Main(string[] args)
                 dict[sp[0].Trim()] = sp[1].Trim();
             }
 
-            var filePath = Path.GetFullPath(@"..\..\..\..\..\..\g4\bin\mathParser.cs");
+            var filePath = Path.GetFullPath(@"..\..\..\..\..\g4\bin\mathParser.cs");
             //var filePath = Path.GetFullPath(@"..\..\..\..\..\..\csharp\ToolGood.Algorithm2\math\mathParser.cs");
             var csText = File.ReadAllText(filePath);