From 98648fe59ff9671b5feee5e18920225d5f8ba9d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 26 Mar 2024 10:14:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?script=20=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=20=5Fscript?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {script => _script}/1、installEnv.bat        | 0
 {script => _script}/2、installBootstrap.bat  | 0
 {script => _script}/3、buildAndRun.bat       | 0
 {script => _script}/4、generateSetupFile.bat | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {script => _script}/1、installEnv.bat (100%)
 rename {script => _script}/2、installBootstrap.bat (100%)
 rename {script => _script}/3、buildAndRun.bat (100%)
 rename {script => _script}/4、generateSetupFile.bat (100%)

diff --git a/script/1、installEnv.bat b/_script/1、installEnv.bat
similarity index 100%
rename from script/1、installEnv.bat
rename to _script/1、installEnv.bat
diff --git a/script/2、installBootstrap.bat b/_script/2、installBootstrap.bat
similarity index 100%
rename from script/2、installBootstrap.bat
rename to _script/2、installBootstrap.bat
diff --git a/script/3、buildAndRun.bat b/_script/3、buildAndRun.bat
similarity index 100%
rename from script/3、buildAndRun.bat
rename to _script/3、buildAndRun.bat
diff --git a/script/4、generateSetupFile.bat b/_script/4、generateSetupFile.bat
similarity index 100%
rename from script/4、generateSetupFile.bat
rename to _script/4、generateSetupFile.bat

