optimize: 重命名 `core/src/config.js` 为 `core/src/config-api.js` 避免引用时,与 `core/src/config/index.js` 混淆。
parent
842bb4a46f
commit
3091bc06bb
|
@ -1,5 +1,5 @@
|
||||||
const lodash = require('lodash')
|
const lodash = require('lodash')
|
||||||
const config = require('./config')
|
const config = require('./config-api')
|
||||||
const event = require('./event')
|
const event = require('./event')
|
||||||
const modules = require('./modules')
|
const modules = require('./modules')
|
||||||
const shell = require('./shell')
|
const shell = require('./shell')
|
||||||
|
|
|
@ -2,7 +2,7 @@ const fork = require('node:child_process').fork
|
||||||
const fs = require('node:fs')
|
const fs = require('node:fs')
|
||||||
const path = require('node:path')
|
const path = require('node:path')
|
||||||
const lodash = require('lodash')
|
const lodash = require('lodash')
|
||||||
const config = require('../../config')
|
const config = require('../../config-api')
|
||||||
const event = require('../../event')
|
const event = require('../../event')
|
||||||
const status = require('../../status')
|
const status = require('../../status')
|
||||||
const jsonApi = require('@docmirror/mitmproxy/src/json')
|
const jsonApi = require('@docmirror/mitmproxy/src/json')
|
||||||
|
|
|
@ -15,7 +15,7 @@ const execFile = Shell.execFile
|
||||||
let config = null
|
let config = null
|
||||||
function loadConfig () {
|
function loadConfig () {
|
||||||
if (config == null) {
|
if (config == null) {
|
||||||
config = require('../../../config.js')
|
config = require('../../../config-api.js')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
const path = require('node:path')
|
const path = require('node:path')
|
||||||
const log4js = require('log4js')
|
const log4js = require('log4js')
|
||||||
const logOrConsole = require('./util.log-or-console')
|
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'
|
const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// const config = require('../src/config')
|
// const config = require('../src/config-api')
|
||||||
//
|
//
|
||||||
// config.set({
|
// config.set({
|
||||||
// server: {
|
// server: {
|
||||||
|
|
|
@ -19,7 +19,7 @@ function handleServerStartError (message, err, app, api) {
|
||||||
onOk () {
|
onOk () {
|
||||||
// TODO 杀掉进程
|
// TODO 杀掉进程
|
||||||
api.config.get().then((config) => {
|
api.config.get().then((config) => {
|
||||||
console.log('config', config)
|
console.log('config:', config)
|
||||||
api.shell.killByPort({ port: config.server.port }).then((ret) => {
|
api.shell.killByPort({ port: config.server.port }).then((ret) => {
|
||||||
app.$message.info('杀掉进程成功,请重试开启代理服务')
|
app.$message.info('杀掉进程成功,请重试开启代理服务')
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue