1
0
mirror of synced 2025-12-25 06:47:59 +08:00

v1.7.4 修复身宫报错的问题。

This commit is contained in:
6tail
2025-04-29 14:59:08 +08:00
parent 9a302e2a1a
commit 664af99ae0
5 changed files with 11 additions and 5 deletions

View File

@@ -36,3 +36,6 @@
## [1.7.3] - 2025-04-07
1. 修复个别日太岁方位的错误。
2. 修复八字身宫计算错误的问题。
## [1.7.4] - 2025-04-29
1. 修复身宫报错的问题。

View File

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

View File

@@ -12,7 +12,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
<dependency>
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<version>1.7.3</version>
<version>1.7.4</version>
</dependency>
```

View File

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

View File

@@ -527,12 +527,15 @@ public class EightChar {
public String getShenGong() {
int monthZhiIndex = LunarUtil.find(getMonthZhi(), MONTH_ZHI, 0);
int timeZhiIndex = LunarUtil.find(getTimeZhi(), LunarUtil.ZHI, 0);
int offset = (monthZhiIndex + timeZhiIndex - 1) % 12;
int offset = monthZhiIndex + timeZhiIndex;
if (offset > 12) {
offset -= 12;
}
int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + offset;
while (ganIndex > 10) {
ganIndex -= 10;
}
return LunarUtil.GAN[ganIndex + 1] + MONTH_ZHI[offset + 1];
return LunarUtil.GAN[ganIndex] + MONTH_ZHI[offset];
}
/**