From 09857d41532c8a62a26a866d678d0829d0776e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WangLiang/=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 26 Mar 2024 10:22:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bugfix:=20`vue-json-editor`=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=20`vue-json-editor-fix-cn`=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=8B=A6=E6=88=AA=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E4=B8=AD=E6=96=87=E8=BE=93=E5=85=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82=20(#276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/gui/package.json                     | 1 +
 packages/gui/src/view/components/settings.vue | 4 ++--
 packages/gui/src/view/pages/server.vue        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/gui/package.json b/packages/gui/package.json
index f94eeb7..88c5529 100644
--- a/packages/gui/package.json
+++ b/packages/gui/package.json
@@ -43,6 +43,7 @@
     "sass-loader": "^10.0.4",
     "vue": "^2.6.11",
     "vue-json-editor": "^1.4.2",
+    "vue-json-editor-fix-cn": "^1.4.3",
     "vue-router": "^3.4.8"
   },
   "devDependencies": {
diff --git a/packages/gui/src/view/components/settings.vue b/packages/gui/src/view/components/settings.vue
index cfa78df..f4ac91a 100644
--- a/packages/gui/src/view/components/settings.vue
+++ b/packages/gui/src/view/components/settings.vue
@@ -17,7 +17,7 @@
       :style="{ height: '100%' }"
     >
       <a-tab-pane tab="拦截设置" key="1"  >
-        <vue-json-editor  style="height:100%;" ref="editor" v-model="targetConfig.intercepts" mode="code" :show-btns="false" :expandedOnStart="true" @json-change="onJsonChange" ></vue-json-editor>
+        <vue-json-editor style="height:100%;" ref="editor" v-model="targetConfig.intercepts" mode="code" :show-btns="false" :expandedOnStart="true" @json-change="onJsonChange" ></vue-json-editor>
       </a-tab-pane>
       <a-tab-pane tab="DNS设置" key="2">
         <div>
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-import vueJsonEditor from 'vue-json-editor'
+import vueJsonEditor from 'vue-json-editor-fix-cn'
 import lodash from 'lodash'
 import api from '../api'
 export default {
diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue
index 2666640..3d553ea 100644
--- a/packages/gui/src/view/pages/server.vue
+++ b/packages/gui/src/view/pages/server.vue
@@ -217,7 +217,7 @@
 </template>
 
 <script>
-import vueJsonEditor from 'vue-json-editor'
+import vueJsonEditor from 'vue-json-editor-fix-cn'
 import Plugin from '../mixins/plugin'
 import _ from 'lodash'
 

From 5a9663584424a39ff65096b6a973884c1ef9ff74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WangLiang/=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 26 Mar 2024 10:29:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?optimize:=20github=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=EF=BC=8C`*.fastgit.org`=20=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=20`gh.api.99988866.xyz/https://github.com`?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=20`*.fastgit.org`=20=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config.js               |  6 +++---
 packages/core/src/config/index.js         | 12 +++---------
 packages/core/src/modules/server/index.js |  9 +++++++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/core/src/config.js b/packages/core/src/config.js
index 00f66f1..c544f47 100644
--- a/packages/core/src/config.js
+++ b/packages/core/src/config.js
@@ -17,12 +17,12 @@ function get () {
 const getDefaultConfigBasePath = function () {
   return get().server.setting.userBasePath
 }
-function _getRemoteSavePath (prefix = '', version = '') {
+function _getRemoteSavePath (prefix = '') {
   const dir = getDefaultConfigBasePath()
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir)
   }
-  return path.join(dir, prefix + 'remote_config.json' + version)
+  return path.join(dir, prefix + 'remote_config.json5')
 }
 function _getConfigPath () {
   const dir = getDefaultConfigBasePath()
@@ -64,7 +64,7 @@ const configApi = {
           return
         }
         if (response && response.statusCode === 200) {
-          const originalRemoteSavePath = _getRemoteSavePath('original_', '5')
+          const originalRemoteSavePath = _getRemoteSavePath('original_')
           fs.writeFileSync(originalRemoteSavePath, body)
           log.info('保存原来的远程配置文件成功:', originalRemoteSavePath)
 
diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index a4b2d44..8a7bd77 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -52,14 +52,14 @@ module.exports = {
     intercepts: {
       'github.com': {
         '/.*/.*/releases/download/': {
-          redirect: 'download.fastgit.org',
+          redirect: 'gh.api.99988866.xyz/https://github.com',
           desc: 'release文件加速下载跳转地址'
         },
         '/.*/.*/archive/': {
-          redirect: 'download.fastgit.org'
+          redirect: 'gh.api.99988866.xyz/https://github.com'
         },
         '/.*/.*/blame/': {
-          redirect: 'hub.fastgit.org'
+          redirect: 'gh.api.99988866.xyz/https://github.com'
         },
         '^/[^/]+/[^/]+(/releases(/.*)?)?$': {
           script: [
@@ -69,15 +69,9 @@ module.exports = {
         },
         '/.*': {
           proxy: 'github.com',
-          // proxy: 'gh.docmirror.top/_proxy',
           desc: '目前禁掉sni就可以直接访问，如果后续github.com的ip被封锁，只能再走proxy模式',
           sni: 'baidu.com'
         }
-        // '/.*/.*/raw11/': {
-        //   replace: '(.+)\\/raw\\/(.+)',
-        //   proxy: 'raw.fastgit.org$1/$2',
-        //   sni: 'baidu.com'
-        // }
       },
       'github-releases.githubusercontent.com': {
         '.*': {
diff --git a/packages/core/src/modules/server/index.js b/packages/core/src/modules/server/index.js
index d514ef6..18cc11e 100644
--- a/packages/core/src/modules/server/index.js
+++ b/packages/core/src/modules/server/index.js
@@ -67,6 +67,11 @@ const serverApi = {
       }
     }
     serverConfig.plugin = allConfig.plugin
+
+    if (allConfig.proxy && allConfig.proxy.enabled) {
+      serverConfig.proxy = allConfig.proxy
+    }
+
     // fireStatus('ing') // 启动中
     const basePath = serverConfig.setting.userBasePath
     const runningConfigPath = path.join(basePath, '/running.json')
@@ -125,13 +130,13 @@ const serverApi = {
         // fireStatus('ing')// 关闭中
         server.close((err) => {
           if (err) {
-            log.info('close error', err, ',', err.code, ',', err.message, ',', err.errno)
+            log.warn('close error', err, ',', err.code, ',', err.message, ',', err.errno)
             if (err.code === 'ERR_SERVER_NOT_RUNNING') {
               log.info('代理服务关闭成功')
               resolve()
               return
             }
-            log.info('代理服务关闭失败', err)
+            log.warn('代理服务关闭失败', err)
             reject(err)
           } else {
             log.info('代理服务关闭成功')