Merge remote-tracking branch 'origin/master'

README.md

@@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.23</version>
+  <version>1.2.25</version>
 </dependency>
 ```
 

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.23</version>
+  <version>1.2.25</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.23</version>
+    <version>1.2.25</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>
@@ -48,6 +48,7 @@
         <sourceEncoding>UTF-8</sourceEncoding>
         <source-version>1.5</source-version>
         <target-version>1.5</target-version>
+        <creator>6tail</creator>
         <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
         <maven-surefire-plugin-version>2.5</maven-surefire-plugin-version>
         <maven-javadoc-plugin-version>2.9</maven-javadoc-plugin-version>
@@ -60,7 +61,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -154,6 +155,12 @@
                     <descriptors>
                         <descriptor>${basedir}/src/assembly/assembly.xml</descriptor>
                     </descriptors>
+                    <archive>
+                        <manifestEntries>
+                            <Created-By>${creator}</Created-By>
+                            <Built-By>${creator}</Built-By>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/com/nlf/calendar/Lunar.java

@@ -183,6 +183,9 @@ public class Lunar {
     this.second = second;
     Solar noon = Solar.fromJulianDay(m.getFirstJulianDay() + lunarDay - 1);
     this.solar = Solar.fromYmdHms(noon.getYear(), noon.getMonth(), noon.getDay(), hour, minute, second);
+    if (noon.getYear() != lunarYear) {
+      y = LunarYear.fromYear(noon.getYear());
+    }
     compute(y);
   }
 

src/main/java/com/nlf/calendar/util/HolidayUtil.java

@@ -17,6 +17,8 @@ public class HolidayUtil {
   private static final int SIZE = 18;
   /** 0 */
   private static final char ZERO = '0';
+  /** 删除标识 */
+  private static final String TAG_REMOVE = "~";
   /** 默认节假日名称（元旦0，春节1，清明2，劳动3，端午4，中秋5，国庆6，国庆中秋7，抗战胜利日8） */
   public static final String[] NAMES = {"元旦节","春节","清明节","劳动节","端午节","中秋节","国庆节","国庆中秋","抗战胜利日"};
   /** 默认节假日数据，日期YYYYMMDD+名称下标+是否调休+对应节日YYYYMMDD */
@@ -188,35 +190,38 @@ public class HolidayUtil {
    * @param data 需要修正或追加的节假日数据，每18位表示1天依次排列，格式：当天年月日YYYYMMDD(8位)+节假日名称下标(1位)+调休标识(1位)+节假日当天YYYYMMDD(8位)。例：202005023120200501代表2020-05-02为劳动节放假，对应节假日为2020-05-01
    */
   public static void fix(String[] names, String data){
-    if(null!=names){
+    if(null != names){
       NAMES_IN_USE = names;
     }
-    if(null==data){
+    if(null == data){
       return;
     }
     StringBuilder append = new StringBuilder();
-    while(data.length()>=SIZE){
-      String segment = data.substring(0,SIZE);
-      String day = segment.substring(0,8);
+    while(data.length() >= SIZE){
+      String segment = data.substring(0, SIZE);
+      String day = segment.substring(0, 8);
+      boolean remove = TAG_REMOVE.equals(segment.substring(8, 9));
       Holiday holiday = getHoliday(day);
-      if(null==holiday){
-        append.append(segment);
+      if(null == holiday){
+        if (!remove) {
+          append.append(segment);
+        }
       }else{
         int nameIndex = -1;
-        for(int i=0,j=NAMES_IN_USE.length;i<j;i++){
+        for(int i = 0,j = NAMES_IN_USE.length; i < j; i++){
           if(NAMES_IN_USE[i].equals(holiday.getName())){
             nameIndex = i;
             break;
           }
         }
         if(nameIndex>-1) {
-          String old = day+(char)(nameIndex+ZERO)+(holiday.isWork()?ZERO:'1')+holiday.getTarget().replace("-","");
-          DATA_IN_USE = DATA_IN_USE.replace(old, segment);
+          String old = day + (char)(nameIndex + ZERO) + (holiday.isWork() ? ZERO : '1') + holiday.getTarget().replace("-","");
+          DATA_IN_USE = DATA_IN_USE.replace(old, remove ? "" : segment);
         }
       }
       data = data.substring(SIZE);
     }
-    if(append.length()>0){
+    if(append.length() > 0){
       DATA_IN_USE += append.toString();
     }
   }

src/test/java/test/BaZiTest.java

@@ -276,4 +276,23 @@ public class BaZiTest {
     Assert.assertEquals("1990-04-15", lunar.getEightChar().getYun(1).getStartSolar().toYmd());
   }
 
+  @Test
+  public void test10(){
+    Lunar lunar = Solar.fromYmdHms(1988, 2, 15, 23, 30, 0).getLunar();
+    EightChar eightChar = lunar.getEightChar();
+    Assert.assertEquals("年柱", "戊辰", eightChar.getYear());
+    Assert.assertEquals("月柱", "甲寅", eightChar.getMonth());
+    Assert.assertEquals("日柱", "庚子", eightChar.getDay());
+    Assert.assertEquals("时柱", "戊子", eightChar.getTime());
+  }
+
+  @Test
+  public void test11(){
+    Lunar lunar = Lunar.fromYmdHms(1987, 12, 28, 23, 30, 0);
+    EightChar eightChar = lunar.getEightChar();
+    Assert.assertEquals("年柱", "戊辰", eightChar.getYear());
+    Assert.assertEquals("月柱", "甲寅", eightChar.getMonth());
+    Assert.assertEquals("日柱", "庚子", eightChar.getDay());
+    Assert.assertEquals("时柱", "戊子", eightChar.getTime());
+  }
 }

src/test/java/test/HolidayTest.java

@@ -94,8 +94,11 @@ public class HolidayTest {
     Assert.assertEquals("2020-01-01 春节 2020-01-01", HolidayUtil.getHoliday("2020-01-01") + "");
     Assert.assertEquals("2099-01-01 元旦节 2099-01-01", HolidayUtil.getHoliday("2099-01-01") + "");
 
-    // 更改节假日名称
-    String[] names = HolidayUtil.NAMES;
+    // 自定义节假日名称
+    String[] names = new String[HolidayUtil.NAMES.length];
+    for (int i = 0, j = HolidayUtil.NAMES.length; i < j; i++) {
+      names[i] = HolidayUtil.NAMES[i];
+    }
     names[0] = "元旦";
     names[1] = "大年初一";
 
@@ -125,4 +128,17 @@ public class HolidayTest {
     Assert.assertNotNull(holiday.getTarget());
     Assert.assertEquals("2016-10-01",holiday.getTarget());
   }
+
+  @Test
+  public void testRemove() {
+    // 设置默认的节假日名称
+    HolidayUtil.fix(HolidayUtil.NAMES, null);
+    Holiday holiday = HolidayUtil.getHoliday(2010,1,1);
+    Assert.assertNotNull(holiday);
+    Assert.assertEquals("元旦节",holiday.getName());
+
+    HolidayUtil.fix("20100101~000000000000000000000000000");
+    holiday = HolidayUtil.getHoliday(2010,1,1);
+    Assert.assertNull(holiday);
+  }
 }

src/test/java/test/JieQiTest.java

@@ -183,7 +183,7 @@ public class JieQiTest {
   @Test
   public void test8() {
     Lunar lunar = Lunar.fromYmd(2050, 12, 1);
-    Assert.assertEquals("2050-12-07 06:41:00", lunar.getJieQiTable().get("大雪").toYmdHms());
+    Assert.assertEquals("2050-12-07 06:41:00", lunar.getJieQiTable().get("DA_XUE").toYmdHms());
   }
 
   @Test