v1.3.11 修复八字转阳历为空的问题；修复一处法定假日数据错误；十神优化；修复公历纪念日的一些错误。

6tail · Jan 3, 2024 · 694d032 · 694d032
1 parent 78ec8fd
commit 694d032
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 159 deletions.
diff --git a/demo.php b/demo.php
@@ -302,4 +302,21 @@
 $times = $lunar->getTimes();
 foreach ($times as $time) {
   echo $time->getPositionFuBySect(2) . "\n";
-}
+}
+
+$jinYear = 2023;
+$solar = Solar::fromYmdHms(2023, 11, 29, 0, 0, 0);
+$lunar = $solar->getLunar();
+$eightChar = $lunar->getEightChar();
+$yun = $eightChar->getYun(1);
+$dayuns = $yun->getDaYun();
+foreach ($dayuns as $dayun) {
+  $startYear = $dayun->getStartYear();
+  $endYear = $dayun->getEndYear();
+  echo $dayun->getGanZhi()." " .$startYear. " ". $endYear . "\n";
+  if ($jinYear >= $startYear && $jinYear <= $endYear) {
+    $dangQianDaYun = $dayun;
+  }
+}
+echo "\n";
+echo $dangQianDaYun->getGanZhi(). "\n";
diff --git a/src/EightChar.php b/src/EightChar.php
@@ -157,7 +157,7 @@ public function getYearNaYin()
    */
   public function getYearShiShenGan()
   {
-    return LunarUtil::$SHI_SHEN_GAN[$this->getDayGan() . $this->getYearGan()];
+    return LunarUtil::$SHI_SHEN[$this->getDayGan() . $this->getYearGan()];
   }
 
   /**
@@ -170,7 +170,7 @@ private function getShiShenZhi($zhi)
     $hideGan = LunarUtil::$ZHI_HIDE_GAN[$zhi];
     $l = array();
     foreach ($hideGan as $gan) {
-      $l[] = LunarUtil::$SHI_SHEN_ZHI[$this->getDayGan() . $gan];
+      $l[] = LunarUtil::$SHI_SHEN[$this->getDayGan() . $gan];
     }
     return $l;
   }
@@ -265,7 +265,7 @@ public function getMonthNaYin()
    */
   public function getMonthShiShenGan()
   {
-    return LunarUtil::$SHI_SHEN_GAN[$this->getDayGan() . $this->getMonthGan()];
+    return LunarUtil::$SHI_SHEN[$this->getDayGan() . $this->getMonthGan()];
   }
 
   /**
@@ -445,7 +445,7 @@ public function getTimeNaYin()
    */
   public function getTimeShiShenGan()
   {
-    return LunarUtil::$SHI_SHEN_GAN[$this->getDayGan() . $this->getTimeGan()];
+    return LunarUtil::$SHI_SHEN[$this->getDayGan() . $this->getTimeGan()];
   }
 
   /**

diff --git a/src/LunarYear.php b/src/LunarYear.php
@@ -248,7 +248,7 @@ private function compute()
       $this->jieQiJulianDays[] = $jd + Solar::$J2000;
     }
 
-    // 冬至前的初一，今年"首朔"的日月黄经差w
+    // 冬至前的初一，今年首朔的日月黄经差w
     $w = ShouXingUtil::calcShuo($jq[0]);
     if ($w > $jq[0]) {
       $w -= 29.53;

diff --git a/src/Solar.php b/src/Solar.php
@@ -202,7 +202,7 @@ public static function fromBaZiBySectAndBaseYear($yearGanZhi, $monthGanZhi, $day
     $l = array();
     $years = array();
     $today = self::fromDate(new DateTime());
-    $offsetYear = LunarUtil::getJiaZiIndex($today->getLunar()->getYearInGanZhiExact()) - LunarUtil::getJiaZiIndex($yearGanZhi);
+    $offsetYear = ($today->getYear() - 4) % 60  - LunarUtil::getJiaZiIndex($yearGanZhi);
     if ($offsetYear < 0) {
       $offsetYear += 60;
     }

diff --git a/src/util/HolidayUtil.php b/src/util/HolidayUtil.php
diff --git a/src/util/LunarUtil.php b/src/util/LunarUtil.php
@@ -559,7 +559,7 @@ class LunarUtil
     '癸亥' => '大海水'
   );
 
-  public static $SHI_SHEN_GAN = array(
+  public static $SHI_SHEN = array(
     '甲甲' => '比肩',
     '甲乙' => '劫财',
     '甲丙' => '食神',
@@ -662,109 +662,6 @@ class LunarUtil
     '癸庚' => '正印'
   );
 
-  public static $SHI_SHEN_ZHI = array(
-    '甲癸' => '正印',
-    '甲己' => '正财',
-    '甲辛' => '正官',
-    '甲丙' => '食神',
-    '甲甲' => '比肩',
-    '甲戊' => '偏财',
-    '甲乙' => '劫财',
-    '甲庚' => '七杀',
-    '甲丁' => '伤官',
-    '甲壬' => '偏印',
-    '乙癸' => '偏印',
-    '乙己' => '偏财',
-    '乙辛' => '七杀',
-    '乙丙' => '伤官',
-    '乙甲' => '劫财',
-    '乙戊' => '正财',
-    '乙乙' => '比肩',
-    '乙庚' => '正官',
-    '乙丁' => '食神',
-    '乙壬' => '正印',
-    '丙癸' => '正官',
-    '丙己' => '伤官',
-    '丙辛' => '正财',
-    '丙丙' => '比肩',
-    '丙甲' => '偏印',
-    '丙戊' => '食神',
-    '丙乙' => '正印',
-    '丙庚' => '偏财',
-    '丙丁' => '劫财',
-    '丙壬' => '七杀',
-    '丁癸' => '七杀',
-    '丁己' => '食神',
-    '丁辛' => '偏财',
-    '丁丙' => '劫财',
-    '丁甲' => '正印',
-    '丁戊' => '伤官',
-    '丁乙' => '偏印',
-    '丁庚' => '正财',
-    '丁丁' => '比肩',
-    '丁壬' => '正官',
-    '戊癸' => '正财',
-    '戊己' => '劫财',
-    '戊辛' => '伤官',
-    '戊丙' => '偏印',
-    '戊甲' => '七杀',
-    '戊戊' => '比肩',
-    '戊乙' => '正官',
-    '戊庚' => '食神',
-    '戊丁' => '正印',
-    '戊壬' => '偏财',
-    '己癸' => '偏财',
-    '己己' => '比肩',
-    '己辛' => '食神',
-    '己丙' => '正印',
-    '己甲' => '正官',
-    '己戊' => '劫财',
-    '己乙' => '七杀',
-    '己庚' => '伤官',
-    '己丁' => '偏印',
-    '己壬' => '正财',
-    '庚癸' => '伤官',
-    '庚己' => '正印',
-    '庚辛' => '劫财',
-    '庚丙' => '七杀',
-    '庚甲' => '偏财',
-    '庚戊' => '偏印',
-    '庚乙' => '正财',
-    '庚庚' => '比肩',
-    '庚丁' => '正官',
-    '庚壬' => '食神',
-    '辛癸' => '食神',
-    '辛己' => '偏印',
-    '辛辛' => '比肩',
-    '辛丙' => '正官',
-    '辛甲' => '正财',
-    '辛戊' => '正印',
-    '辛乙' => '偏财',
-    '辛庚' => '劫财',
-    '辛丁' => '七杀',
-    '辛壬' => '伤官',
-    '壬癸' => '劫财',
-    '壬己' => '正官',
-    '壬辛' => '正印',
-    '壬丙' => '偏财',
-    '壬甲' => '食神',
-    '壬戊' => '七杀',
-    '壬乙' => '伤官',
-    '壬庚' => '偏印',
-    '壬丁' => '正财',
-    '壬壬' => '比肩',
-    '癸癸' => '比肩',
-    '癸己' => '七杀',
-    '癸辛' => '偏印',
-    '癸丙' => '正财',
-    '癸甲' => '伤官',
-    '癸戊' => '正官',
-    '癸乙' => '食神',
-    '癸庚' => '正印',
-    '癸丁' => '偏财',
-    '癸壬' => '劫财'
-  );
-
   public static $ZHI_HIDE_GAN = array(
     '子' => array('癸'),
     '丑' => array('己', '癸', '辛'),

diff --git a/src/util/SolarUtil.php b/src/util/SolarUtil.php
@@ -84,40 +84,40 @@ class SolarUtil
     '2-21' => array('国际母语日'),
     '2-24' => array('第三世界青年日'),
     '3-1' => array('国际海豹日'),
-    '3-3' => array('世界野生动植物日", "全国爱耳日'),
-    '3-5' => array('周恩来诞辰纪念日", "中国青年志愿者服务日'),
+    '3-3' => array('世界野生动植物日', '全国爱耳日'),
+    '3-5' => array('周恩来诞辰纪念日', '中国青年志愿者服务日'),
     '3-6' => array('世界青光眼日'),
     '3-7' => array('女生节'),
     '3-12' => array('孙中山逝世纪念日'),
-    '3-14' => array('马克思逝世纪念日", "白色情人节'),
+    '3-14' => array('马克思逝世纪念日', '白色情人节'),
     '3-17' => array('国际航海日'),
-    '3-18' => array('全国科技人才活动日", "全国爱肝日'),
+    '3-18' => array('全国科技人才活动日', '全国爱肝日'),
     '3-20' => array('国际幸福日'),
-    '3-21' => array('世界森林日", "世界睡眠日", "国际消除种族歧视日'),
+    '3-21' => array('世界森林日', '世界睡眠日', '国际消除种族歧视日'),
     '3-22' => array('世界水日'),
     '3-23' => array('世界气象日'),
     '3-24' => array('世界防治结核病日'),
     '3-29' => array('中国黄花岗七十二烈士殉难纪念日'),
-    '4-2' => array('国际儿童图书日", "世界自闭症日'),
+    '4-2' => array('国际儿童图书日', '世界自闭症日'),
     '4-4' => array('国际地雷行动日'),
     '4-7' => array('世界卫生日'),
     '4-8' => array('国际珍稀动物保护日'),
     '4-12' => array('世界航天日'),
     '4-14' => array('黑色情人节'),
     '4-15' => array('全民国家安全教育日'),
-    '4-22' => array('世界地球日", "列宁诞辰纪念日'),
+    '4-22' => array('世界地球日', '列宁诞辰纪念日'),
     '4-23' => array('世界读书日'),
     '4-24' => array('中国航天日'),
     '4-25' => array('儿童预防接种宣传日'),
-    '4-26' => array('世界知识产权日", "全国疟疾日'),
+    '4-26' => array('世界知识产权日', '全国疟疾日'),
     '4-28' => array('世界安全生产与健康日'),
     '4-30' => array('全国交通安全反思日'),
     '5-2' => array('世界金枪鱼日'),
     '5-3' => array('世界新闻自由日'),
     '5-5' => array('马克思诞辰纪念日'),
     '5-8' => array('世界红十字日'),
     '5-11' => array('世界肥胖日'),
-    '5-12' => array('全国防灾减灾日", "护士节'),
+    '5-12' => array('全国防灾减灾日', '护士节'),
     '5-14' => array('玫瑰情人节'),
     '5-15' => array('国际家庭日'),
     '5-19' => array('中国旅游日'),
@@ -133,16 +133,16 @@ class SolarUtil
     '6-6' => array('全国爱眼日'),
     '6-8' => array('世界海洋日'),
     '6-11' => array('中国人口日'),
-    '6-14' => array('世界献血日", "亲亲情人节'),
+    '6-14' => array('世界献血日', '亲亲情人节'),
     '6-17' => array('世界防治荒漠化与干旱日'),
     '6-20' => array('世界难民日'),
     '6-21' => array('国际瑜伽日'),
     '6-25' => array('全国土地日'),
-    '6-26' => array('国际禁毒日", "联合国宪章日'),
+    '6-26' => array('国际禁毒日', '联合国宪章日'),
     '7-1' => array('香港回归纪念日'),
-    '7-6' => array('国际接吻日", "朱德逝世纪念日'),
+    '7-6' => array('国际接吻日', '朱德逝世纪念日'),
     '7-7' => array('七七事变纪念日'),
-    '7-11' => array('世界人口日", "中国航海日'),
+    '7-11' => array('世界人口日', '中国航海日'),
     '7-14' => array('银色情人节'),
     '7-18' => array('曼德拉国际日'),
     '7-30' => array('国际友谊日'),
@@ -153,14 +153,14 @@ class SolarUtil
     '8-9' => array('国际土著人日'),
     '8-12' => array('国际青年节'),
     '8-14' => array('绿色情人节'),
-    '8-19' => array('世界人道主义日", "中国医师节'),
+    '8-19' => array('世界人道主义日', '中国医师节'),
     '8-22' => array('邓小平诞辰纪念日'),
     '8-29' => array('全国测绘法宣传日'),
     '9-3' => array('中国抗日战争胜利纪念日'),
     '9-5' => array('中华慈善日'),
     '9-8' => array('世界扫盲日'),
-    '9-9' => array('毛泽东逝世纪念日", "全国拒绝酒驾日'),
-    '9-14' => array('世界清洁地球日", "相片情人节'),
+    '9-9' => array('毛泽东逝世纪念日', '全国拒绝酒驾日'),
+    '9-14' => array('世界清洁地球日', '相片情人节'),
     '9-15' => array('国际民主日'),
     '9-16' => array('国际臭氧层保护日'),
     '9-17' => array('世界骑行日'),
@@ -174,12 +174,12 @@ class SolarUtil
     '10-4' => array('世界动物日'),
     '10-11' => array('国际女童日'),
     '10-10' => array('辛亥革命纪念日'),
-    '10-13' => array('国际减轻自然灾害日", "中国少年先锋队诞辰日'),
+    '10-13' => array('国际减轻自然灾害日', '中国少年先锋队诞辰日'),
     '10-14' => array('葡萄酒情人节'),
     '10-16' => array('世界粮食日'),
     '10-17' => array('全国扶贫日'),
     '10-20' => array('世界统计日'),
-    '10-24' => array('世界发展信息日", "程序员节'),
+    '10-24' => array('世界发展信息日', '程序员节'),
     '10-25' => array('抗美援朝纪念日'),
     '11-5' => array('世界海啸日'),
     '11-8' => array('记者节'),
@@ -196,9 +196,9 @@ class SolarUtil
     '12-2' => array('全国交通安全日'),
     '12-3' => array('世界残疾人日'),
     '12-4' => array('全国法制宣传日'),
-    '12-5' => array('世界弱能人士日", "国际志愿人员日'),
+    '12-5' => array('世界弱能人士日', '国际志愿人员日'),
     '12-7' => array('国际民航日'),
-    '12-9' => array('世界足球日", "国际反腐败日'),
+    '12-9' => array('世界足球日', '国际反腐败日'),
     '12-10' => array('世界人权日'),
     '12-11' => array('国际山岳日'),
     '12-12' => array('西安事变纪念日'),