v1.2.7 修复儒略日转阳历秒数为60的错误。

6tail · Oct 20, 2021 · a783dbd · a783dbd
1 parent fc0a629
commit a783dbd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -10,35 +10,13 @@ lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)
 
 [English](https://github.com/6tail/lunar-java/blob/master/README_EN.md)
 
-### 正式版本
+### Maven
 
 ```xml
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.6</version>
-</dependency>
-```
-
-### 快照版本
-
-```xml
-<repository>
-  <id>sonatype</id>
-  <url>https://oss.sonatype.org/content/groups/public/</url>
-  <snapshots>
-    <enabled>true</enabled>
-    <updatePolicy>daily</updatePolicy>
-    <checksumPolicy>warn</checksumPolicy>
-  </snapshots>
-</repository>
-```
-
-```xml
-<dependency>
-  <groupId>cn.6tail</groupId>
-  <artifactId>lunar</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.7</version>
 </dependency>
 ```
 

diff --git a/README_EN.md b/README_EN.md
@@ -6,35 +6,13 @@ lunar is a calendar library for Solar and Chinese Lunar.
 
 [简体中文](https://github.com/6tail/lunar-java/blob/master/README.md)
 
-### Release
+### Maven
 
 ```xml
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.6</version>
-</dependency>
-```
-
-### Snapshot
-
-```xml
-<repository>
-  <id>sonatype</id>
-  <url>https://oss.sonatype.org/content/groups/public/</url>
-  <snapshots>
-    <enabled>true</enabled>
-    <updatePolicy>daily</updatePolicy>
-    <checksumPolicy>warn</checksumPolicy>
-  </snapshots>
-</repository>
-```
-
-```xml
-<dependency>
-  <groupId>cn.6tail</groupId>
-  <artifactId>lunar</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.7</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.6</version>
+    <version>1.2.7</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>

diff --git a/src/main/java/com/nlf/calendar/Solar.java b/src/main/java/com/nlf/calendar/Solar.java
@@ -156,6 +156,14 @@ public Solar(double julianDay) {
     f -= minute;
     f *= 60;
     int second = (int) Math.round(f);
+    if (second > 59) {
+      second -= 60;
+      minute++;
+    }
+    if (minute > 59) {
+      minute -= 60;
+      hour++;
+    }
 
     calendar = ExactDate.fromYmdHms(year, month, day, hour, minute, second);
     this.year = year;

diff --git a/src/test/java/test/JieQiTest.java b/src/test/java/test/JieQiTest.java
@@ -173,4 +173,17 @@ public void test() {
     Assert.assertEquals("冬至", lunar.getPrevQi().getName());
     Assert.assertEquals("冬至", lunar.getPrevJieQi().getName());
   }
+
+  @Test
+  public void test7() {
+    Lunar lunar = Lunar.fromYmd(2012, 9, 1);
+    Assert.assertEquals("2012-09-07 13:29:00", lunar.getJieQiTable().get("白露").toYmdHms());
+  }
+
+  @Test
+  public void test8() {
+    Lunar lunar = Lunar.fromYmd(2050, 12, 1);
+    Assert.assertEquals("2050-12-07 06:41:00", lunar.getJieQiTable().get("大雪").toYmdHms());
+  }
+
 }