From 4e9acad5855079e8785fdd7395c3ab59b8611279 Mon Sep 17 00:00:00 2001
From: "xiaoqi.cxq" <xiaoqi.cxq@gmail.com>
Date: Sun, 13 Nov 2022 15:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=96=87=E6=A1=A3=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/index.js                                | 6 ++++--
 src/components/modals/ImageModal.vue           | 4 ++++
 src/services/imageSvc.js                       | 4 ++++
 src/services/networkSvc.js                     | 2 +-
 src/services/providers/helpers/googleHelper.js | 1 +
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/index.js b/server/index.js
index 9ec10401..821f78a8 100644
--- a/server/index.js
+++ b/server/index.js
@@ -64,10 +64,12 @@ module.exports = (app) => {
   // Google Drive action receiver
   app.get('/googleDriveAction', (req, res) =>
     res.redirect(`./app#providerId=googleDrive&state=${encodeURIComponent(req.query.state)}`));
-  // Serve the static folder with 1 day max-age
+  // Serve the static folder with 30 day max-age
   app.use('/themes', serveStatic(resolvePath('static/themes'), {
-    maxAge: '1d',
+    maxAge: '30d',
   }));
+  // Serve empty.js
+  app.get('/empty.js', (req, res) => res.send(''));
 
   // Serve static resources
   if (process.env.NODE_ENV === 'production') {
diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue
index bfcae0ba..b5c82392 100644
--- a/src/components/modals/ImageModal.vue
+++ b/src/components/modals/ImageModal.vue
@@ -109,11 +109,15 @@ export default modalTemplate({
   computed: {
     ...mapGetters('workspace', [
       'currentWorkspace',
+      'currentWorkspaceIsGit',
     ]),
     checkedStorage() {
       return store.getters['img/getCheckedStorage'];
     },
     workspaceImgPath() {
+      if (!this.currentWorkspaceIsGit) {
+        return [];
+      }
       const workspaceImgPath = store.getters['img/getWorkspaceImgPath'];
       return Object.keys(workspaceImgPath || {});
     },
diff --git a/src/services/imageSvc.js b/src/services/imageSvc.js
index dbb9601c..99228c8a 100644
--- a/src/services/imageSvc.js
+++ b/src/services/imageSvc.js
@@ -28,6 +28,10 @@ export default {
     }
     // 判断是否文档空间路径
     if (currStorage.type === 'workspace') {
+      // 如果不是git仓库 则提示不支持
+      if (!store.getters['workspace/currentWorkspaceIsGit']) {
+        return { error: '暂无已选择的图床！' };
+      }
       const path = getImagePath(currStorage.sub, imgFile.type);
       // 保存到indexeddb
       const base64 = await utils.encodeFiletoBase64(imgFile);
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index 73335a76..734373e9 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -69,7 +69,7 @@ export default {
           await new Promise((resolve, reject) => {
             script.onload = resolve;
             script.onerror = reject;
-            script.src = `https://g.alicdn.com/sd/baxia-entry/index.js?${Date.now()}`;
+            script.src = `/empty.js?${Date.now()}`;
             try {
               document.head.appendChild(script); // This can fail with bad network
               timeout = setTimeout(reject, networkTimeout);
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 84934fe8..2c9ed48f 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -111,6 +111,7 @@ export default {
    * https://developers.google.com/identity/protocols/OpenIDConnect
    */
   async startOauth2(scopes, sub = null, silent = false) {
+    await networkSvc.getServerConf();
     const clientId = store.getters['data/serverConf'].googleClientId;
 
     // Get an OAuth2 code