diff --git a/pom.xml b/pom.xml index 28f710b..856f049 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.6tail lunar jar - 1.2.25 + 1.2.26 ${project.groupId}:${project.artifactId} https://github.com/6tail/lunar-java a calendar library for Solar and Chinese Lunar @@ -105,6 +105,7 @@ -Xdoclint:none + ${source-version} diff --git a/src/main/java/com/nlf/calendar/Lunar.java b/src/main/java/com/nlf/calendar/Lunar.java index 2c9d1c4..c8b142a 100644 --- a/src/main/java/com/nlf/calendar/Lunar.java +++ b/src/main/java/com/nlf/calendar/Lunar.java @@ -2990,7 +2990,11 @@ public class Lunar { } Solar startSolar = jieQi.getSolar(); int days = ExactDate.getDaysBetween(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay(), solar.getYear(), solar.getMonth(), solar.getDay()); - return LunarUtil.WU_HOU[(offset * 3 + days / 5) % LunarUtil.WU_HOU.length]; + int index = days / 5; + if (index > 2) { + index = 2; + } + return LunarUtil.WU_HOU[(offset * 3 + index) % LunarUtil.WU_HOU.length]; } /** diff --git a/src/test/java/test/WuHouTest.java b/src/test/java/test/WuHouTest.java index 4f86508..42db891 100644 --- a/src/test/java/test/WuHouTest.java +++ b/src/test/java/test/WuHouTest.java @@ -103,4 +103,18 @@ public class WuHouTest { Assert.assertEquals(solar.toString(),"小寒 初候",lunar.getHou()); } + @Test + public void test15(){ + Solar solar = new Solar(2022,8,22); + Lunar lunar = solar.getLunar(); + Assert.assertEquals(solar.toString(),"寒蝉鸣",lunar.getWuHou()); + } + + @Test + public void test16(){ + Solar solar = new Solar(2022,8,23); + Lunar lunar = solar.getLunar(); + Assert.assertEquals(solar.toString(),"鹰乃祭鸟",lunar.getWuHou()); + } + }