v1.2.2 修正2016年国庆节数据；删除5月23日世界读书日；修复v1.2.0和v1.2.1的重大bug。

6tail · May 23, 2021 · dffee26 · dffee26
1 parent 5a5b0da
commit dffee26
Show file tree

Hide file tree

Showing 14 changed files with 250 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
 </dependency>
 ```
 

diff --git a/README_EN.md b/README_EN.md
@@ -12,7 +12,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <url>https://github.com/6tail/lunar-java</url>
     <description>a calendar library for Solar and Chinese Lunar</description>

diff --git a/src/main/java/com/nlf/calendar/JieQi.java b/src/main/java/com/nlf/calendar/JieQi.java
@@ -1,7 +1,5 @@
 package com.nlf.calendar;
 
-import com.nlf.calendar.util.LunarUtil;
-
 /**
  * 节气
  *
@@ -48,15 +46,13 @@ public String getName() {
    */
   public void setName(String name) {
     this.name = name;
-    for(String key: LunarUtil.JIE){
-      if(key.equals(name)){
-        this.jie = true;
-        return;
-      }
-    }
-    for(String key: LunarUtil.QI){
-      if(key.equals(name)){
-        this.qi = true;
+    for(int i=0,j=Lunar.JIE_QI.length;i<j;i++){
+      if(name.equals(Lunar.JIE_QI[i])){
+        if(i%2==0){
+          this.qi = true;
+        }else{
+          this.jie = true;
+        }
         return;
       }
     }