v1.3.4 LunarMonth增加序号、干支、财神方位等；完善纪念日。

README.md

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

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.3</version>
+    <version>1.3.4</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/EightChar.java

@@ -185,8 +185,7 @@ public class EightChar {
   }
 
   private String getDiShi(int zhiIndex) {
-    int offset = CHANG_SHENG_OFFSET.get(getDayGan());
-    int index = offset + (getDayGanIndex() % 2 == 0 ? zhiIndex : -zhiIndex);
+    int index = CHANG_SHENG_OFFSET.get(getDayGan()) + (getDayGanIndex() % 2 == 0 ? zhiIndex : -zhiIndex);
     if (index >= 12) {
       index -= 12;
     }

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

@@ -74,6 +74,10 @@ public class Foto {
     return lunar.getDayInChinese();
   }
 
+  /**
+   * 获取因果犯忌
+   * @return 因果犯忌
+   */
   public List<FotoFestival> getFestivals() {
     List<FotoFestival> l = new ArrayList<FotoFestival>();
     List<FotoFestival> fs = FotoUtil.FESTIVAL.get(getMonth() + "-" + getDay());
@@ -83,6 +87,19 @@ public class Foto {
     return l;
   }
 
+  /**
+   * 获取纪念日
+   * @return 纪念日
+   */
+  public List<String> getOtherFestivals() {
+    List<String> l = new ArrayList<String>();
+    List<String> fs = FotoUtil.OTHER_FESTIVAL.get(getMonth() + "-" + getDay());
+    if (null != fs) {
+      l.addAll(fs);
+    }
+    return l;
+  }
+
   /**
    * 是否月斋
    *

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

@@ -1776,9 +1776,7 @@ public class Lunar {
    * @return 值日天神
    */
   public String getDayTianShen() {
-    String monthZhi = getMonthZhi();
-    int offset = LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(monthZhi);
-    return LunarUtil.TIAN_SHEN[(dayZhiIndex + offset) % 12 + 1];
+    return LunarUtil.TIAN_SHEN[(dayZhiIndex + LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(getMonthZhi())) % 12 + 1];
   }
 
   /**
@@ -1787,9 +1785,7 @@ public class Lunar {
    * @return 值时天神
    */
   public String getTimeTianShen() {
-    String dayZhi = getDayZhiExact();
-    int offset = LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(dayZhi);
-    return LunarUtil.TIAN_SHEN[(timeZhiIndex + offset) % 12 + 1];
+    return LunarUtil.TIAN_SHEN[(timeZhiIndex + LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(getDayZhiExact())) % 12 + 1];
   }
 
   /**

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

@@ -31,6 +31,10 @@ public class LunarMonth {
    */
   private final double firstJulianDay;
 
+  private final int index;
+
+  private final int zhiIndex;
+
   /**
    * 初始化
    *
@@ -39,11 +43,13 @@ public class LunarMonth {
    * @param dayCount       天数
    * @param firstJulianDay 初一的儒略日
    */
-  public LunarMonth(int lunarYear, int lunarMonth, int dayCount, double firstJulianDay) {
+  public LunarMonth(int lunarYear, int lunarMonth, int dayCount, double firstJulianDay, int index) {
     this.year = lunarYear;
     this.month = lunarMonth;
     this.dayCount = dayCount;
     this.firstJulianDay = firstJulianDay;
+    this.index = index;
+    this.zhiIndex = (index - 1 + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12;
   }
 
   /**
@@ -93,6 +99,31 @@ public class LunarMonth {
     return dayCount;
   }
 
+  public int getIndex() {
+    return index;
+  }
+
+  public int getZhiIndex() {
+    return zhiIndex;
+  }
+
+  public int getGanIndex() {
+    int offset = (LunarYear.fromYear(year).getGanIndex() + 1) % 5 * 2;
+    return (index - 1 + offset) % 10;
+  }
+
+  public String getGan() {
+    return LunarUtil.GAN[getGanIndex() + 1];
+  }
+
+  public String getZhi() {
+    return LunarUtil.ZHI[zhiIndex + 1];
+  }
+
+  public String getGanZhi() {
+    return getGan() + getZhi();
+  }
+
   /**
    * 获取初一的儒略日
    *
@@ -102,6 +133,46 @@ public class LunarMonth {
     return firstJulianDay;
   }
 
+  public String getPositionXi() {
+    return LunarUtil.POSITION_XI[getGanIndex() + 1];
+  }
+
+  public String getPositionXiDesc() {
+    return LunarUtil.POSITION_DESC.get(getPositionXi());
+  }
+
+  public String getPositionYangGui() {
+    return LunarUtil.POSITION_YANG_GUI[getGanIndex() + 1];
+  }
+
+  public String getPositionYangGuiDesc() {
+    return LunarUtil.POSITION_DESC.get(getPositionYangGui());
+  }
+
+  public String getPositionYinGui() {
+    return LunarUtil.POSITION_YIN_GUI[getGanIndex() + 1];
+  }
+
+  public String getPositionYinGuiDesc() {
+    return LunarUtil.POSITION_DESC.get(getPositionYinGui());
+  }
+
+  public String getPositionFu(int sect) {
+    return (1 == sect ? LunarUtil.POSITION_FU : LunarUtil.POSITION_FU_2)[getGanIndex() + 1];
+  }
+
+  public String getPositionFuDesc(int sect) {
+    return LunarUtil.POSITION_DESC.get(getPositionFu(sect));
+  }
+
+  public String getPositionCai() {
+    return LunarUtil.POSITION_CAI[getGanIndex() + 1];
+  }
+
+  public String getPositionCaiDesc() {
+    return LunarUtil.POSITION_DESC.get(getPositionCai());
+  }
+  
   /**
    * 获取太岁方位
    *
@@ -121,7 +192,7 @@ public class LunarMonth {
         p = "坤";
         break;
       default:
-        p = LunarUtil.POSITION_GAN[Solar.fromJulianDay(this.getFirstJulianDay()).getLunar().getMonthGanIndex()];
+        p = LunarUtil.POSITION_GAN[Solar.fromJulianDay(getFirstJulianDay()).getLunar().getMonthGanIndex()];
     }
     return p;
   }

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

@@ -206,9 +206,7 @@ public class LunarTime {
    * @return 值时天神
    */
   public String getTianShen() {
-    String dayZhi = lunar.getDayZhiExact();
-    int offset = LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(dayZhi);
-    return LunarUtil.TIAN_SHEN[(zhiIndex + offset) % 12 + 1];
+    return LunarUtil.TIAN_SHEN[(zhiIndex + LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(lunar.getDayZhiExact())) % 12 + 1];
   }
 
   /**

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

@@ -175,17 +175,20 @@ public class LunarYear {
 
     int y = prevYear;
     int m = 11;
+    int index = m;
     for (int i = 0, j = dayCounts.length; i < j; i++) {
       int cm = m;
       if (y == leapYear && i == leapIndex) {
         cm = -cm;
       }
-      this.months.add(new LunarMonth(y, cm, dayCounts[i], hs[i] + Solar.J2000));
+      this.months.add(new LunarMonth(y, cm, dayCounts[i], hs[i] + Solar.J2000, index));
       if (y != leapYear || i + 1 != leapIndex) {
         m++;
       }
+      index++;
       if (m == 13) {
         m = 1;
+        index = 1;
         y++;
       }
     }

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

@@ -306,9 +306,10 @@ public class Solar {
     }
     List<Integer> hours = new ArrayList<Integer>(2);
     String timeZhi = timeGanZhi.substring(1);
-    for(int i = 0, j = LunarUtil.ZHI.length; i < j; i++){
+    for(int i = 1, j = LunarUtil.ZHI.length; i < j; i++){
       if(LunarUtil.ZHI[i].equals(timeZhi)){
         hours.add((i - 1) * 2);
+        break;
       }
     }
     if ("子".equals(timeZhi)) {

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

@@ -262,6 +262,46 @@ public class FotoUtil {
     }
   };
 
+  /**
+   * 纪念日
+   */
+  public static final Map<String, List<String>> OTHER_FESTIVAL = new HashMap<String, List<String>>() {
+    private static final long serialVersionUID = -1;
+
+    {
+      put("1-1", Collections.nCopies(1, "弥勒菩萨圣诞"));
+      put("1-6", Collections.nCopies(1, "定光佛圣诞"));
+      put("2-8", Collections.nCopies(1, "释迦牟尼佛出家"));
+      put("2-15", Collections.nCopies(1, "释迦牟尼佛涅槃"));
+      put("2-19", Collections.nCopies(1, "观世音菩萨圣诞"));
+      put("2-21", Collections.nCopies(1, "普贤菩萨圣诞"));
+      put("3-16", Collections.nCopies(1, "准提菩萨圣诞"));
+      put("4-4", Collections.nCopies(1, "文殊菩萨圣诞"));
+      put("4-8", Collections.nCopies(1, "释迦牟尼佛圣诞"));
+      put("4-15", Collections.nCopies(1, "佛吉祥日"));
+      put("4-28", Collections.nCopies(1, "药王菩萨圣诞"));
+      put("5-13", Collections.nCopies(1, "伽蓝菩萨圣诞"));
+      put("6-3", Collections.nCopies(1, "韦驮菩萨圣诞"));
+      put("6-19", Collections.nCopies(1, "观音菩萨成道"));
+      put("7-13", Collections.nCopies(1, "大势至菩萨圣诞"));
+      put("7-15", Collections.nCopies(1, "佛欢喜日"));
+      put("7-24", Collections.nCopies(1, "龙树菩萨圣诞"));
+      put("7-30", Collections.nCopies(1, "地藏菩萨圣诞"));
+      put("8-15", Collections.nCopies(1, "月光菩萨圣诞"));
+      put("8-22", Collections.nCopies(1, "燃灯佛圣诞"));
+      put("9-9", Collections.nCopies(1, "摩利支天菩萨圣诞"));
+      put("9-19", Collections.nCopies(1, "观世音菩萨出家"));
+      put("9-30", Collections.nCopies(1, "药师琉璃光佛圣诞"));
+      put("10-5", Collections.nCopies(1, "达摩祖师圣诞"));
+      put("10-20", Collections.nCopies(1, "文殊菩萨出家"));
+      put("11-17", Collections.nCopies(1, "阿弥陀佛圣诞"));
+      put("11-19", Collections.nCopies(1, "日光菩萨圣诞"));
+      put("12-8", Collections.nCopies(1, "释迦牟尼佛成道"));
+      put("12-23", Collections.nCopies(1, "监斋菩萨圣诞"));
+      put("12-29", Collections.nCopies(1, "华严菩萨圣诞"));
+    }
+  };
+
   /**
    * 27星宿，佛教从印度传入中国，印度把28星宿改为27星宿，把牛宿(牛金牛)纳入了女宿(女土蝠)。
    */

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

@@ -123,7 +123,7 @@ public class LunarUtil{
   /** 日 */
   public static final String[] DAY = {"","初一","初二","初三","初四","初五","初六","初七","初八","初九","初十","十一","十二","十三","十四","十五","十六","十七","十八","十九","二十","廿一","廿二","廿三","廿四","廿五","廿六","廿七","廿八","廿九","三十"};
   /** 月相，朔月也叫新月，望月也叫满月 */
-  public static final String[] YUE_XIANG = {"","朔","既朔","蛾眉新","蛾眉新","蛾眉","夕月","上弦","上弦","九夜","宵","宵","宵","渐盈凸","小望","望","既望","立待","居待","寝待","更待","渐亏凸","下弦","下弦","有明","有明","蛾眉残","蛾眉残","残","晓","晦"};
+  public static final String[] YUE_XIANG = {"","朔","既朔","蛾眉新","蛾眉新","蛾眉","夕","上弦","上弦","九夜","宵","宵","宵","渐盈凸","小望","望","既望","立待","居待","寝待","更待","渐亏凸","下弦","下弦","有明","有明","蛾眉残","蛾眉残","残","晓","晦"};
   /** 农历日期对应的节日 */
   public static final Map<String,String> FESTIVAL = new HashMap<String,String>(){
     private static final long serialVersionUID = -1;
@@ -1118,8 +1118,7 @@ public class LunarUtil{
       boolean matched = false;
       String months = left.substring(0, left.indexOf(":"));
       for (int i = 0, j = months.length(); i < j; i += 2) {
-        String m = months.substring(i, i + 2);
-        if (m.equals(month)) {
+        if (month.equals(months.substring(i, i + 2))) {
           matched = true;
           break;
         }
@@ -1128,8 +1127,7 @@ public class LunarUtil{
         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)]);
+          l.add(YI_JI[Integer.parseInt(ys.substring(i, i + 2),16)]);
         }
         break;
       }

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

@@ -69,70 +69,141 @@ public class SolarUtil {
 
     {
       put("1-8", Collections.nCopies(1, "周恩来逝世纪念日"));
-      put("1-10", Arrays.asList("中国人民警察节", "中国公安110宣传日"));
+      put("1-10", Collections.nCopies(1, "中国人民警察节"));
+      put("1-14", Collections.nCopies(1, "日记情人节"));
       put("1-21", Collections.nCopies(1, "列宁逝世纪念日"));
       put("1-26", Collections.nCopies(1, "国际海关日"));
+      put("1-27", Collections.nCopies(1, "国际大屠杀纪念日"));
       put("2-2", Collections.nCopies(1, "世界湿地日"));
       put("2-4", Collections.nCopies(1, "世界抗癌日"));
-      put("2-7", Collections.nCopies(1, "京汉铁路罢工纪念"));
+      put("2-7", Collections.nCopies(1, "京汉铁路罢工纪念日"));
       put("2-10", Collections.nCopies(1, "国际气象节"));
       put("2-19", Collections.nCopies(1, "邓小平逝世纪念日"));
+      put("2-20", Collections.nCopies(1, "世界社会公正日"));
       put("2-21", Collections.nCopies(1, "国际母语日"));
       put("2-24", Collections.nCopies(1, "第三世界青年日"));
       put("3-1", Collections.nCopies(1, "国际海豹日"));
-      put("3-3", Collections.nCopies(1, "全国爱耳日"));
+      put("3-3", Arrays.asList("世界野生动植物日", "全国爱耳日"));
       put("3-5", Arrays.asList("周恩来诞辰纪念日", "中国青年志愿者服务日"));
       put("3-6", Collections.nCopies(1, "世界青光眼日"));
+      put("3-7", Collections.nCopies(1, "女生节"));
       put("3-12", Collections.nCopies(1, "孙中山逝世纪念日"));
-      put("3-14", Collections.nCopies(1, "马克思逝世纪念日"));
+      put("3-14", Arrays.asList("马克思逝世纪念日", "白色情人节"));
       put("3-17", Collections.nCopies(1, "国际航海日"));
-      put("3-18", Collections.nCopies(1, "全国科技人才活动日"));
-      put("3-21", Arrays.asList("世界森林日", "世界睡眠日"));
+      put("3-18", Arrays.asList("全国科技人才活动日", "全国爱肝日"));
+      put("3-20", Collections.nCopies(1, "国际幸福日"));
+      put("3-21", Arrays.asList("世界森林日", "世界睡眠日", "国际消除种族歧视日"));
       put("3-22", Collections.nCopies(1, "世界水日"));
       put("3-23", Collections.nCopies(1, "世界气象日"));
       put("3-24", Collections.nCopies(1, "世界防治结核病日"));
-      put("4-2", Collections.nCopies(1, "国际儿童图书日"));
+      put("3-29", Collections.nCopies(1, "中国黄花岗七十二烈士殉难纪念日"));
+      put("4-2", Arrays.asList("国际儿童图书日", "世界自闭症日"));
+      put("4-4", Collections.nCopies(1, "国际地雷行动日"));
       put("4-7", Collections.nCopies(1, "世界卫生日"));
-      put("4-22", Collections.nCopies(1, "列宁诞辰纪念日"));
-      put("4-23", Collections.nCopies(1, "世界图书和版权日"));
-      put("4-26", Collections.nCopies(1, "世界知识产权日"));
+      put("4-8", Collections.nCopies(1, "国际珍稀动物保护日"));
+      put("4-12", Collections.nCopies(1, "世界航天日"));
+      put("4-14", Collections.nCopies(1, "黑色情人节"));
+      put("4-15", Collections.nCopies(1, "全民国家安全教育日"));
+      put("4-22", Arrays.asList("世界地球日", "列宁诞辰纪念日"));
+      put("4-23", Collections.nCopies(1, "世界读书日"));
+      put("4-24", Collections.nCopies(1, "中国航天日"));
+      put("4-25", Collections.nCopies(1, "儿童预防接种宣传日"));
+      put("4-26", Arrays.asList("世界知识产权日", "全国疟疾日"));
+      put("4-28", Collections.nCopies(1, "世界安全生产与健康日"));
+      put("4-30", Collections.nCopies(1, "全国交通安全反思日"));
+      put("5-2", Collections.nCopies(1, "世界金枪鱼日"));
       put("5-3", Collections.nCopies(1, "世界新闻自由日"));
       put("5-5", Collections.nCopies(1, "马克思诞辰纪念日"));
       put("5-8", Collections.nCopies(1, "世界红十字日"));
       put("5-11", Collections.nCopies(1, "世界肥胖日"));
+      put("5-12", Arrays.asList("全国防灾减灾日", "护士节"));
+      put("5-14", Collections.nCopies(1, "玫瑰情人节"));
+      put("5-15", Collections.nCopies(1, "国际家庭日"));
+      put("5-19", Collections.nCopies(1, "中国旅游日"));
+      put("5-20", Collections.nCopies(1, "网络情人节"));
+      put("5-22", Collections.nCopies(1, "国际生物多样性日"));
       put("5-25", Collections.nCopies(1, "525心理健康节"));
       put("5-27", Collections.nCopies(1, "上海解放日"));
+      put("5-29", Collections.nCopies(1, "国际维和人员日"));
+      put("5-30", Collections.nCopies(1, "中国五卅运动纪念日"));
       put("5-31", Collections.nCopies(1, "世界无烟日"));
+      put("6-3", Collections.nCopies(1, "世界自行车日"));
       put("6-5", Collections.nCopies(1, "世界环境日"));
       put("6-6", Collections.nCopies(1, "全国爱眼日"));
       put("6-8", Collections.nCopies(1, "世界海洋日"));
       put("6-11", Collections.nCopies(1, "中国人口日"));
-      put("6-14", Collections.nCopies(1, "世界献血日"));
+      put("6-14", Arrays.asList("世界献血日", "亲亲情人节"));
+      put("6-17", Collections.nCopies(1, "世界防治荒漠化与干旱日"));
+      put("6-20", Collections.nCopies(1, "世界难民日"));
+      put("6-21", Collections.nCopies(1, "国际瑜伽日"));
+      put("6-25", Collections.nCopies(1, "全国土地日"));
+      put("6-26", Arrays.asList("国际禁毒日", "联合国宪章日"));
       put("7-1", Collections.nCopies(1, "香港回归纪念日"));
-      put("7-7", Collections.nCopies(1, "中国人民抗日战争纪念日"));
-      put("7-11", Collections.nCopies(1, "世界人口日"));
+      put("7-6", Arrays.asList("国际接吻日", "朱德逝世纪念日"));
+      put("7-7", Collections.nCopies(1, "七七事变纪念日"));
+      put("7-11", Arrays.asList("世界人口日", "中国航海日"));
+      put("7-14", Collections.nCopies(1, "银色情人节"));
+      put("7-18", Collections.nCopies(1, "曼德拉国际日"));
+      put("7-30", Collections.nCopies(1, "国际友谊日"));
+      put("8-3", Collections.nCopies(1, "男人节"));
       put("8-5", Collections.nCopies(1, "恩格斯逝世纪念日"));
       put("8-6", Collections.nCopies(1, "国际电影节"));
-      put("8-12", Collections.nCopies(1, "国际青年日"));
+      put("8-8", Collections.nCopies(1, "全民健身日"));
+      put("8-9", Collections.nCopies(1, "国际土著人日"));
+      put("8-12", Collections.nCopies(1, "国际青年节"));
+      put("8-14", Collections.nCopies(1, "绿色情人节"));
+      put("8-19", Arrays.asList("世界人道主义日", "中国医师节"));
       put("8-22", Collections.nCopies(1, "邓小平诞辰纪念日"));
+      put("8-29", Collections.nCopies(1, "全国测绘法宣传日"));
       put("9-3", Collections.nCopies(1, "中国抗日战争胜利纪念日"));
+      put("9-5", Collections.nCopies(1, "中华慈善日"));
       put("9-8", Collections.nCopies(1, "世界扫盲日"));
-      put("9-9", Collections.nCopies(1, "毛泽东逝世纪念日"));
-      put("9-14", Collections.nCopies(1, "世界清洁地球日"));
+      put("9-9", Arrays.asList("毛泽东逝世纪念日", "全国拒绝酒驾日"));
+      put("9-14", Arrays.asList("世界清洁地球日", "相片情人节"));
+      put("9-15", Collections.nCopies(1, "国际民主日"));
+      put("9-16", Collections.nCopies(1, "国际臭氧层保护日"));
+      put("9-17", Collections.nCopies(1, "世界骑行日"));
       put("9-18", Collections.nCopies(1, "九一八事变纪念日"));
       put("9-20", Collections.nCopies(1, "全国爱牙日"));
       put("9-21", Collections.nCopies(1, "国际和平日"));
       put("9-27", Collections.nCopies(1, "世界旅游日"));
+      put("9-30", Collections.nCopies(1, "中国烈士纪念日"));
+      put("10-1", Collections.nCopies(1, "国际老年人日"));
+      put("10-2", Collections.nCopies(1, "国际非暴力日"));
       put("10-4", Collections.nCopies(1, "世界动物日"));
+      put("10-11", Collections.nCopies(1, "国际女童日"));
       put("10-10", Collections.nCopies(1, "辛亥革命纪念日"));
-      put("10-13", Collections.nCopies(1, "中国少年先锋队诞辰日"));
+      put("10-13", Arrays.asList("国际减轻自然灾害日", "中国少年先锋队诞辰日"));
+      put("10-14", Collections.nCopies(1, "葡萄酒情人节"));
+      put("10-16", Collections.nCopies(1, "世界粮食日"));
+      put("10-17", Collections.nCopies(1, "全国扶贫日"));
+      put("10-20", Collections.nCopies(1, "世界统计日"));
+      put("10-24", Arrays.asList("世界发展信息日", "程序员节"));
       put("10-25", Collections.nCopies(1, "抗美援朝纪念日"));
+      put("11-5", Collections.nCopies(1, "世界海啸日"));
+      put("11-8", Collections.nCopies(1, "记者节"));
+      put("11-9", Collections.nCopies(1, "全国消防日"));
+      put("11-11", Collections.nCopies(1, "光棍节"));
       put("11-12", Collections.nCopies(1, "孙中山诞辰纪念日"));
+      put("11-14", Collections.nCopies(1, "电影情人节"));
+      put("11-16", Collections.nCopies(1, "国际宽容日"));
       put("11-17", Collections.nCopies(1, "国际大学生节"));
+      put("11-19", Collections.nCopies(1, "世界厕所日"));
       put("11-28", Collections.nCopies(1, "恩格斯诞辰纪念日"));
+      put("11-29", Collections.nCopies(1, "国际声援巴勒斯坦人民日"));
       put("12-1", Collections.nCopies(1, "世界艾滋病日"));
+      put("12-2", Collections.nCopies(1, "全国交通安全日"));
+      put("12-3", Collections.nCopies(1, "世界残疾人日"));
+      put("12-4", Collections.nCopies(1, "全国法制宣传日"));
+      put("12-5", Arrays.asList("世界弱能人士日", "国际志愿人员日"));
+      put("12-7", Collections.nCopies(1, "国际民航日"));
+      put("12-9", Arrays.asList("世界足球日", "国际反腐败日"));
+      put("12-10", Collections.nCopies(1, "世界人权日"));
+      put("12-11", Collections.nCopies(1, "国际山岳日"));
       put("12-12", Collections.nCopies(1, "西安事变纪念日"));
       put("12-13", Collections.nCopies(1, "国家公祭日"));
+      put("12-14", Collections.nCopies(1, "拥抱情人节"));
+      put("12-18", Collections.nCopies(1, "国际移徙者日"));
       put("12-26", Collections.nCopies(1, "毛泽东诞辰纪念日"));
     }
   };

src/test/java/test/FotoTest.java

@@ -5,6 +5,9 @@ import com.nlf.calendar.Lunar;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 佛历测试
  *
@@ -28,4 +31,12 @@ public class FotoTest {
     Assert.assertEquals("青龙", foto.getShou());
   }
 
+  @Test
+  public void test2() {
+    Foto foto = Foto.fromLunar(Lunar.fromYmd(2021, 3, 16));
+    List<String> expected = new ArrayList<String>();
+    expected.add("准提菩萨圣诞");
+    Assert.assertEquals(expected, foto.getOtherFestivals());
+  }
+
 }

src/test/java/test/LunarMonthTest.java

@@ -0,0 +1,56 @@
+package test;
+
+import com.nlf.calendar.LunarMonth;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 农历月测试
+ *
+ * @author 6tail
+ */
+public class LunarMonthTest {
+
+  @Test
+  public void test(){
+    LunarMonth month = LunarMonth.fromYm(2023, 1);
+    Assert.assertEquals(1, month.getIndex());
+    Assert.assertEquals("甲寅", month.getGanZhi());
+  }
+
+  @Test
+  public void test1(){
+    LunarMonth month = LunarMonth.fromYm(2023, -2);
+    Assert.assertEquals(3, month.getIndex());
+    Assert.assertEquals("丙辰", month.getGanZhi());
+  }
+
+  @Test
+  public void test2(){
+    LunarMonth month = LunarMonth.fromYm(2023, 3);
+    Assert.assertEquals(4, month.getIndex());
+    Assert.assertEquals("丁巳", month.getGanZhi());
+  }
+
+  @Test
+  public void test3(){
+    LunarMonth month = LunarMonth.fromYm(2024, 1);
+    Assert.assertEquals(1, month.getIndex());
+    Assert.assertEquals("丙寅", month.getGanZhi());
+  }
+
+  @Test
+  public void test4(){
+    LunarMonth month = LunarMonth.fromYm(2023, 12);
+    Assert.assertEquals(13, month.getIndex());
+    Assert.assertEquals("丙寅", month.getGanZhi());
+  }
+
+  @Test
+  public void test5(){
+    LunarMonth month = LunarMonth.fromYm(2022, 1);
+    Assert.assertEquals(1, month.getIndex());
+    Assert.assertEquals("壬寅", month.getGanZhi());
+  }
+
+}