update

baomidou · May 28, 2024 · d7cb596 · d7cb596
1 parent 666f918
commit d7cb596
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,4 +30,4 @@ jobs:
           password: ${{ secrets.ECS_PASSWORD }}
           source: './dist/*'
           target: '/var/www/mybatis-plus-doc/'
-          rm: true
+          # rm: true
diff --git a/src/components/CheckAdBlocked.svelte b/src/components/CheckAdBlocked.svelte
@@ -1,20 +1,44 @@
 <script>
   import { onMount } from "svelte";
+  import store from "store2";
 
   let adBlockDetected = false;
+  let session = store.session;
+  const key = "adBlockNoticeClosed";
 
   function checkAdBlocker() {
-    if (window._AdBlockInit === undefined) {
-      adBlockDetected = true;
+    let adBlockNoticeClosed = session.get(key) ?? false;
+    if (adBlockNoticeClosed) {
+      return;
     }
+
+    // check ad block init
+    // if (window._AdBlockInit === undefined) {
+    //   adBlockDetected = true;
+    // }
+
+    // check script banned
+    checkAdScriptBanned('https://cdn.wwads.cn/js/makemoney.js');
+  }
+  
+  function checkAdScriptBanned(scriptUrl) {
+    fetch(scriptUrl)
+        .then(response => {
+            if (!response.ok) {
+              adBlockDetected = true;
+            }
+        })
+        .catch(() => {
+            adBlockDetected = true;
+        });
   }
 
   function closeNotice() {
     adBlockDetected = false;
   }
 
   onMount(() => {
-    const interval = setInterval(checkAdBlocker, 3000);
+    const interval = setInterval(checkAdBlocker, 5000);
     return () => clearInterval(interval);
   });
 </script>