From 96f75907d494fbccb4610348f6a683db81d21a55 Mon Sep 17 00:00:00 2001
From: abearxiong <xiongxiao1012@outlook.com>
Date: Sun, 2 Mar 2025 18:17:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=AE=E4=BF=A1=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/package.json                | 12 ++++++------
 mini-web/envision/callback.html | 12 ++++--------
 mini-web/envision/config.js     |  2 +-
 mini-web/envision/is-wechat.js  | 22 ++++++++++++++++++++++
 mini-web/envision/login.html    |  9 +++------
 mini-web/package.json           |  5 +++--
 package.json                    |  5 ++---
 7 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 mini-web/envision/is-wechat.js

diff --git a/app/package.json b/app/package.json
index 65e8cce..d7b8157 100644
--- a/app/package.json
+++ b/app/package.json
@@ -31,8 +31,8 @@
   "type": "module",
   "types": "types/index.d.ts",
   "dependencies": {
-    "@kevisual/code-center-module": "^0.0.7-alpha.2",
-    "@kevisual/router": "^0.0.7",
+    "@kevisual/code-center-module": "^0.0.11-alpha.1",
+    "@kevisual/router": "^0.0.8-alpha.1",
     "dayjs": "^1.11.13",
     "formidable": "^3.5.2",
     "ioredis": "^5.5.0",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@kevisual/types": "^0.0.6",
-    "@kevisual/use-config": "^1.0.8",
+    "@kevisual/use-config": "^1.0.9",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-json": "^6.1.0",
@@ -55,20 +55,20 @@
     "@types/crypto-js": "^4.2.2",
     "@types/formidable": "^3.4.5",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.13.5",
+    "@types/node": "^22.13.8",
     "@types/xml2js": "^0.4.14",
     "concurrently": "^9.1.2",
     "cross-env": "^7.0.3",
     "nodemon": "^3.1.9",
     "pm2": "^5.4.3",
     "rimraf": "^6.0.1",
-    "rollup": "^4.34.8",
+    "rollup": "^4.34.9",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-esbuild": "^6.2.1",
     "tape": "^5.9.0",
     "tsx": "^4.19.3",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "pnpm": {}
 }
\ No newline at end of file
diff --git a/mini-web/envision/callback.html b/mini-web/envision/callback.html
index f59740d..5b044a1 100644
--- a/mini-web/envision/callback.html
+++ b/mini-web/envision/callback.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0, maximum-scale=1, user-scalable=no">
-  <title>登录中转</title>
+  <title>登录</title>
   <style>
     * {
       box-sizing: border-box;
@@ -40,6 +40,7 @@
   <div class="loading">Loading Code...</div>
   <script type="module">
     import { loginSuccessUrl } from './config.js';
+    import { closePage } from './is-wechat.js';
     const url = new URL(window.location.href);
     const state = url.searchParams.get('state');
     const code = url.searchParams.get('code');
@@ -51,18 +52,13 @@
         console.error(err);
         alert('登录失败，请稍后再试');
         document.body.append('登录失败，请稍后再试');
-        setTimeout(() => {
-          window.close();
-        }, 2000);
+        closePage();
       });
     // document.body.append(JSON.stringify(res, null, 2));
     if (res.code === 200) {
       localStorage.setItem('token', res.data.token);
-      window.close()
-      setTimeout(() => {
-        window.open(loginSuccessUrl, '_blank');
-      }, 1000);
     }
+    closePage();
 
   </script>
 </body>
diff --git a/mini-web/envision/config.js b/mini-web/envision/config.js
index c8992bb..4986484 100644
--- a/mini-web/envision/config.js
+++ b/mini-web/envision/config.js
@@ -6,4 +6,4 @@ export const config = {
 
 export const loginUrl = `https://kevisual.xiongxiao.me/root/mini-web/login.html`;
 
-export const loginSuccessUrl = `/ai/chat/`;
+export const loginSuccessUrl = `/apps/wallnote/`;
diff --git a/mini-web/envision/is-wechat.js b/mini-web/envision/is-wechat.js
new file mode 100644
index 0000000..1c18846
--- /dev/null
+++ b/mini-web/envision/is-wechat.js
@@ -0,0 +1,22 @@
+export const isWechat = () => {
+  const ua = navigator.userAgent.toLowerCase();
+  return /micromessenger/i.test(ua);
+};
+
+export const closePage = (time = 2000) => {
+  if (!isWechat()) {
+    setTimeout(() => {
+      window.close();
+    }, time);
+    return;
+  }
+  if (window.WeixinJSBridge) {
+    setTimeout(() => {
+      window.WeixinJSBridge.call('closeWindow');
+    }, time);
+  } else {
+    setTimeout(() => {
+      window.close();
+    }, time);
+  }
+};
diff --git a/mini-web/envision/login.html b/mini-web/envision/login.html
index db9480c..7029e5e 100644
--- a/mini-web/envision/login.html
+++ b/mini-web/envision/login.html
@@ -32,6 +32,7 @@
   <div class="loading">Loading...</div>
   <script type="module">
     import { config } from './config.js'
+    import { closePage } from './is-wechat.js'
     const demo = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect`
     const appid = config.appid
     const redirect_uri = encodeURIComponent(config.redirect_uri)
@@ -40,9 +41,7 @@
     const state = url.searchParams.get('state')
     if (!state) {
       alert('Invalid state. Please try again later.');
-      setTimeout(() => {
-        window.close();
-      }, 2000);
+      closePage();
     }
     const link = demo.replace('APPID', appid).replace('REDIRECT_URI', redirect_uri).replace('SCOPE', scope).replace('STATE', state);
     window.location.href = link
@@ -50,9 +49,7 @@
     // Add a timeout for loading
     setTimeout(() => {
       alert('Loading timeout. Please try again later.');
-      setTimeout(() => {
-        window.close();
-      }, 2000);
+     closePage()
     }, 60000); // 60 seconds timeout
   </script>
 </body>
diff --git a/mini-web/package.json b/mini-web/package.json
index 5a1fbba..cc9df34 100644
--- a/mini-web/package.json
+++ b/mini-web/package.json
@@ -1,10 +1,11 @@
 {
   "name": "mini-web",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
+  "basename": "/root/mini-web",
   "main": "index.js",
   "scripts": {
-    "pub": "envision deploy ./envision -k mini-web -v 0.0.3 -y y",
+    "pub": "envision deploy ./envision -k mini-web -v 0.0.4 -y y",
     "ev": "npm run build && npm run deploy"
   },
   "keywords": [],
diff --git a/package.json b/package.json
index 5d0893f..d6b5643 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,5 @@
   "type": "module",
   "dependencies": {
     "qrcode": "^1.5.4"
-  },
-  "packageManager": "pnpm@9.14.4+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab"
-}
+  }
+}
\ No newline at end of file