v1.2.5 修复公元0至4年转阴历错误的问题。

README.md

@@ -1,6 +1,6 @@
 # lunar [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/6tail/lunar-java/blob/master/LICENSE)
 
-lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道黑道日及吉凶、法定节假日及调休等。
+lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶、法定节假日及调休等。
 
 > 支持java 1.5及以上版本。
 
@@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.5</version>
 </dependency>
 ```
  
@@ -38,7 +38,7 @@ lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</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.2</version>
+  <version>1.2.5</version>
 </dependency>
 ```
  
@@ -34,7 +34,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.2</version>
+    <version>1.2.5</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>

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

@@ -2,6 +2,7 @@ package com.nlf.calendar;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * 精确日期
@@ -10,8 +11,13 @@ import java.util.Date;
  */
 public class ExactDate {
 
+  /**
+   * 时区
+   */
+  private static final TimeZone TIME_ZONE = TimeZone.getTimeZone("GMT+8");
+
   public static Calendar fromYmdHms(int year, int month, int day, int hour, int minute, int second) {
-    Calendar c = Calendar.getInstance();
+    Calendar c = Calendar.getInstance(TIME_ZONE);
     c.set(year, month - 1, day, hour, minute, second);
     c.set(Calendar.MILLISECOND, 0);
     return c;
@@ -22,7 +28,7 @@ public class ExactDate {
   }
 
   public static Calendar fromDate(Date date) {
-    Calendar c = Calendar.getInstance();
+    Calendar c = Calendar.getInstance(TIME_ZONE);
     c.setTime(date);
     c.set(Calendar.MILLISECOND, 0);
     return c;

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

@@ -22,7 +22,7 @@ public class Lunar {
   /**
    * 实际的节气表
    */
-  public static final String[] JIE_QI_IN_USE = {"DA_XUE", "冬至", "小寒", "大寒", "立春", "雨水", "惊蛰", "春分", "清明", "谷雨", "立夏", "小满", "芒种", "夏至", "小暑", "大暑", "立秋", "处暑", "白露", "秋分", "寒露", "霜降", "立冬", "小雪", "大雪", "DONG_ZHI", "XIAO_HAN", "DA_HAN", "LI_CHUN"};
+  public static final String[] JIE_QI_IN_USE = {"DA_XUE", "冬至", "小寒", "大寒", "立春", "雨水", "惊蛰", "春分", "清明", "谷雨", "立夏", "小满", "芒种", "夏至", "小暑", "大暑", "立秋", "处暑", "白露", "秋分", "寒露", "霜降", "立冬", "小雪", "大雪", "DONG_ZHI", "XIAO_HAN", "DA_HAN", "LI_CHUN", "YU_SHUI", "JING_ZHE"};
 
   /**
    * 农历年
@@ -242,6 +242,14 @@ public class Lunar {
     yearGanIndex = offset % 10;
     yearZhiIndex = offset % 12;
 
+    if (yearGanIndex < 0) {
+      yearGanIndex += 10;
+    }
+
+    if (yearZhiIndex < 0) {
+      yearZhiIndex += 12;
+    }
+
     //以立春作为新一年的开始的干支纪年
     int g = yearGanIndex;
     int z = yearZhiIndex;
@@ -298,12 +306,14 @@ public class Lunar {
   private void computeMonth() {
     Solar start = null;
     Solar end;
+    String ymd = solar.toYmd();
+    String time = solar.toYmdHms();
+    int size = JIE_QI_IN_USE.length;
 
     //序号：大雪以前-3，大雪到小寒之间-2，小寒到立春之间-1，立春之后0
     int index = -3;
-    for (int i=0,j=JIE_QI_IN_USE.length;i<j;i+=2) {
+    for (int i=0;i<size;i+=2) {
       end = jieQi.get(JIE_QI_IN_USE[i]);
-      String ymd = solar.toYmd();
       String symd = null == start ? ymd : start.toYmd();
       if (ymd.compareTo(symd) >= 0 && ymd.compareTo(end.toYmd()) < 0) {
         break;
@@ -313,27 +323,26 @@ public class Lunar {
     }
 
     //干偏移值（以立春当天起算）
-    int gOffset = (((yearGanIndexByLiChun+(index<0?1:0)) % 5 + 1) * 2) % 10;
-    monthGanIndex = ((index<0?index+10:index) + gOffset) % 10;
+    int offset = (((yearGanIndexByLiChun+(index<0?1:0)) % 5 + 1) * 2) % 10;
+    monthGanIndex = ((index<0?index+10:index) + offset) % 10;
     monthZhiIndex = ((index<0?index+12:index) + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12;
 
-    int indexExact = -3;
     start = null;
-    for (int i=0,j=JIE_QI_IN_USE.length;i<j;i+=2) {
+    index = -3;
+    for (int i=0;i<size;i+=2) {
       end = jieQi.get(JIE_QI_IN_USE[i]);
-      String time = solar.toYmdHms();
       String stime = null == start ? time : start.toYmdHms();
       if (time.compareTo(stime) >= 0 && time.compareTo(end.toYmdHms()) < 0) {
         break;
       }
       start = end;
-      indexExact++;
+      index++;
     }
 
     //干偏移值（以立春交接时刻起算）
-    int gOffsetExact = (((yearGanIndexExact+(indexExact<0?1:0)) % 5 + 1) * 2) % 10;
-    monthGanIndexExact = ((indexExact<0?indexExact+10:indexExact) + gOffsetExact) % 10;
-    monthZhiIndexExact = ((indexExact<0?indexExact+12:indexExact) + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12;
+    offset = (((yearGanIndexExact+(index<0?1:0)) % 5 + 1) * 2) % 10;
+    monthGanIndexExact = ((index<0?index+10:index) + offset) % 10;
+    monthZhiIndexExact = ((index<0?index+12:index) + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12;
   }
 
   /**
@@ -818,6 +827,10 @@ public class Lunar {
       jq = "立春";
     }else if("DA_XUE".equals(jq)){
       jq = "大雪";
+    } else if ("YU_SHUI".equals(jq)) {
+      jq = "雨水";
+    } else if ("JING_ZHE".equals(jq)) {
+      jq = "惊蛰";
     }
     return jq;
   }
@@ -829,14 +842,12 @@ public class Lunar {
    */
   public String getJie() {
     String jie = "";
-    for(int i=0,j=JIE_QI.length;i<j;i++){
+    for(int i=1,j=JIE_QI.length;i<j;i+=2){
       String key = JIE_QI[i];
       Solar d = jieQi.get(key);
       if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
-        if(i%2==1){
-          jie = key;
-          break;
-        }
+        jie = key;
+        break;
       }
     }
     return convertJieQi(jie);
@@ -849,14 +860,12 @@ public class Lunar {
    */
   public String getQi() {
     String qi = "";
-    for(int i=0,j=JIE_QI.length;i<j;i++){
+    for(int i=0,j=JIE_QI.length;i<j;i+=2){
       String key = JIE_QI[i];
       Solar d = jieQi.get(key);
       if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
-        if(i%2==0){
-          qi = key;
-          break;
-        }
+        qi = key;
+        break;
       }
     }
     return convertJieQi(qi);
@@ -954,6 +963,9 @@ public class Lunar {
     if (null != f) {
       l.add(f);
     }
+    if (Math.abs(month) == 12 && day >= 29 && year != next(1).getYear()) {
+      l.add("除夕");
+    }
     return l;
   }
 
@@ -2590,6 +2602,6 @@ public class Lunar {
     Calendar startCalendar = ExactDate.fromYmd(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay());
 
     int days = (int) ((currentCalendar.getTimeInMillis() - startCalendar.getTimeInMillis()) / MS_PER_DAY);
-    return LunarUtil.WU_HOU[offset * 3 + days / 5];
+    return LunarUtil.WU_HOU[(offset * 3 + days / 5) % LunarUtil.WU_HOU.length];
   }
 }

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

@@ -3,7 +3,9 @@ package com.nlf.calendar;
 import com.nlf.calendar.util.ShouXingUtil;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 农历年
@@ -12,6 +14,28 @@ import java.util.List;
  */
 public class LunarYear {
 
+  /**
+   * 闰冬月年份
+   */
+  private static final int[] LEAP_11 = {75, 94, 170, 238, 265, 322, 389, 469, 553, 583, 610, 678, 735, 754, 773, 849, 887, 936, 1050, 1069, 1126, 1145, 1164, 1183, 1259, 1278, 1308, 1373, 1403, 1441, 1460, 1498, 1555, 1593, 1612, 1631, 1642, 2033, 2128, 2147, 2242, 2614, 2728, 2910, 3062, 3244, 3339, 3616, 3711, 3730, 3825, 4007, 4159, 4197, 4322, 4341, 4379, 4417, 4531, 4599, 4694, 4713, 4789, 4808, 4971, 5085, 5104, 5161, 5180, 5199, 5294, 5305, 5476, 5677, 5696, 5772, 5791, 5848, 5886, 6049, 6068, 6144, 6163, 6258, 6402, 6440, 6497, 6516, 6630, 6641, 6660, 6679, 6736, 6774, 6850, 6869, 6899, 6918, 6994, 7013, 7032, 7051, 7070, 7089, 7108, 7127, 7146, 7222, 7271, 7290, 7309, 7366, 7385, 7404, 7442, 7461, 7480, 7491, 7499, 7594, 7624, 7643, 7662, 7681, 7719, 7738, 7814, 7863, 7882, 7901, 7939, 7958, 7977, 7996, 8034, 8053, 8072, 8091, 8121, 8159, 8186, 8216, 8235, 8254, 8273, 8311, 8330, 8341, 8349, 8368, 8444, 8463, 8474, 8493, 8531, 8569, 8588, 8626, 8664, 8683, 8694, 8702, 8713, 8721, 8751, 8789, 8808, 8816, 8827, 8846, 8884, 8903, 8922, 8941, 8971, 9036, 9066, 9085, 9104, 9123, 9142, 9161, 9180, 9199, 9218, 9256, 9294, 9313, 9324, 9343, 9362, 9381, 9419, 9438, 9476, 9514, 9533, 9544, 9552, 9563, 9571, 9582, 9601, 9639, 9658, 9666, 9677, 9696, 9734, 9753, 9772, 9791, 9802, 9821, 9886, 9897, 9916, 9935, 9954, 9973, 9992};
+  /**
+   * 闰腊月年份
+   */
+  private static final int[] LEAP_12 = {37, 56, 113, 132, 151, 189, 208, 227, 246, 284, 303, 341, 360, 379, 417, 436, 458, 477, 496, 515, 534, 572, 591, 629, 648, 667, 697, 716, 792, 811, 830, 868, 906, 925, 944, 963, 982, 1001, 1020, 1039, 1058, 1088, 1153, 1202, 1221, 1240, 1297, 1335, 1392, 1411, 1422, 1430, 1517, 1525, 1536, 1574, 3358, 3472, 3806, 3988, 4751, 4941, 5066, 5123, 5275, 5343, 5438, 5457, 5495, 5533, 5552, 5715, 5810, 5829, 5905, 5924, 6421, 6535, 6793, 6812, 6888, 6907, 7002, 7184, 7260, 7279, 7374, 7556, 7746, 7757, 7776, 7833, 7852, 7871, 7966, 8015, 8110, 8129, 8148, 8224, 8243, 8338, 8406, 8425, 8482, 8501, 8520, 8558, 8596, 8607, 8615, 8645, 8740, 8778, 8835, 8865, 8930, 8960, 8979, 8998, 9017, 9055, 9074, 9093, 9112, 9150, 9188, 9237, 9275, 9332, 9351, 9370, 9408, 9427, 9446, 9457, 9465, 9495, 9560, 9590, 9628, 9647, 9685, 9715, 9742, 9780, 9810, 9818, 9829, 9848, 9867, 9905, 9924, 9943, 9962, 10000};
+
+  private static final Map<Integer, Integer> LEAP = new HashMap<Integer, Integer>();
+
+  private static final Map<Integer, LunarYear> CACHE = new HashMap<Integer, LunarYear>();
+
+  static {
+    for (int y : LEAP_11) {
+      LEAP.put(y, 13);
+    }
+    for (int y : LEAP_12) {
+      LEAP.put(y, 14);
+    }
+  }
+
   /**
    * 农历年
    */
@@ -44,18 +68,25 @@ public class LunarYear {
    * @return 农历年
    */
   public static LunarYear fromYear(int lunarYear) {
-    return new LunarYear(lunarYear);
+    LunarYear obj = CACHE.get(lunarYear);
+    if (null == obj) {
+      obj = new LunarYear(lunarYear);
+      CACHE.put(lunarYear, obj);
+    }
+    return obj;
   }
 
   private void compute() {
     // 节气(中午12点)
-    double[] jq = new double[25];
+    double[] jq = new double[27];
     // 合朔，即每月初一(中午12点)
     double[] hs = new double[16];
     // 每月天数
     int[] dayCounts = new int[hs.length - 1];
 
-    int year = this.year - 2000;
+    int currentYear = this.year;
+
+    int year = currentYear - 2000;
     // 从上年的大雪到下年的立春
     for (int i = 0, j = Lunar.JIE_QI_IN_USE.length; i < j; i++) {
       // 精确的节气
@@ -63,7 +94,7 @@ public class LunarYear {
       t += ShouXingUtil.ONE_THIRD - ShouXingUtil.dtT(t);
       jieQiJulianDays.add(t + Solar.J2000);
       // 按中午12点算的节气
-      if (i > 0 && i < 26) {
+      if (i > 0 && i < 28) {
         jq[i - 1] = Math.round(t);
       }
     }
@@ -82,25 +113,41 @@ public class LunarYear {
       dayCounts[i] = (int) (hs[i + 1] - hs[i]);
     }
 
-    int leap = -1;
-    if (hs[13] <= jq[24]) {
-      int i = 1;
-      while (hs[i + 1] > jq[2 * i] && i < 13) {
-        i++;
+    Integer currentYearLeap = LEAP.get(currentYear);
+    if (null == currentYearLeap) {
+      currentYearLeap = -1;
+      if (hs[13] <= jq[24]) {
+        int i = 1;
+        while (hs[i + 1] > jq[2 * i] && i < 13) {
+          i++;
+        }
+        currentYearLeap = i;
       }
-      leap = i;
     }
 
-    int y = this.year - 1;
+    int prevYear = currentYear - 1;
+    Integer prevYearLeap = LEAP.get(prevYear);
+    prevYearLeap = null == prevYearLeap ? -1 : prevYearLeap - 12;
+
+    int y = prevYear;
     int m = 11;
     for (int i = 0, j = dayCounts.length; i < j; i++) {
-      boolean isLeap = false;
-      if (i == leap) {
-        isLeap = true;
-        m--;
+      int cm = m;
+      boolean isNextLeap = false;
+      if (y == currentYear && i == currentYearLeap) {
+        cm = -cm;
+      } else if (y == prevYear && i == prevYearLeap) {
+        cm = -cm;
+      }
+      if (y == currentYear && i + 1 == currentYearLeap) {
+        isNextLeap = true;
+      } else if (y == prevYear && i + 1 == prevYearLeap) {
+        isNextLeap = true;
+      }
+      this.months.add(new LunarMonth(y, cm, dayCounts[i], hs[i] + Solar.J2000));
+      if (!isNextLeap) {
+        m++;
       }
-      this.months.add(new LunarMonth(y, isLeap ? -m : m, dayCounts[i], hs[i] + Solar.J2000));
-      m++;
       if (m == 13) {
         m = 1;
         y++;

src/main/java/com/nlf/calendar/eightchar/DaYun.java

@@ -117,12 +117,21 @@ public class DaYun {
   }
 
   /**
-   * 获取流年
+   * 获取10轮流年
    *
    * @return 流年
    */
   public LiuNian[] getLiuNian() {
-    int n = 10;
+    return getLiuNian(10);
+  }
+
+  /**
+   * 获取流年
+   *
+   * @param n 轮数
+   * @return 流年
+   */
+  public LiuNian[] getLiuNian(int n) {
     if (index < 1) {
       n = endYear-startYear+1;
     }
@@ -134,12 +143,20 @@ public class DaYun {
   }
 
   /**
-   * 获取小运
+   * 获取10轮小运
    *
    * @return 小运
    */
   public XiaoYun[] getXiaoYun() {
-    int n = 10;
+    return getXiaoYun(10);
+  }
+
+  /**
+   * 获取小运
+   * @param n 轮数
+   * @return 小运
+   */
+  public XiaoYun[] getXiaoYun(int n) {
     if (index < 1) {
       n = endYear-startYear+1;
     }

src/main/java/com/nlf/calendar/eightchar/Yun.java

@@ -145,12 +145,21 @@ public class Yun {
   }
 
   /**
-   * 获取大运
+   * 获取10轮大运
    *
    * @return 大运
    */
   public DaYun[] getDaYun() {
-    int n = 10;
+    return getDaYun(10);
+  }
+
+  /**
+   * 获取大运
+   *
+   * @param n 轮数
+   * @return 大运
+   */
+  public DaYun[] getDaYun(int n) {
     DaYun[] l = new DaYun[n];
     for (int i = 0; i < n; i++) {
       l[i] = new DaYun(this, i);

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

@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * 法定节假日工具（默认自2001年12月29日起，至2020年12月31日止）
+ * 法定节假日工具（默认自2001年12月29日起）
  *
  * @author 6tail
  */

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

@@ -128,7 +128,6 @@ public class LunarUtil{
       put("8-15","中秋节");
       put("9-9","重阳节");
       put("12-8","腊八节");
-      put("12-30","除夕");
     }
   };
   /** 农历日期对应的非正式节日，参考《寿康宝鉴》 */
@@ -1186,7 +1185,8 @@ public class LunarUtil{
         }
       }
       if(matched) {
-        String ys = left.substring(left.indexOf(":") + 1, left.indexOf(","));
+        String ys = left.substring(left.indexOf(':') + 1);
+        ys = ys.substring(0, ys.indexOf(','));
         for (int i = 0, j = ys.length(); i < j; i += 2) {
           String m = ys.substring(i, i + 2);
           l.add(YI_JI[Integer.parseInt(m,16)]);

src/test/java/test/BaZiTest.java

@@ -240,4 +240,22 @@ public class BaZiTest {
     }
   }
 
+  @Test
+  public void test4() {
+    Lunar lunar = Lunar.fromYmd(1985, 12, 27);
+    Assert.assertEquals("1995-11-05", lunar.getEightChar().getYun(1).getStartSolar().toYmd());
+  }
+
+  @Test
+  public void test5() {
+    Lunar lunar = Lunar.fromYmd(1985, 1, 27);
+    Assert.assertEquals("1989-03-28", lunar.getEightChar().getYun(1).getStartSolar().toYmd());
+  }
+
+  @Test
+  public void test6() {
+    Lunar lunar = Lunar.fromYmd(1986, 12, 27);
+    Assert.assertEquals("1990-04-15", lunar.getEightChar().getYun(1).getStartSolar().toYmd());
+  }
+
 }

src/test/java/test/LunarTest.java

@@ -13,125 +13,322 @@ import org.junit.Test;
 public class LunarTest {
 
   @Test
-  public void test(){
-    Lunar date = new Lunar(2019,3,27,0,0,0);
-    Assert.assertEquals("二〇一九年三月廿七",date.toString());
-    Assert.assertEquals("二〇一九年三月廿七 己亥(猪)年 戊辰(龙)月 戊戌(狗)日 子(鼠)时 纳音[平地木 大林木 平地木 桑柘木] 星期三 (七殿泰山王诞) 西方白虎 星宿[参水猿](吉) 彭祖百忌[戊不受田田主不祥 戌不吃犬作怪上床] 喜神方位[巽](东南) 阳贵神方位[艮](东北) 阴贵神方位[坤](西南) 福神方位[坎](正北) 财神方位[坎](正北) 冲[(壬辰)龙] 煞[北]",date.toFullString());
-    Assert.assertEquals("2019-05-01",date.getSolar().toString());
-    Assert.assertEquals("2019-05-01 00:00:00 星期三 (劳动节) 金牛座",date.getSolar().toFullString());
+  public void test() {
+    Lunar date = new Lunar(2019, 3, 27, 0, 0, 0);
+    Assert.assertEquals("二〇一九年三月廿七", date.toString());
+    Assert.assertEquals("二〇一九年三月廿七 己亥(猪)年 戊辰(龙)月 戊戌(狗)日 子(鼠)时 纳音[平地木 大林木 平地木 桑柘木] 星期三 (七殿泰山王诞) 西方白虎 星宿[参水猿](吉) 彭祖百忌[戊不受田田主不祥 戌不吃犬作怪上床] 喜神方位[巽](东南) 阳贵神方位[艮](东北) 阴贵神方位[坤](西南) 福神方位[坎](正北) 财神方位[坎](正北) 冲[(壬辰)龙] 煞[北]", date.toFullString());
+    Assert.assertEquals("2019-05-01", date.getSolar().toString());
+    Assert.assertEquals("2019-05-01 00:00:00 星期三 (劳动节) 金牛座", date.getSolar().toFullString());
   }
 
   @Test
-  public void test1(){
-    Solar solar = new Solar(1,1,1,12,0,0);
-    Assert.assertEquals("〇年冬月十八",solar.getLunar().toString());
+  public void test1() {
+    Solar solar = new Solar(1, 1, 1, 12, 0, 0);
+    Assert.assertEquals("〇年冬月十八", solar.getLunar().toString());
   }
 
   @Test
-  public void test2(){
-    Solar solar = new Solar(9999,12,31,12,0,0);
-    Assert.assertEquals("九九九九年腊月初二",solar.getLunar().toString());
+  public void test2() {
+    Solar solar = new Solar(9999, 12, 31, 12, 0, 0);
+    Assert.assertEquals("九九九九年腊月初二", solar.getLunar().toString());
   }
 
   @Test
-  public void test3(){
-    Lunar lunar = new Lunar(0,11,18,12,0,0);
-    Assert.assertEquals("0001-01-01",lunar.getSolar().toString());
+  public void test3() {
+    Lunar lunar = new Lunar(0, 11, 18, 12, 0, 0);
+    Assert.assertEquals("0001-01-01", lunar.getSolar().toString());
   }
 
   @Test
-  public void test4(){
-    Lunar lunar = new Lunar(9999,12,2,12,0,0);
-    Assert.assertEquals("9999-12-31",lunar.getSolar().toString());
+  public void test4() {
+    Lunar lunar = new Lunar(9999, 12, 2, 12, 0, 0);
+    Assert.assertEquals("9999-12-31", lunar.getSolar().toString());
   }
 
   @Test
-  public void test5(){
-    Lunar lunar = new Lunar(1905,1,1,12,0,0);
-    Assert.assertEquals("1905-02-04",lunar.getSolar().toString());
+  public void test5() {
+    Lunar lunar = new Lunar(1905, 1, 1, 12, 0, 0);
+    Assert.assertEquals("1905-02-04", lunar.getSolar().toString());
   }
 
   @Test
-  public void test6(){
-    Lunar lunar = new Lunar(2038,12,29,12,0,0);
-    Assert.assertEquals("2039-01-23",lunar.getSolar().toString());
+  public void test6() {
+    Lunar lunar = new Lunar(2038, 12, 29, 12, 0, 0);
+    Assert.assertEquals("2039-01-23", lunar.getSolar().toString());
   }
 
   @Test
-  public void test7(){
-    Lunar lunar = new Lunar(2020,-4,2,13,0,0);
-    Assert.assertEquals("二〇二〇年闰四月初二",lunar.toString());
-    Assert.assertEquals("2020-05-24",lunar.getSolar().toString());
+  public void test7() {
+    Lunar lunar = new Lunar(2020, -4, 2, 13, 0, 0);
+    Assert.assertEquals("二〇二〇年闰四月初二", lunar.toString());
+    Assert.assertEquals("2020-05-24", lunar.getSolar().toString());
   }
 
   @Test
-  public void test8(){
-    Lunar lunar = new Lunar(2020,12,10,13,0,0);
-    Assert.assertEquals("二〇二〇年腊月初十",lunar.toString());
-    Assert.assertEquals("2021-01-22",lunar.getSolar().toString());
+  public void test8() {
+    Lunar lunar = new Lunar(2020, 12, 10, 13, 0, 0);
+    Assert.assertEquals("二〇二〇年腊月初十", lunar.toString());
+    Assert.assertEquals("2021-01-22", lunar.getSolar().toString());
   }
 
   @Test
-  public void test9(){
-    Lunar lunar = new Lunar(1500,1,1,12,0,0);
-    Assert.assertEquals("1500-01-31",lunar.getSolar().toString());
+  public void test9() {
+    Lunar lunar = new Lunar(1500, 1, 1, 12, 0, 0);
+    Assert.assertEquals("1500-01-31", lunar.getSolar().toString());
   }
 
   @Test
-  public void test10(){
-    Lunar lunar = new Lunar(1500,12,29,12,0,0);
-    Assert.assertEquals("1501-01-18",lunar.getSolar().toString());
+  public void test10() {
+    Lunar lunar = new Lunar(1500, 12, 29, 12, 0, 0);
+    Assert.assertEquals("1501-01-18", lunar.getSolar().toString());
   }
 
   @Test
-  public void test11(){
-    Solar solar = new Solar(1500,1,1,12,0,0);
-    Assert.assertEquals("一四九九年腊月初一",solar.getLunar().toString());
+  public void test11() {
+    Solar solar = new Solar(1500, 1, 1, 12, 0, 0);
+    Assert.assertEquals("一四九九年腊月初一", solar.getLunar().toString());
   }
 
   @Test
-  public void test12(){
-    Solar solar = new Solar(1500,12,31,12,0,0);
-    Assert.assertEquals("一五〇〇年腊月十一",solar.getLunar().toString());
+  public void test12() {
+    Solar solar = new Solar(1500, 12, 31, 12, 0, 0);
+    Assert.assertEquals("一五〇〇年腊月十一", solar.getLunar().toString());
   }
 
   @Test
-  public void test13(){
-    Solar solar = new Solar(1582,10,4,12,0,0);
-    Assert.assertEquals("一五八二年九月十八",solar.getLunar().toString());
+  public void test13() {
+    Solar solar = new Solar(1582, 10, 4, 12, 0, 0);
+    Assert.assertEquals("一五八二年九月十八", solar.getLunar().toString());
   }
 
   @Test
-  public void test14(){
-    Solar solar = new Solar(1582,10,15,12,0,0);
-    Assert.assertEquals("一五八二年九月十九",solar.getLunar().toString());
+  public void test14() {
+    Solar solar = new Solar(1582, 10, 15, 12, 0, 0);
+    Assert.assertEquals("一五八二年九月十九", solar.getLunar().toString());
   }
 
   @Test
-  public void test15(){
-    Lunar lunar = new Lunar(1582,9,18,12,0,0);
-    Assert.assertEquals("1582-10-04",lunar.getSolar().toString());
+  public void test15() {
+    Lunar lunar = new Lunar(1582, 9, 18, 12, 0, 0);
+    Assert.assertEquals("1582-10-04", lunar.getSolar().toString());
   }
 
   @Test
-  public void test16(){
-    Lunar lunar = new Lunar(1582,9,19,12,0,0);
-    Assert.assertEquals("1582-10-15",lunar.getSolar().toString());
+  public void test16() {
+    Lunar lunar = new Lunar(1582, 9, 19, 12, 0, 0);
+    Assert.assertEquals("1582-10-15", lunar.getSolar().toString());
   }
 
   @Test
-  public void test17(){
-    Lunar lunar = new Lunar(2019,12,12,11,22,0);
-    Assert.assertEquals("2020-01-06",lunar.getSolar().toString());
+  public void test17() {
+    Lunar lunar = new Lunar(2019, 12, 12, 11, 22, 0);
+    Assert.assertEquals("2020-01-06", lunar.getSolar().toString());
   }
 
   @Test
-  public void testNext(){
-    Solar solar = new Solar(2020,1,10,12,0,0);
+  public void test18() {
+    Lunar lunar = new Lunar(2021, 12, 29);
+    Assert.assertEquals("除夕", lunar.getFestivals().get(0));
+  }
+
+  @Test
+  public void test19() {
+    Lunar lunar = new Lunar(2020, 12, 30);
+    Assert.assertEquals("除夕", lunar.getFestivals().get(0));
+  }
+
+  @Test
+  public void test20() {
+    Lunar lunar = new Lunar(2020, 12, 29);
+    Assert.assertEquals(0, lunar.getFestivals().size());
+  }
+
+  @Test
+  public void test21() {
+    Solar solar = Solar.fromYmd(2022, 1, 31);
     Lunar lunar = solar.getLunar();
-    for(int i=-50;i<50;i++){
-      Assert.assertEquals("推移天数："+i,solar.next(i).getLunar().toFullString(),lunar.next(i).toFullString());
+    Assert.assertEquals("除夕", lunar.getFestivals().get(0));
+  }
+
+  @Test
+  public void test22() {
+    Lunar lunar = Lunar.fromYmd(2033, -11, 1);
+    Assert.assertEquals("2033-12-22", lunar.getSolar().toYmd());
+  }
+
+  @Test
+  public void test23() {
+    Lunar lunar = Lunar.fromYmd(2022, 1, 1);
+    Assert.assertEquals("五黄土玉衡", lunar.getYearNineStar().toString());
+  }
+
+  @Test
+  public void test24() {
+    Lunar lunar = Lunar.fromYmd(2033, 1, 1);
+    Assert.assertEquals("三碧木天玑", lunar.getYearNineStar().toString());
+  }
+
+  @Test
+  public void test25() {
+    Solar solar = new Solar(2021, 6, 7, 21, 18, 0);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("二〇二一年四月廿七", lunar.toString());
+  }
+
+  @Test
+  public void test26() {
+    Lunar lunar = Lunar.fromYmdHms(2021, 6, 7, 21, 18, 0);
+    Solar solar = lunar.getSolar();
+    Assert.assertEquals("2021-07-16", solar.toString());
+  }
+
+  @Test
+  public void testNext() {
+    Solar solar = new Solar(2020, 1, 10, 12, 0, 0);
+    Lunar lunar = solar.getLunar();
+    for (int i = -50; i < 50; i++) {
+      Assert.assertEquals("推移天数：" + i, solar.next(i).getLunar().toFullString(), lunar.next(i).toFullString());
     }
   }
 
+  @Test
+  public void test27() {
+    Solar solar = Solar.fromYmd(1989, 4, 28);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals(23, lunar.getDay());
+  }
+
+  @Test
+  public void test28() {
+    Solar solar = Solar.fromYmd(1990, 10, 8);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("乙酉", lunar.getMonthInGanZhiExact());
+  }
+
+  @Test
+  public void test29() {
+    Solar solar = Solar.fromYmd(1990, 10, 9);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("丙戌", lunar.getMonthInGanZhiExact());
+  }
+
+  @Test
+  public void test30() {
+    Solar solar = Solar.fromYmd(1990, 10, 8);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("丙戌", lunar.getMonthInGanZhi());
+  }
+
+  @Test
+  public void test31() {
+    Solar solar = Solar.fromYmdHms(1987, 4, 17, 9, 0, 0);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("一九八七年三月二十", lunar.toString());
+  }
+
+  @Test
+  public void test32() {
+    Lunar lunar = Lunar.fromYmd(2034, 1, 1);
+    Assert.assertEquals("2034-02-19", lunar.getSolar().toYmd());
+  }
+
+  @Test
+  public void test33() {
+    Lunar lunar = Lunar.fromYmd(2033, 12, 1);
+    Assert.assertEquals("2034-01-20", lunar.getSolar().toYmd());
+  }
+
+  @Test
+  public void test34() {
+    Lunar lunar = Lunar.fromYmd(37, -12, 1);
+    Assert.assertEquals("闰腊", lunar.getMonthInChinese());
+  }
+
+  @Test
+  public void test35() {
+    Lunar lunar = Lunar.fromYmd(56, -12, 1);
+    Assert.assertEquals("闰腊", lunar.getMonthInChinese());
+
+    lunar = Lunar.fromYmd(75, -11, 1);
+    Assert.assertEquals("闰冬", lunar.getMonthInChinese());
+
+    lunar = Lunar.fromYmd(94, -11, 1);
+    Assert.assertEquals("闰冬", lunar.getMonthInChinese());
+
+    lunar = Lunar.fromYmd(94, 12, 1);
+    Assert.assertEquals("腊", lunar.getMonthInChinese());
+
+    lunar = Lunar.fromYmd(113, 12, 1);
+    Assert.assertEquals("腊", lunar.getMonthInChinese());
+
+    lunar = Lunar.fromYmd(113, -12, 1);
+    Assert.assertEquals("闰腊", lunar.getMonthInChinese());
+
+    lunar = Lunar.fromYmd(5552, -12, 1);
+    Assert.assertEquals("闰腊", lunar.getMonthInChinese());
+  }
+
+  @Test
+  public void test36() {
+    Solar solar = Solar.fromYmd(5553, 1, 22);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("五五五二年闰腊月初二", lunar.toString());
+  }
+
+  @Test
+  public void test37() {
+    Solar solar = Solar.fromYmd(7013, 12, 24);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("七〇一三年闰冬月初四", lunar.toString());
+  }
+
+  @Test
+  public void test38() {
+    Lunar lunar = Lunar.fromYmd(7013, -11, 4);
+    Solar solar = lunar.getSolar();
+    Assert.assertEquals("7013-12-24", solar.toString());
+  }
+
+  @Test
+  public void test39() {
+    Solar solar = Solar.fromYmd(1987, 4, 12);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("一九八七年三月十五", lunar.toString());
+  }
+
+  @Test
+  public void test40() {
+    Solar solar = Solar.fromYmd(1987, 4, 13);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("一九八七年三月十六", lunar.toString());
+  }
+
+  @Test
+  public void test41() {
+    Solar solar = Solar.fromYmd(4, 2, 10);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("鼠", lunar.getYearShengXiao());
+  }
+
+  @Test
+  public void test42() {
+    Solar solar = Solar.fromYmd(4, 2, 9);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("猪", lunar.getYearShengXiao());
+  }
+
+  @Test
+  public void test43() {
+    Solar solar = Solar.fromYmd(1, 2, 12);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("鸡", lunar.getYearShengXiao());
+  }
+
+  @Test
+  public void test44() {
+    Solar solar = Solar.fromYmd(1, 1, 1);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("猴", lunar.getYearShengXiao());
+  }
+
 }

src/test/java/test/SolarTest.java

@@ -1,6 +1,7 @@
 package test;
 
 import com.nlf.calendar.Solar;
+import com.nlf.calendar.util.SolarUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -44,6 +45,11 @@ public class SolarTest {
     Assert.assertEquals("二六年三月初八",solar.getLunar().toString());
   }
 
+  @Test
+  public void test10(){
+    Assert.assertEquals(false, SolarUtil.isLeapYear(1500));
+  }
+
   @Test
   public void testNext(){
     Solar date = new Solar(2020,1,23);

src/test/java/test/WuHouTest.java

@@ -68,4 +68,11 @@ public class WuHouTest {
     Assert.assertEquals(solar.toString(),"鹖鴠不鸣",lunar.getWuHou());
   }
 
+  @Test
+  public void test9(){
+    Solar solar = new Solar(1982,12,22);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals(solar.toString(),"蚯蚓结",lunar.getWuHou());
+  }
+
 }