v1.4.0 修复九星错别字；优化每日宜忌算法；去除每日宜忌的重复项。

CHANGELOG.md

@@ -11,3 +11,11 @@
 
 ## [1.3.14] - 2024-03-17
 1. 修复八字转阳历存在遗漏的问题。
+
+## [1.3.15] - 2024-11-12
+1. 新增2025年法定假日数据。
+
+## [1.4.0] - 2025-02-06
+1. 修复九星错别字。
+2. 优化每日宜忌算法。
+3. 去除每日宜忌的重复项。

README.md

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

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.14</version>
+    <version>1.4.0</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>
@@ -104,6 +104,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
+                            <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
                             <additionalparam>-Xdoclint:none</additionalparam>
                             <source>${source-version}</source>
                         </configuration>

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

@@ -18,7 +18,7 @@ public class NineStar {
   /**
    * 七色
    */
-  public static final String[] COLOR = {"白", "黒", "碧", "绿", "黄", "白", "赤", "白", "紫"};
+  public static final String[] COLOR = {"白", "黑", "碧", "绿", "黄", "白", "赤", "白", "紫"};
 
   /**
    * 五行

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

@@ -89,9 +89,13 @@ public class Solar {
     if (month < 1 || month > 12) {
       throw new IllegalArgumentException(String.format("wrong month %d", month));
     }
-    if (day < 1 || day > 31) {
+    if (day < 1) {
       throw new IllegalArgumentException(String.format("wrong day %d", day));
     }
+    int days = SolarUtil.getDaysOfMonth(year, month);
+    if (day > days) {
+      throw new IllegalArgumentException(String.format("only %d days in solar year %d month %d", days, year, month));
+    }
     if (hour < 0 || hour > 23) {
       throw new IllegalArgumentException(String.format("wrong hour %d", hour));
     }

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

@@ -9,7 +9,7 @@ import com.nlf.calendar.util.LunarUtil;
  */
 public class LiuYue {
   /**
-   * 序数，0-9
+   * 序数，0-11
    */
   private final int index;
 

src/test/java/test/LunarTest.java

@@ -7,8 +7,7 @@ import org.junit.Test;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.TimeZone;
 
 /**
  * 农历测试
@@ -409,7 +408,7 @@ public class LunarTest {
     Lunar lunar = solar.getLunar();
     Assert.assertEquals("甲辰", lunar.getMonthInGanZhi());
     Assert.assertEquals("癸卯", lunar.getMonthInGanZhiExact());
-    Assert.assertEquals(4, lunar.getDayJi().size());
+    Assert.assertEquals("[出火, 入宅, 安葬, 伐木]", lunar.getDayJi().toString());
   }
 
   @Test

src/test/java/test/NineStarTest.java

@@ -56,7 +56,7 @@ public class NineStarTest {
     @Test
     public void test8() {
         LunarMonth m = LunarMonth.fromYm(2022, 1);
-        Assert.assertEquals("二黒土天璇", m.getNineStar().toString());
+        Assert.assertEquals("二黑土天璇", m.getNineStar().toString());
     }
 
     @Test
@@ -77,4 +77,12 @@ public class NineStarTest {
         Assert.assertEquals("七赤金摇光", d.getTimeNineStar().toString());
     }
 
+    @Test
+    public void test12() {
+        LunarMonth m = LunarMonth.fromYm(2024, 11);
+        Assert.assertEquals("四绿木天权", m.getNineStar().toString());
+        m = LunarMonth.fromYm(2024, 12);
+        Assert.assertEquals("三碧木天玑", m.getNineStar().toString());
+    }
+
 }