diff --git a/README.md b/README.md index 2415e01..49f86f8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历) cn.6tail lunar - 1.3.6 + 1.3.7 ``` diff --git a/README_EN.md b/README_EN.md index 33233b0..7631ae3 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.3.6 + 1.3.7 ``` diff --git a/pom.xml b/pom.xml index 65724b0..cbeb8d1 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.6tail lunar jar - 1.3.6 + 1.3.7 ${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 efbba81..a60f239 100644 --- a/src/main/java/com/nlf/calendar/EightChar.java +++ b/src/main/java/com/nlf/calendar/EightChar.java @@ -152,7 +152,7 @@ private List getShiShenZhi(String zhi) { List hideGan = LunarUtil.ZHI_HIDE_GAN.get(zhi); List l = new ArrayList(hideGan.size()); for (String gan : hideGan) { - l.add(LunarUtil.SHI_SHEN_ZHI.get(getDayGan() + zhi + gan)); + l.add(LunarUtil.SHI_SHEN_ZHI.get(getDayGan() + gan)); } return l; } diff --git a/src/main/java/com/nlf/calendar/util/HolidayUtil.java b/src/main/java/com/nlf/calendar/util/HolidayUtil.java index b6d4573..9c42819 100644 --- a/src/main/java/com/nlf/calendar/util/HolidayUtil.java +++ b/src/main/java/com/nlf/calendar/util/HolidayUtil.java @@ -22,7 +22,7 @@ public class HolidayUtil { /** 默认节假日名称（元旦0，春节1，清明2，劳动3，端午4，中秋5，国庆6，国庆中秋7，抗战胜利日8） */ public static final String[] NAMES = {"元旦节","春节","清明节","劳动节","端午节","中秋节","国庆节","国庆中秋","抗战胜利日"}; /** 默认节假日数据，日期YYYYMMDD+名称下标+是否调休+对应节日YYYYMMDD */ - private static final String DATA = "200112290020020101200112300020020101200201010120020101200201020120020101200201030120020101200202091020020212200202101020020212200202121120020212200202131120020212200202141120020212200202151120020212200202161120020212200202171120020212200202181120020212200204273020020501200204283020020501200205013120020501200205023120020501200205033120020501200205043120020501200205053120020501200205063120020501200205073120021001200209286020021001200209296020021001200210016120021001200210026120021001200210036120021001200210046120021001200210056120021001200210066120021001200210076120021001200301010120030101200302011120030201200302021120030201200302031120030201200302041120030201200302051120030201200302061120030201200302071120030201200302081020030201200302091020030201200304263020030501200304273020030501200305013120030501200305023120030501200305033120030501200305043120030501200305053120030501200305063120030501200305073120031001200309276020031001200309286020031001200310016120031001200310026120031001200310036120031001200310046120031001200310056120031001200310066120031001200310076120031001200401010120040101200401171020040122200401181020040122200401221120040122200401231120040122200401241120040122200401251120040122200401261120040122200401271120040122200401281120040122200405013120040501200405023120040501200405033120040501200405043120040501200405053120040501200405063120040501200405073120041001200405083020040501200405093020040501200410016120041001200410026120041001200410036120041001200410046120041001200410056120041001200410066120041001200410076120041001200410096020041001200410106020041001200501010120050101200501020120050101200501030120050101200502051020050209200502061020050209200502091120050209200502101120050209200502111120050209200502121120050209200502131120050209200502141120050209200502151120050209200504303020050501200505013120050501200505023120050501200505033120050501200505043120050501200505053120050501200505063120050501200505073120051001200505083020050501200510016120051001200510026120051001200510036120051001200510046120051001200510056120051001200510066120051001200510076120051001200510086020051001200510096020051001200512310020060101200601010120060101200601020120060101200601030120060101200601281020060129200601291120060129200601301120060129200601311120060129200602011120060129200602021120060129200602031120060129200602041120060129200602051020060129200604293020060501200604303020060501200605013120060501200605023120060501200605033120060501200605043120060501200605053120060501200605063120060501200605073120061001200609306020061001200610016120061001200610026120061001200610036120061001200610046120061001200610056120061001200610066120061001200610076120061001200610086020061001200612300020070101200612310020070101200701010120070101200701020120070101200701030120070101200702171020070218200702181120070218200702191120070218200702201120070218200702211120070218200702221120070218200702231120070218200702241120070218200702251020070218200704283020070501200704293020070501200705013120070501200705023120070501200705033120070501200705043120070501200705053120070501200705063120070501200705073120070501200709296020071001200709306020071001200710016120071001200710026120071001200710036120071001200710046120071001200710056120071001200710066120071001200710076120071001200712290020080101200712300120080101200712310120080101200801010120080101200802021020080206200802031020080206200802061120080206200802071120080206200802081120080206200802091120080206200802101120080206200802111120080206200802121120080206200804042120080404200804052120080404200804062120080404200805013120080501200805023120080501200805033120080501200805043020080501200806074120080608200806084120080608200806094120080608200809135120080914200809145120080914200809155120080914200809276020081001200809286020081001200809296120081001200809306120081001200810016120081001200810026120081001200810036120081001200810046120081001200810056120081001200901010120090101200901020120090101200901030120090101200901040020090101200901241020090125200901251120090125200901261120090125200901271120090125200901281120090125200901291120090125200901301120090125200901311120090125200902011020090125200904042120090404200904052120090404200904062120090404200905013120090501200905023120090501200905033120090501200905284120090528200905294120090528200905304120090528200905314020090528200909276020091001200910016120091001200910026120091001200910036120091001200910046120091001200910055120091003200910065120091003200910075120091003200910085120091003200910105020091003201001010120100101201001020120100101201001030120100101201002131120100213201002141120100213201002151120100213201002161120100213201002171120100213201002181120100213201002191120100213201002201020100213201002211020100213201004032120100405201004042120100405201004052120100405201005013120100501201005023120100501201005033120100501201006124020100616201006134020100616201006144120100616201006154120100616201006164120100616201009195020100922201009225120100922201009235120100922201009245120100922201009255020100922201009266020101001201010016120101001201010026120101001201010036120101001201010046120101001201010056120101001201010066120101001201010076120101001201010096020101001201101010120110101201101020120110101201101030120110101201101301020110203201102021120110203201102031120110203201102041120110203201102051120110203201102061120110203201102071120110203201102081120110203201102121020110203201104022020110405201104032120110405201104042120110405201104052120110405201104303120110501201105013120110501201105023120110501201106044120110606201106054120110606201106064120110606201109105120110912201109115120110912201109125120110912201110016120111001201110026120111001201110036120111001201110046120111001201110056120111001201110066120111001201110076120111001201110086020111001201110096020111001201112310020120101201201010120120101201201020120120101201201030120120101201201211020120123201201221120120123201201231120120123201201241120120123201201251120120123201201261120120123201201271120120123201201281120120123201201291020120123201203312020120404201204012020120404201204022120120404201204032120120404201204042120120404201204283020120501201204293120120501201204303120120501201205013120120501201205023020120501201206224120120623201206234120120623201206244120120623201209295020120930201209305120120930201210016120121001201210026120121001201210036120121001201210046120121001201210056120121001201210066120121001201210076120121001201210086020121001201301010120130101201301020120130101201301030120130101201301050020130101201301060020130101201302091120130210201302101120130210201302111120130210201302121120130210201302131120130210201302141120130210201302151120130210201302161020130210201302171020130210201304042120130404201304052120130404201304062120130404201304273020130501201304283020130501201304293120130501201304303120130501201305013120130501201306084020130612201306094020130612201306104120130612201306114120130612201306124120130612201309195120130919201309205120130919201309215120130919201309225020130919201309296020131001201310016120131001201310026120131001201310036120131001201310046120131001201310056120131001201310066120131001201310076120131001201401010120140101201401261020140131201401311120140131201402011120140131201402021120140131201402031120140131201402041120140131201402051120140131201402061120140131201402081020140131201404052120140405201404062120140405201404072120140405201405013120140501201405023120140501201405033120140501201405043020140501201405314120140602201406014120140602201406024120140602201409065120140908201409075120140908201409085120140908201409286020141001201410016120141001201410026120141001201410036120141001201410046120141004201410056120141001201410066120141001201410076120141001201410116020141001201501010120150101201501020120150101201501030120150101201501040020150101201502151020150219201502181120150219201502191120150219201502201120150219201502211120150219201502221120150219201502231120150219201502241120150219201502281020150219201504042120150405201504052120150405201504062120150405201505013120150501201505023120150501201505033120150501201506204120150620201506214120150620201506224120150620201509038120150903201509048120150903201509058120150903201509068020150903201509265120150927201509275120150927201510016120151001201510026120151001201510036120151001201510046120151004201510056120151001201510066120151001201510076120151001201510106020151001201601010120160101201601020120160101201601030120160101201602061020160208201602071120160208201602081120160208201602091120160208201602101120160208201602111120160208201602121120160208201602131120160208201602141020160208201604022120160404201604032120160404201604042120160404201604303120160501201605013120160501201605023120160501201606094120160609201606104120160609201606114120160609201606124020160609201609155120160915201609165120160915201609175120160915201609185020160915201610016120161001201610026120161001201610036120161001201610046120161001201610056120161001201610066120161001201610076120161001201610086020161001201610096020161001201612310120170101201701010120170101201701020120170101201701221020170128201701271120170128201701281120170128201701291120170128201701301120170128201701311120170128201702011120170128201702021120170128201702041020170128201704012020170404201704022120170404201704032120170404201704042120170404201704293120170501201704303120170501201705013120170501201705274020170530201705284120170530201705294120170530201705304120170530201709306020171001201710016120171001201710026120171001201710036120171001201710045120171004201710056120171001201710066120171001201710076120171001201710086120171001201712300120180101201712310120180101201801010120180101201802111020180216201802151120180216201802161120180216201802171120180216201802181120180216201802191120180216201802201120180216201802211120180216201802241020180216201804052120180405201804062120180405201804072120180405201804082020180405201804283020180501201804293120180501201804303120180501201805013120180501201806164120180618201806174120180618201806184120180618201809225120180924201809235120180924201809245120180924201809296020181001201809306020181001201810016120181001201810026120181001201810036120181001201810046120181001201810056120181001201810066120181001201810076120181001201812290020190101201812300120190101201812310120190101201901010120190101201902021020190205201902031020190205201902041120190205201902051120190205201902061120190205201902071120190205201902081120190205201902091120190205201902101120190205201904052120190405201904062120190405201904072120190405201904283020190501201905013120190501201905023120190501201905033120190501201905043120190501201905053020190501201906074120190607201906084120190607201906094120190607201909135120190913201909145120190913201909155120190913201909296020191001201910016120191001201910026120191001201910036120191001201910046120191001201910056120191001201910066120191001201910076120191001201910126020191001202001010120200101202001191020200125202001241120200125202001251120200125202001261120200125202001271120200125202001281120200125202001291120200125202001301120200125202001311120200125202002011120200125202002021120200125202004042120200404202004052120200404202004062120200404202004263020200501202005013120200501202005023120200501202005033120200501202005043120200501202005053120200501202005093020200501202006254120200625202006264120200625202006274120200625202006284020200625202009277020201001202010017120201001202010026120201001202010036120201001202010046120201001202010056120201001202010066120201001202010076120201001202010086120201001202010106020201001202101010120210101202101020120210101202101030120210101202102071020210212202102111120210212202102121120210212202102131120210212202102141120210212202102151120210212202102161120210212202102171120210212202102201020210212202104032120210404202104042120210404202104052120210404202104253020210501202105013120210501202105023120210501202105033120210501202105043120210501202105053120210501202105083020210501202106124120210614202106134120210614202106144120210614202109185020210921202109195120210921202109205120210921202109215120210921202109266020211001202110016120211001202110026120211001202110036120211001202110046120211001202110056120211001202110066120211001202110076120211001202110096020211001202201010120220101202201020120220101202201030120220101202201291020220201202201301020220201202201311120220201202202011120220201202202021120220201202202031120220201202202041120220201202202051120220201202202061120220201202204022020220405202204032120220405202204042120220405202204052120220405202204243020220501202204303120220501202205013120220501202205023120220501202205033120220501202205043120220501202205073020220501202206034120220603202206044120220603202206054120220603202209105120220910202209115120220910202209125120220910202210016120221001202210026120221001202210036120221001202210046120221001202210056120221001202210066120221001202210076120221001202210086020221001202210096020221001202212310120230101202301010120230101202301020120230101202301211120230122202301221120230122202301231120230122202301241120230122202301251120230122202301261120230122202301271120230122202301281020230122202301291020230122202304052120230405202304233020230501202304293120230501202304303120230501202305013120230501202305023120230501202305033120230501202305063020230501202306224120230622202306234120230622202306244120230622202306254020230622202309295120230929202309306120231001202310016120231001202310026120231001202310036120231001202310046120231001202310056120231001202310066120231001202310076020231001202310086020231001"; + private static final String DATA = "200112290020020101200112300020020101200201010120020101200201020120020101200201030120020101200202091020020212200202101020020212200202121120020212200202131120020212200202141120020212200202151120020212200202161120020212200202171120020212200202181120020212200204273020020501200204283020020501200205013120020501200205023120020501200205033120020501200205043120020501200205053120020501200205063120020501200205073120021001200209286020021001200209296020021001200210016120021001200210026120021001200210036120021001200210046120021001200210056120021001200210066120021001200210076120021001200301010120030101200302011120030201200302021120030201200302031120030201200302041120030201200302051120030201200302061120030201200302071120030201200302081020030201200302091020030201200304263020030501200304273020030501200305013120030501200305023120030501200305033120030501200305043120030501200305053120030501200305063120030501200305073120031001200309276020031001200309286020031001200310016120031001200310026120031001200310036120031001200310046120031001200310056120031001200310066120031001200310076120031001200401010120040101200401171020040122200401181020040122200401221120040122200401231120040122200401241120040122200401251120040122200401261120040122200401271120040122200401281120040122200405013120040501200405023120040501200405033120040501200405043120040501200405053120040501200405063120040501200405073120041001200405083020040501200405093020040501200410016120041001200410026120041001200410036120041001200410046120041001200410056120041001200410066120041001200410076120041001200410096020041001200410106020041001200501010120050101200501020120050101200501030120050101200502051020050209200502061020050209200502091120050209200502101120050209200502111120050209200502121120050209200502131120050209200502141120050209200502151120050209200504303020050501200505013120050501200505023120050501200505033120050501200505043120050501200505053120050501200505063120050501200505073120051001200505083020050501200510016120051001200510026120051001200510036120051001200510046120051001200510056120051001200510066120051001200510076120051001200510086020051001200510096020051001200512310020060101200601010120060101200601020120060101200601030120060101200601281020060129200601291120060129200601301120060129200601311120060129200602011120060129200602021120060129200602031120060129200602041120060129200602051020060129200604293020060501200604303020060501200605013120060501200605023120060501200605033120060501200605043120060501200605053120060501200605063120060501200605073120061001200609306020061001200610016120061001200610026120061001200610036120061001200610046120061001200610056120061001200610066120061001200610076120061001200610086020061001200612300020070101200612310020070101200701010120070101200701020120070101200701030120070101200702171020070218200702181120070218200702191120070218200702201120070218200702211120070218200702221120070218200702231120070218200702241120070218200702251020070218200704283020070501200704293020070501200705013120070501200705023120070501200705033120070501200705043120070501200705053120070501200705063120070501200705073120070501200709296020071001200709306020071001200710016120071001200710026120071001200710036120071001200710046120071001200710056120071001200710066120071001200710076120071001200712290020080101200712300120080101200712310120080101200801010120080101200802021020080206200802031020080206200802061120080206200802071120080206200802081120080206200802091120080206200802101120080206200802111120080206200802121120080206200804042120080404200804052120080404200804062120080404200805013120080501200805023120080501200805033120080501200805043020080501200806074120080608200806084120080608200806094120080608200809135120080914200809145120080914200809155120080914200809276020081001200809286020081001200809296120081001200809306120081001200810016120081001200810026120081001200810036120081001200810046120081001200810056120081001200901010120090101200901020120090101200901030120090101200901040020090101200901241020090125200901251120090125200901261120090125200901271120090125200901281120090125200901291120090125200901301120090125200901311120090125200902011020090125200904042120090404200904052120090404200904062120090404200905013120090501200905023120090501200905033120090501200905284120090528200905294120090528200905304120090528200905314020090528200909276020091001200910016120091001200910026120091001200910036120091001200910046120091001200910055120091003200910065120091003200910075120091003200910085120091003200910105020091003201001010120100101201001020120100101201001030120100101201002131120100213201002141120100213201002151120100213201002161120100213201002171120100213201002181120100213201002191120100213201002201020100213201002211020100213201004032120100405201004042120100405201004052120100405201005013120100501201005023120100501201005033120100501201006124020100616201006134020100616201006144120100616201006154120100616201006164120100616201009195020100922201009225120100922201009235120100922201009245120100922201009255020100922201009266020101001201010016120101001201010026120101001201010036120101001201010046120101001201010056120101001201010066120101001201010076120101001201010096020101001201101010120110101201101020120110101201101030120110101201101301020110203201102021120110203201102031120110203201102041120110203201102051120110203201102061120110203201102071120110203201102081120110203201102121020110203201104022020110405201104032120110405201104042120110405201104052120110405201104303120110501201105013120110501201105023120110501201106044120110606201106054120110606201106064120110606201109105120110912201109115120110912201109125120110912201110016120111001201110026120111001201110036120111001201110046120111001201110056120111001201110066120111001201110076120111001201110086020111001201110096020111001201112310020120101201201010120120101201201020120120101201201030120120101201201211020120123201201221120120123201201231120120123201201241120120123201201251120120123201201261120120123201201271120120123201201281120120123201201291020120123201203312020120404201204012020120404201204022120120404201204032120120404201204042120120404201204283020120501201204293120120501201204303120120501201205013120120501201205023020120501201206224120120623201206234120120623201206244120120623201209295020120930201209305120120930201210016120121001201210026120121001201210036120121001201210046120121001201210056120121001201210066120121001201210076120121001201210086020121001201301010120130101201301020120130101201301030120130101201301050020130101201301060020130101201302091120130210201302101120130210201302111120130210201302121120130210201302131120130210201302141120130210201302151120130210201302161020130210201302171020130210201304042120130404201304052120130404201304062120130404201304273020130501201304283020130501201304293120130501201304303120130501201305013120130501201306084020130612201306094020130612201306104120130612201306114120130612201306124120130612201309195120130919201309205120130919201309215120130919201309225020130919201309296020131001201310016120131001201310026120131001201310036120131001201310046120131001201310056120131001201310066120131001201310076120131001201401010120140101201401261020140131201401311120140131201402011120140131201402021120140131201402031120140131201402041120140131201402051120140131201402061120140131201402081020140131201404052120140405201404062120140405201404072120140405201405013120140501201405023120140501201405033120140501201405043020140501201405314120140602201406014120140602201406024120140602201409065120140908201409075120140908201409085120140908201409286020141001201410016120141001201410026120141001201410036120141001201410046120141004201410056120141001201410066120141001201410076120141001201410116020141001201501010120150101201501020120150101201501030120150101201501040020150101201502151020150219201502181120150219201502191120150219201502201120150219201502211120150219201502221120150219201502231120150219201502241120150219201502281020150219201504042120150405201504052120150405201504062120150405201505013120150501201505023120150501201505033120150501201506204120150620201506214120150620201506224120150620201509038120150903201509048120150903201509058120150903201509068020150903201509265120150927201509275120150927201510016120151001201510026120151001201510036120151001201510046120151004201510056120151001201510066120151001201510076120151001201510106020151001201601010120160101201601020120160101201601030120160101201602061020160208201602071120160208201602081120160208201602091120160208201602101120160208201602111120160208201602121120160208201602131120160208201602141020160208201604022120160404201604032120160404201604042120160404201604303120160501201605013120160501201605023120160501201606094120160609201606104120160609201606114120160609201606124020160609201609155120160915201609165120160915201609175120160915201609185020160915201610016120161001201610026120161001201610036120161001201610046120161001201610056120161001201610066120161001201610076120161001201610086020161001201610096020161001201612310120170101201701010120170101201701020120170101201701221020170128201701271120170128201701281120170128201701291120170128201701301120170128201701311120170128201702011120170128201702021120170128201702041020170128201704012020170404201704022120170404201704032120170404201704042120170404201704293120170501201704303120170501201705013120170501201705274020170530201705284120170530201705294120170530201705304120170530201709306020171001201710016120171001201710026120171001201710036120171001201710045120171004201710056120171001201710066120171001201710076120171001201710086120171001201712300120180101201712310120180101201801010120180101201802111020180216201802151120180216201802161120180216201802171120180216201802181120180216201802191120180216201802201120180216201802211120180216201802241020180216201804052120180405201804062120180405201804072120180405201804082020180405201804283020180501201804293120180501201804303120180501201805013120180501201806164120180618201806174120180618201806184120180618201809225120180924201809235120180924201809245120180924201809296020181001201809306020181001201810016120181001201810026120181001201810036120181001201810046120181001201810056120181001201810066120181001201810076120181001201812290020190101201812300120190101201812310120190101201901010120190101201902021020190205201902031020190205201902041120190205201902051120190205201902061120190205201902071120190205201902081120190205201902091120190205201902101120190205201904052120190405201904062120190405201904072120190405201904283020190501201905013120190501201905023120190501201905033120190501201905043120190501201905053020190501201906074120190607201906084120190607201906094120190607201909135120190913201909145120190913201909155120190913201909296020191001201910016120191001201910026120191001201910036120191001201910046120191001201910056120191001201910066120191001201910076120191001201910126020191001202001010120200101202001191020200125202001241120200125202001251120200125202001261120200125202001271120200125202001281120200125202001291120200125202001301120200125202001311120200125202002011120200125202002021120200125202004042120200404202004052120200404202004062120200404202004263020200501202005013120200501202005023120200501202005033120200501202005043120200501202005053120200501202005093020200501202006254120200625202006264120200625202006274120200625202006284020200625202009277020201001202010017120201001202010026120201001202010036120201001202010046120201001202010056120201001202010066120201001202010076120201001202010086120201001202010106020201001202101010120210101202101020120210101202101030120210101202102071020210212202102111120210212202102121120210212202102131120210212202102141120210212202102151120210212202102161120210212202102171120210212202102201020210212202104032120210404202104042120210404202104052120210404202104253020210501202105013120210501202105023120210501202105033120210501202105043120210501202105053120210501202105083020210501202106124120210614202106134120210614202106144120210614202109185020210921202109195120210921202109205120210921202109215120210921202109266020211001202110016120211001202110026120211001202110036120211001202110046120211001202110056120211001202110066120211001202110076120211001202110096020211001202201010120220101202201020120220101202201030120220101202201291020220201202201301020220201202201311120220201202202011120220201202202021120220201202202031120220201202202041120220201202202051120220201202202061120220201202204022020220405202204032120220405202204042120220405202204052120220405202204243020220501202204303120220501202205013120220501202205023120220501202205033120220501202205043120220501202205073020220501202206034120220603202206044120220603202206054120220603202209105120220910202209115120220910202209125120220910202210016120221001202210026120221001202210036120221001202210046120221001202210056120221001202210066120221001202210076120221001202210086020221001202210096020221001202212310120230101202301010120230101202301020120230101202301211120230122202301221120230122202301231120230122202301241120230122202301251120230122202301261120230122202301271120230122202301281020230122202301291020230122202304052120230405202304233020230501202304293120230501202304303120230501202305013120230501202305023120230501202305033120230501202305063020230501202306224120230622202306234120230622202306244120230622202306254020230622202309295120230929202309306120231001202310016120231001202310026120231001202310036120231001202310046120231001202310056120231001202310066120231001202310076020231001202310086020231001202312300120240101202312310120240101202401010120240101202402041020240210202402101120240210202402111120240210202402121120240210202402131120240210202402141120240210202402151120240210202402161120240210202402171120240210202402181020240210202404042120240404202404052120240404202404062120240404202404072020240404202404283020240501202405013120240501202405023120240501202405033120240501202405043120240501202405053120240501202405113020240501202406084120240610202406094120240610202406104120240610202409145020240917202409155120240917202409165120240917202409175120240917202409296020241001202410016120241001202410026120241001202410036120241001202410046120241001202410056120241001202410066120241001202410076120241001202410126020241001"; /** 使用的节假日名称 */ private static String[] NAMES_IN_USE = NAMES; diff --git a/src/main/java/com/nlf/calendar/util/LunarUtil.java b/src/main/java/com/nlf/calendar/util/LunarUtil.java index 1f612ae..77a7a1e 100644 --- a/src/main/java/com/nlf/calendar/util/LunarUtil.java +++ b/src/main/java/com/nlf/calendar/util/LunarUtil.java @@ -709,286 +709,106 @@ public class LunarUtil{ public static final Map SHI_SHEN_ZHI = new HashMap() { private static final long serialVersionUID = -1; { - put("甲子癸","正印"); - put("甲丑癸","正印"); - put("甲丑己","正财"); - put("甲丑辛","正官"); - put("甲寅丙","食神"); - put("甲寅甲","比肩"); - put("甲寅戊","偏财"); - put("甲卯乙","劫财"); - put("甲辰乙","劫财"); - put("甲辰戊","偏财"); - put("甲辰癸","正印"); - put("甲巳戊","偏财"); - put("甲巳丙","食神"); - put("甲巳庚","七杀"); - put("甲午丁","伤官"); - put("甲午己","正财"); - put("甲未乙","劫财"); - put("甲未己","正财"); - put("甲未丁","伤官"); - put("甲申戊","偏财"); - put("甲申庚","七杀"); - put("甲申壬","偏印"); - put("甲酉辛","正官"); - put("甲戌辛","正官"); - put("甲戌戊","偏财"); - put("甲戌丁","伤官"); - put("甲亥壬","偏印"); - put("甲亥甲","比肩"); - put("乙子癸","偏印"); - put("乙丑癸","偏印"); - put("乙丑己","偏财"); - put("乙丑辛","七杀"); - put("乙寅丙","伤官"); - put("乙寅甲","劫财"); - put("乙寅戊","正财"); - put("乙卯乙","比肩"); - put("乙辰乙","比肩"); - put("乙辰戊","正财"); - put("乙辰癸","偏印"); - put("乙巳戊","正财"); - put("乙巳丙","伤官"); - put("乙巳庚","正官"); - put("乙午丁","食神"); - put("乙午己","偏财"); - put("乙未乙","比肩"); - put("乙未己","偏财"); - put("乙未丁","食神"); - put("乙申戊","正财"); - put("乙申庚","正官"); - put("乙申壬","正印"); - put("乙酉辛","七杀"); - put("乙戌辛","七杀"); - put("乙戌戊","正财"); - put("乙戌丁","食神"); - put("乙亥壬","正印"); - put("乙亥甲","劫财"); - put("丙子癸","正官"); - put("丙丑癸","正官"); - put("丙丑己","伤官"); - put("丙丑辛","正财"); - put("丙寅丙","比肩"); - put("丙寅甲","偏印"); - put("丙寅戊","食神"); - put("丙卯乙","正印"); - put("丙辰乙","正印"); - put("丙辰戊","食神"); - put("丙辰癸","正官"); - put("丙巳戊","食神"); - put("丙巳丙","比肩"); - put("丙巳庚","偏财"); - put("丙午丁","劫财"); - put("丙午己","伤官"); - put("丙未乙","正印"); - put("丙未己","伤官"); - put("丙未丁","劫财"); - put("丙申戊","食神"); - put("丙申庚","偏财"); - put("丙申壬","七杀"); - put("丙酉辛","正财"); - put("丙戌辛","正财"); - put("丙戌戊","食神"); - put("丙戌丁","劫财"); - put("丙亥壬","七杀"); - put("丙亥甲","偏印"); - put("丁子癸","七杀"); - put("丁丑癸","七杀"); - put("丁丑己","食神"); - put("丁丑辛","偏财"); - put("丁寅丙","劫财"); - put("丁寅甲","正印"); - put("丁寅戊","伤官"); - put("丁卯乙","偏印"); - put("丁辰乙","偏印"); - put("丁辰戊","伤官"); - put("丁辰癸","七杀"); - put("丁巳戊","伤官"); - put("丁巳丙","劫财"); - put("丁巳庚","正财"); - put("丁午丁","比肩"); - put("丁午己","食神"); - put("丁未乙","偏印"); - put("丁未己","食神"); - put("丁未丁","比肩"); - put("丁申戊","伤官"); - put("丁申庚","正财"); - put("丁申壬","正官"); - put("丁酉辛","偏财"); - put("丁戌辛","偏财"); - put("丁戌戊","伤官"); - put("丁戌丁","比肩"); - put("丁亥壬","正官"); - put("丁亥甲","正印"); - put("戊子癸","正财"); - put("戊丑癸","正财"); - put("戊丑己","劫财"); - put("戊丑辛","伤官"); - put("戊寅丙","偏印"); - put("戊寅甲","七杀"); - put("戊寅戊","比肩"); - put("戊卯乙","正官"); - put("戊辰乙","正官"); - put("戊辰戊","比肩"); - put("戊辰癸","正财"); - put("戊巳戊","比肩"); - put("戊巳丙","偏印"); - put("戊巳庚","食神"); - put("戊午丁","正印"); - put("戊午己","劫财"); - put("戊未乙","正官"); - put("戊未己","劫财"); - put("戊未丁","正印"); - put("戊申戊","比肩"); - put("戊申庚","食神"); - put("戊申壬","偏财"); - put("戊酉辛","伤官"); - put("戊戌辛","伤官"); - put("戊戌戊","比肩"); - put("戊戌丁","正印"); - put("戊亥壬","偏财"); - put("戊亥甲","七杀"); - put("己子癸","偏财"); - put("己丑癸","偏财"); - put("己丑己","比肩"); - put("己丑辛","食神"); - put("己寅丙","正印"); - put("己寅甲","正官"); - put("己寅戊","劫财"); - put("己卯乙","七杀"); - put("己辰乙","七杀"); - put("己辰戊","劫财"); - put("己辰癸","偏财"); - put("己巳戊","劫财"); - put("己巳丙","正印"); - put("己巳庚","伤官"); - put("己午丁","偏印"); - put("己午己","比肩"); - put("己未乙","七杀"); - put("己未己","比肩"); - put("己未丁","偏印"); - put("己申戊","劫财"); - put("己申庚","伤官"); - put("己申壬","正财"); - put("己酉辛","食神"); - put("己戌辛","食神"); - put("己戌戊","劫财"); - put("己戌丁","偏印"); - put("己亥壬","正财"); - put("己亥甲","正官"); - put("庚子癸","伤官"); - put("庚丑癸","伤官"); - put("庚丑己","正印"); - put("庚丑辛","劫财"); - put("庚寅丙","七杀"); - put("庚寅甲","偏财"); - put("庚寅戊","偏印"); - put("庚卯乙","正财"); - put("庚辰乙","正财"); - put("庚辰戊","偏印"); - put("庚辰癸","伤官"); - put("庚巳戊","偏印"); - put("庚巳丙","七杀"); - put("庚巳庚","比肩"); - put("庚午丁","正官"); - put("庚午己","正印"); - put("庚未乙","正财"); - put("庚未己","正印"); - put("庚未丁","正官"); - put("庚申戊","偏印"); - put("庚申庚","比肩"); - put("庚申壬","食神"); - put("庚酉辛","劫财"); - put("庚戌辛","劫财"); - put("庚戌戊","偏印"); - put("庚戌丁","正官"); - put("庚亥壬","食神"); - put("庚亥甲","偏财"); - put("辛子癸","食神"); - put("辛丑癸","食神"); - put("辛丑己","偏印"); - put("辛丑辛","比肩"); - put("辛寅丙","正官"); - put("辛寅甲","正财"); - put("辛寅戊","正印"); - put("辛卯乙","偏财"); - put("辛辰乙","偏财"); - put("辛辰戊","正印"); - put("辛辰癸","食神"); - put("辛巳戊","正印"); - put("辛巳丙","正官"); - put("辛巳庚","劫财"); - put("辛午丁","七杀"); - put("辛午己","偏印"); - put("辛未乙","偏财"); - put("辛未己","偏印"); - put("辛未丁","七杀"); - put("辛申戊","正印"); - put("辛申庚","劫财"); - put("辛申壬","伤官"); - put("辛酉辛","比肩"); - put("辛戌辛","比肩"); - put("辛戌戊","正印"); - put("辛戌丁","七杀"); - put("辛亥壬","伤官"); - put("辛亥甲","正财"); - put("壬子癸","劫财"); - put("壬丑癸","劫财"); - put("壬丑己","正官"); - put("壬丑辛","正印"); - put("壬寅丙","偏财"); - put("壬寅甲","食神"); - put("壬寅戊","七杀"); - put("壬卯乙","伤官"); - put("壬辰乙","伤官"); - put("壬辰戊","七杀"); - put("壬辰癸","劫财"); - put("壬巳戊","七杀"); - put("壬巳丙","偏财"); - put("壬巳庚","偏印"); - put("壬午丁","正财"); - put("壬午己","正官"); - put("壬未乙","伤官"); - put("壬未己","正官"); - put("壬未丁","正财"); - put("壬申戊","七杀"); - put("壬申庚","偏印"); - put("壬申壬","比肩"); - put("壬酉辛","正印"); - put("壬戌辛","正印"); - put("壬戌戊","七杀"); - put("壬戌丁","正财"); - put("壬亥壬","比肩"); - put("壬亥甲","食神"); - put("癸子癸","比肩"); - put("癸丑癸","比肩"); - put("癸丑己","七杀"); - put("癸丑辛","偏印"); - put("癸寅丙","正财"); - put("癸寅甲","伤官"); - put("癸寅戊","正官"); - put("癸卯乙","食神"); - put("癸辰乙","食神"); - put("癸辰戊","正官"); - put("癸辰癸","比肩"); - put("癸巳戊","正官"); - put("癸巳丙","正财"); - put("癸巳庚","正印"); - put("癸午丁","偏财"); - put("癸午己","七杀"); - put("癸未乙","食神"); - put("癸未己","七杀"); - put("癸未丁","偏财"); - put("癸申戊","正官"); - put("癸申庚","正印"); - put("癸申壬","劫财"); - put("癸酉辛","偏印"); - put("癸戌辛","偏印"); - put("癸戌戊","正官"); - put("癸戌丁","偏财"); - put("癸亥壬","劫财"); - put("癸亥甲","伤官"); + put("甲癸","正印"); + put("甲己","正财"); + put("甲辛","正官"); + put("甲丙","食神"); + put("甲甲","比肩"); + put("甲戊","偏财"); + put("甲乙","劫财"); + put("甲庚","七杀"); + put("甲丁","伤官"); + put("甲壬","偏印"); + put("乙癸","偏印"); + put("乙己","偏财"); + put("乙辛","七杀"); + put("乙丙","伤官"); + put("乙甲","劫财"); + put("乙戊","正财"); + put("乙乙","比肩"); + put("乙庚","正官"); + put("乙丁","食神"); + put("乙壬","正印"); + put("丙癸","正官"); + put("丙己","伤官"); + put("丙辛","正财"); + put("丙丙","比肩"); + put("丙甲","偏印"); + put("丙戊","食神"); + put("丙乙","正印"); + put("丙庚","偏财"); + put("丙丁","劫财"); + put("丙壬","七杀"); + put("丁癸","七杀"); + put("丁己","食神"); + put("丁辛","偏财"); + put("丁丙","劫财"); + put("丁甲","正印"); + put("丁戊","伤官"); + put("丁乙","偏印"); + put("丁庚","正财"); + put("丁丁","比肩"); + put("丁壬","正官"); + put("戊癸","正财"); + put("戊己","劫财"); + put("戊辛","伤官"); + put("戊丙","偏印"); + put("戊甲","七杀"); + put("戊戊","比肩"); + put("戊乙","正官"); + put("戊庚","食神"); + put("戊丁","正印"); + put("戊壬","偏财"); + put("己癸","偏财"); + put("己己","比肩"); + put("己辛","食神"); + put("己丙","正印"); + put("己甲","正官"); + put("己戊","劫财"); + put("己乙","七杀"); + put("己庚","伤官"); + put("己丁","偏印"); + put("己壬","正财"); + put("庚癸","伤官"); + put("庚己","正印"); + put("庚辛","劫财"); + put("庚丙","七杀"); + put("庚甲","偏财"); + put("庚戊","偏印"); + put("庚乙","正财"); + put("庚庚","比肩"); + put("庚丁","正官"); + put("庚壬","食神"); + put("辛癸","食神"); + put("辛己","偏印"); + put("辛辛","比肩"); + put("辛丙","正官"); + put("辛甲","正财"); + put("辛戊","正印"); + put("辛乙","偏财"); + put("辛庚","劫财"); + put("辛丁","七杀"); + put("辛壬","伤官"); + put("壬癸","劫财"); + put("壬己","正官"); + put("壬辛","正印"); + put("壬丙","偏财"); + put("壬甲","食神"); + put("壬戊","七杀"); + put("壬乙","伤官"); + put("壬庚","偏印"); + put("壬丁","正财"); + put("壬壬","比肩"); + put("癸癸","比肩"); + put("癸己","七杀"); + put("癸辛","偏印"); + put("癸丙","正财"); + put("癸甲","伤官"); + put("癸戊","正官"); + put("癸乙","食神"); + put("癸庚","正印"); + put("癸丁","偏财"); + put("癸壬","劫财"); } };