v2.7 calendar.js

1pone · Feb 24, 2023 · 74b3cc6 · 74b3cc6
1 parent ca6afc8
commit 74b3cc6
Show file tree

Hide file tree

Showing 8 changed files with 1,351 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -117,6 +117,16 @@
 
 ## 更新日志
 
+#### 2.7(2023.02.24)
+
+##### Features
+
+* 使用 [calendar.js](https://github.com/jjonline/calendar.js) 代替农历查询接口
+
+##### Bug Fixes
+
+* 时区查询接口增加兜底，默认`东八区`
+
 #### 2.6 (2023.01.04)
 
 ##### Features

diff --git a/beta/css/.DS_Store b/beta/css/.DS_Store
diff --git a/beta/index.html b/beta/index.html
@@ -10,6 +10,7 @@
     <script src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8"></script>
     <script src="js/cookie.js"></script>
     <script src="js/main.js"></script>
+    <script src="js/calendar.js"></script>
 </head>
 
 <body scroll="no">

diff --git a/beta/js/calendar.js b/beta/js/calendar.js
diff --git a/beta/js/main.js b/beta/js/main.js
@@ -62,12 +62,10 @@ window.onload = function () {
 // Keys
 var KEY_UNSPLASH = "bXwWoUhPeVw-yvSesGMgaOENnlSzhHYB43kZIQOR8cQ";
 var KEY_QWEATHER = getCookie("qweatherKey"); // "f3c3540923c24847b9f4d194888dbcef"; // https://console.qweather.com/#/apps
-var KEY_LUNAR = "LwExDtUWhF3rH5ib";
 
 // APIs
 var API_HITOKOTO = "https://v1.hitokoto.cn?encode=json&charset=utf-8";
 var API_IP_INFO = "https://ipapi.co/json?languages=zh-CN";
-var API_LUNAR = "https://v2.alapi.cn/api/lunar?token=";
 var API_WEATHER = "https://devapi.qweather.com/v7/weather/now?";
 var API_WEIBO = "https://tenapi.cn/resou/";
 
@@ -247,27 +245,11 @@ function clock(autoMode) {
 }
 
 function getLunar() {
-  var xhr = createXHR();
-  xhr.open("GET", API_LUNAR + KEY_LUNAR, true);
-  xhr.onreadystatechange = function () {
-    if (this.readyState == 4) {
-      var data = JSON.parse(this.responseText);
-      if (data.code == 200) {
-        var lunar_data = data.data;
-        document.getElementById("lunar").innerHTML =
-          lunar_data.ganzhi_year +
-          "年" +
-          lunar_data.lunar_month_chinese +
-          lunar_data.lunar_day_chinese;
-        // if (lunar_data.festival.length)
-        //   document.getElementById("holiday").innerHTML =
-        //     "&nbsp;&nbsp;" + lunar_data.festival[0];
-      } else {
-        console.error("农历数据获取失败");
-      }
-    }
-  };
-  xhr.send(null);
+  var lunar = calendar.solar2lunar();
+  document.getElementById("lunar").innerHTML =
+    lunar.gzYear + "年" + lunar.IMonthCn + lunar.IDayCn;
+  document.getElementById("holiday").innerHTML =
+    "&nbsp;&nbsp;" + (lunar.lunarFestival || "") + (lunar.festival || "");
 }
 
 function weather() {

diff --git a/css/.DS_Store b/css/.DS_Store
diff --git a/js/calendar.js b/js/calendar.js
diff --git a/js/main.js b/js/main.js