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('杀掉进程成功,请重试开启代理服务') })