v0.0.9 表达式引擎优化

wycst · Nov 20, 2022 · e17e758 · e17e758
1 parent b3630a6
commit e17e758
Show file tree

Hide file tree

Showing 57 changed files with 7,094 additions and 2,048 deletions.
diff --git a/README.md b/README.md
@@ -17,20 +17,20 @@
 <dependency>
     <groupId>io.github.wycst</groupId>
     <artifactId>wast</artifactId>
-    <version>0.0.8</version>
+    <version>0.0.9</version>
 </dependency>
 ```
 
 ## Groovy
 
 ```
-implementation 'io.github.wycst:wast:0.0.8'
+implementation 'io.github.wycst:wast:0.0.9'
 ```
 
 ## Kotlin
 
 ```
-implementation("io.github.wycst:wast:0.0.8")
+implementation("io.github.wycst:wast:0.0.9")
 ```
 
 ## json模块

diff --git a/pom.xml b/pom.xml
@@ -5,8 +5,8 @@
 
     <groupId>io.github.wycst</groupId>
     <artifactId>wast</artifactId>
-    <version>0.0.8</version>
-    <!--    <version>0.0.8-SNAPSHOT</version>-->
+    <version>0.0.9</version>
+    <!--    <version>0.0.10-SNAPSHOT</version>-->
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <description>java framework and tool lib </description>
@@ -129,7 +129,15 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.82.Final</version>
+            <version>4.1.85.Final</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.29.2-GA</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/src/main/java/io/github/wycst/wast/WastVersion.java b/src/main/java/io/github/wycst/wast/WastVersion.java
@@ -0,0 +1,12 @@
+package io.github.wycst.wast;
+
+/**
+ * @Author: wangy
+ * @Date: 2022/11/20 10:12
+ * @Description:
+ */
+public interface WastVersion {
+
+    public static String FLAG = "0.0.9";
+
+}
diff --git a/src/main/java/io/github/wycst/wast/common/beans/Date.java b/src/main/java/io/github/wycst/wast/common/beans/Date.java
@@ -377,52 +377,33 @@ public String format() {
      * @return
      */
     public String format(char dateSyntax, char timeSyntax) {
-        StringBuilder buff = new StringBuilder();
-
+        StringBuilder buff = new StringBuilder(19);
         int year = this.year;
         if (year < 0) {
             buff.append("-");
             year = -year;
         }
-        if (year < 10) {
-            buff.append("000");
-        } else if (year < 100) {
-            buff.append("00");
-        } else if (year < 1000) {
-            buff.append("0");
-        }
-        buff.append(year);
-
-        if (month > 0) {
-            buff.append(dateSyntax);
-            if (month < 10) {
-                buff.append(0);
-            }
-            buff.append(month);
-        }
-
-        if (dayOfMonth > 0) {
-            buff.append(dateSyntax);
-            if (dayOfMonth < 10) {
-                buff.append(0);
-            }
-            buff.append(dayOfMonth);
-        }
-
+        int y1 = year / 100;
+        int y2 = year % 100;
+        buff.append(DateTemplate.DigitTens[y1]);
+        buff.append(DateTemplate.DigitOnes[y1]);
+        buff.append(DateTemplate.DigitTens[y2]);
+        buff.append(DateTemplate.DigitOnes[y2]);
+        buff.append(dateSyntax);
+        buff.append(DateTemplate.DigitTens[month]);
+        buff.append(DateTemplate.DigitOnes[month]);
+        buff.append(dateSyntax);
+        buff.append(DateTemplate.DigitTens[dayOfMonth]);
+        buff.append(DateTemplate.DigitOnes[dayOfMonth]);
         buff.append(' ');
-        if (hourOfDay < 10) {
-            buff.append(0);
-        }
-        buff.append(hourOfDay).append(timeSyntax);
-        if (minute < 10) {
-            buff.append(0);
-        }
-        buff.append(minute).append(timeSyntax);
-        if (second < 10) {
-            buff.append(0);
-        }
-        buff.append(second);
-
+        buff.append(DateTemplate.DigitTens[hourOfDay]);
+        buff.append(DateTemplate.DigitOnes[hourOfDay]);
+        buff.append(timeSyntax);
+        buff.append(DateTemplate.DigitTens[minute]);
+        buff.append(DateTemplate.DigitOnes[minute]);
+        buff.append(timeSyntax);
+        buff.append(DateTemplate.DigitTens[second]);
+        buff.append(DateTemplate.DigitOnes[second]);
         return buff.toString();
     }
 
@@ -463,7 +444,7 @@ public int compareTo(Date o) {
     }
 
     public static void main(String[] args) {
-
+        System.out.println(new Date().format("YYYY/~MM/pdd HH:mm:ss"));
         // Time_1991_09_15_00_00_00
         System.out.println(new Date(2199, 12, 31, 0, 0, 0, 0).timeMills);
         GeneralDate date = null;