|
|
@@ -173,10 +173,18 @@ class IndexController extends BaseController
|
|
|
return message('获取失败', false);
|
|
|
}
|
|
|
|
|
|
- $content = file_get_contents($apiUrl.'/'.date('Y').'/'.date('m'));
|
|
|
+ $content = file_get_contents($apiUrl.'/foli/'.date('Y').'/'.date('m'));
|
|
|
$temp = substr($content,strpos($content, '<div class="furborder">'));
|
|
|
$temp = substr($temp, 0, strpos($temp, '<div class="calendar mt">'));
|
|
|
- return message(MESSAGE_OK, true, ['content'=> $content, 'result'=> $temp]);
|
|
|
+
|
|
|
+ // 宜忌
|
|
|
+ $content1 = file_get_contents($apiUrl.'/laohuangli/');
|
|
|
+ $temp1 = substr($content1,strpos($content1, '<div class="goodcalendar4">'));
|
|
|
+ $temp1 = substr($temp1,strpos($temp1, '</div>'));
|
|
|
+ preg_match("/<td>(.*)<\/td>/", $temp1, $yi);
|
|
|
+ preg_match("/<td colspan=\"3\">(.*)<\/td>/", $temp1, $ji);
|
|
|
+
|
|
|
+ return message(MESSAGE_OK, true, ['content'=> $content, 'result'=> $temp,'yi'=> $yi,'ji'=> $ji]);
|
|
|
|
|
|
}
|
|
|
}
|