diff --git a/CHANGELOG.md b/CHANGELOG.md index f61fcf0..70c2c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,3 +36,6 @@ ## [1.7.3] - 2025-04-07 1. 修复个别日太岁方位的错误。 2. 修复八字身宫计算错误的问题。 + +## [1.7.4] - 2025-04-29 +1. 修复身宫报错的问题。 diff --git a/README.md b/README.md index cd0f7af..b01b118 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历) cn.6tail lunar - 1.7.3 + 1.7.4 ``` diff --git a/README_EN.md b/README_EN.md index 78a792e..1abeb17 100644 --- a/README_EN.md +++ b/README_EN.md @@ -12,7 +12,7 @@ lunar is a calendar library for Solar and Chinese Lunar. cn.6tail lunar - 1.7.3 + 1.7.4 ``` diff --git a/pom.xml b/pom.xml index e3541e8..8ae4734 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.6tail lunar jar - 1.7.3 + 1.7.4 ${project.groupId}:${project.artifactId} https://github.com/6tail/lunar-java a calendar library for Solar and Chinese Lunar diff --git a/src/main/java/com/nlf/calendar/EightChar.java b/src/main/java/com/nlf/calendar/EightChar.java index ca464c0..4366139 100644 --- a/src/main/java/com/nlf/calendar/EightChar.java +++ b/src/main/java/com/nlf/calendar/EightChar.java @@ -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]; } /**