From 3091bc06bb740fc2adfc2126c037c45834a8c74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Wed, 5 Feb 2025 12:00:12 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E9=87=8D=E5=91=BD=E5=90=8D=20`core?=
 =?UTF-8?q?/src/config.js`=20=E4=B8=BA=20`core/src/config-api.js`=20?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=BC=95=E7=94=A8=E6=97=B6=EF=BC=8C=E4=B8=8E?=
 =?UTF-8?q?=20`core/src/config/index.js`=20=E6=B7=B7=E6=B7=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/{config.js => config-api.js}            | 0
 packages/core/src/expose.js                               | 2 +-
 packages/core/src/modules/server/index.js                 | 2 +-
 packages/core/src/shell/scripts/set-system-proxy/index.js | 2 +-
 packages/core/src/utils/util.logger.js                    | 2 +-
 packages/core/test/configTest.js                          | 2 +-
 packages/gui/src/bridge/error/front.js                    | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/core/src/{config.js => config-api.js} (100%)

diff --git a/packages/core/src/config.js b/packages/core/src/config-api.js
similarity index 100%
rename from packages/core/src/config.js
rename to packages/core/src/config-api.js
diff --git a/packages/core/src/expose.js b/packages/core/src/expose.js
index ee3593b..74616ae 100644
--- a/packages/core/src/expose.js
+++ b/packages/core/src/expose.js
@@ -1,5 +1,5 @@
 const lodash = require('lodash')
-const config = require('./config')
+const config = require('./config-api')
 const event = require('./event')
 const modules = require('./modules')
 const shell = require('./shell')
diff --git a/packages/core/src/modules/server/index.js b/packages/core/src/modules/server/index.js
index 910c19a..66a6f2a 100644
--- a/packages/core/src/modules/server/index.js
+++ b/packages/core/src/modules/server/index.js
@@ -2,7 +2,7 @@ const fork = require('node:child_process').fork
 const fs = require('node:fs')
 const path = require('node:path')
 const lodash = require('lodash')
-const config = require('../../config')
+const config = require('../../config-api')
 const event = require('../../event')
 const status = require('../../status')
 const jsonApi = require('@docmirror/mitmproxy/src/json')
diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js
index 2152372..fccda97 100644
--- a/packages/core/src/shell/scripts/set-system-proxy/index.js
+++ b/packages/core/src/shell/scripts/set-system-proxy/index.js
@@ -15,7 +15,7 @@ const execFile = Shell.execFile
 let config = null
 function loadConfig () {
   if (config == null) {
-    config = require('../../../config.js')
+    config = require('../../../config-api.js')
   }
 }
 
diff --git a/packages/core/src/utils/util.logger.js b/packages/core/src/utils/util.logger.js
index b3331b2..0c4de5b 100644
--- a/packages/core/src/utils/util.logger.js
+++ b/packages/core/src/utils/util.logger.js
@@ -1,7 +1,7 @@
 const path = require('node:path')
 const log4js = require('log4js')
 const logOrConsole = require('./util.log-or-console')
-const configFromFiles = require('../config/index').configFromFiles
+const configFromFiles = require('../config/index.js').configFromFiles
 
 // 日志级别
 const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
diff --git a/packages/core/test/configTest.js b/packages/core/test/configTest.js
index 8f2c0af..40142b3 100644
--- a/packages/core/test/configTest.js
+++ b/packages/core/test/configTest.js
@@ -1,4 +1,4 @@
-// const config = require('../src/config')
+// const config = require('../src/config-api')
 //
 // config.set({
 //   server: {
diff --git a/packages/gui/src/bridge/error/front.js b/packages/gui/src/bridge/error/front.js
index abb835f..ab1efbd 100644
--- a/packages/gui/src/bridge/error/front.js
+++ b/packages/gui/src/bridge/error/front.js
@@ -19,7 +19,7 @@ function handleServerStartError (message, err, app, api) {
       onOk () {
         // TODO 杀掉进程
         api.config.get().then((config) => {
-          console.log('config', config)
+          console.log('config:', config)
           api.shell.killByPort({ port: config.server.port }).then((ret) => {
             app.$message.info('杀掉进程成功，请重试开启代理服务')
           })