refactor: 1

packages/core/src/config/index.js

@@ -105,12 +105,12 @@ module.exports = {
           desc: 'github的访问速度分析上传，没有必要，直接返回成功'
         }
       },
-      'v2ex.com': {
-        '.*': {
-          proxy: 'v2ex.com',
-          sni: 'baidu.com'
-        }
-      },
+      // 'v2ex.com': {
+      //   '.*': {
+      //     proxy: 'v2ex.com',
+      //     sni: 'baidu.com'
+      //   }
+      // },
       // google cdn
       'www.google.com': {
         '/recaptcha/.*': { proxy: 'www.recaptcha.net' }
@@ -121,8 +121,8 @@ module.exports = {
       },
       'ajax.googleapis.com': {
         '.*': {
-          proxy: 'gapis.geekzu.org',
-          backup: ['fonts.loli.net'],
+          proxy: 'ajax.lug.ustc.edu.cn',
+          backup: ['gapis.geekzu.org'],
           test: 'ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js'
         }
       },

packages/core/src/modules/plugin/overwall/config.js

@@ -10,9 +10,9 @@ module.exports = {
     }
   },
   targets: {
-    '*facebook.com': true,
     'github.com': true,
-    '*wikimedia.org': true
+    '*wikimedia.org': true,
+    'v2ex.com': true
   },
   pac: {
     enabled: true,

packages/gui/.env.pre

@@ -1 +1 @@
-VUE_APP_PUBLISH_URL=http://dev-sidecar.docmirror.cn/update/
+VUE_APP_PUBLISH_URL=http://dev-sidecar.docmirror.cn/update/preview/

packages/gui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docmirror/dev-sidecar-gui",
-  "version": "1.6.0",
+  "version": "1.5.0",
   "private": false,
   "license": "MPL-2.0",
   "main": "background.js",
@@ -9,6 +9,7 @@
     "lint": "vue-cli-service lint",
     "electron:build": "vue-cli-service electron:build",
     "electron": "vue-cli-service electron:serve",
+    "electron:pre": "vue-cli-service electron:serve --mode pre",
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
     "electron:icons": "electron-icon-builder --input=./public/logo/win.png --output=build --flatten",

packages/gui/src/bridge/update/backend.js

@@ -49,10 +49,10 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
   }
   // 本地开发环境，改变app-update.yml地址
   if (process.env.NODE_ENV === 'development' && !isMac) {
+    const publishUrl = process.env.VUE_APP_PUBLISH_URL
     autoUpdater.setFeedURL({
       provider: 'generic',
-      // url: 'http://localhost/dev-sidecar/'
-      url: 'http://dev-sidecar.docmirror.cn/update/preview/'
+      url: publishUrl
     })
     if (isMac) {
       autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml')
@@ -62,6 +62,8 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
       autoUpdater.updateConfigPath = path.join(__dirname, 'win-unpacked/resources/app-update.yml')
     }
   }
+
+  console.log('auto updater', autoUpdater.getFeedURL())
   autoUpdater.autoDownload = false
 
   let partPackagePath = null

packages/gui/vue.config.js

@@ -1,6 +1,7 @@
 const path = require('path')
 const webpack = require('webpack')
 const publishUrl = process.env.VUE_APP_PUBLISH_URL
+console.log('publish url', publishUrl)
 module.exports = {
   pages: {
     index: {