Merge branch 'main' of github.com:wmui/essay into main

essay-org · Jun 30, 2023 · 686b139 · 686b139
2 parents cd1c5f6 + 0120215
commit 686b139
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/app/public/manifest.json b/app/public/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "Essay",
+  "short_name": "Essay",
+  "icons": [
+    {
+      "src": "/public/favicon.png",
+      "type": "image/png",
+      "sizes": "400x400"
+    }
+  ],
+  "start_url": "/",
+  "scope": "/",
+  "display": "standalone",
+  "background_color": "#fff",
+  "theme_color": "#fff"
+}
diff --git a/app/public/sw.js b/app/public/sw.js
@@ -0,0 +1,3 @@
+self.addEventListener('fetch', function (e) {
+  console.log('正在请求：' + e.request.url);
+});
diff --git a/app/service/user.js b/app/service/user.js
@@ -97,7 +97,7 @@ class UserService extends Service {
     return jwt.verify(token, key, (err, decoded) => {
       if (err) {
         // JWT验证失败，可能是过期或无效
-        this.logger.error('token 验证失败', err);
+        this.logger.warn('token 验证失败', err);
         return {
           status: -1,
           data: 'token解析失败',

diff --git a/app/view/theme/layout.ejs b/app/view/theme/layout.ejs
@@ -27,6 +27,7 @@
       <meta name="description" content="<%= seo.description %>">
     <%}%>
     <link rel="shortcut icon" href="/public/favicon.png" type="image/x-icon">
+    <link rel="manifest" href="/public/manifest.json">
     <%- include('./style.ejs') -%>
   </head>
   <body>
@@ -151,7 +152,7 @@
     <footer class="footer">
       <span class="icp"
         ><%= site.icp %> Powered by
-        <a href="https://github.wmui/essay" target="_blank">Essay</a></span
+        <a href="https://github.com/wmui/essay" target="_blank">Essay</a></span
       >
     </footer>
     <script>
@@ -162,6 +163,23 @@
             window.location.href = '/search?keywords=' + encodeURIComponent(search.value)
           }
         })
+
+        // https://www.imooc.com/article/289875
+        if('serviceWorker' in navigator) {
+          navigator.serviceWorker
+            .register('/public/sw.js', { scope: '/' })
+            .then(function (registration) {
+              // 注册成功
+              console.log(
+                'ServiceWorker registration successful with scope: ',
+                registration.scope
+              );
+            })
+            .catch(function (err) {
+              // 注册失败:(
+              console.log('ServiceWorker registration failed: ', err);
+            });
+        }
       })
     </script>
     <%- include('./script.ejs') -%>

diff --git a/app/view/theme/script.ejs b/app/view/theme/script.ejs
@@ -1,5 +1,3 @@
-
-
 <!-- <script src="/public/lib/lulu/polyfill.min.js" defer></script> -->
 <script src="/public/lib/lulu/all.min.js" defer></script>
 <script src="/public/lib/axios/axios.min.js" defer></script>

diff --git a/config/config.default.js b/config/config.default.js
@@ -6,7 +6,8 @@
  * @param {Egg.EggAppInfo} appInfo app info
  */
 module.exports = appInfo => {
-  console.log(appInfo.root);
+  // console.log(appInfo.root);
+
   /**
    * built-in config
    * @type {Egg.EggAppConfig}