|
|
|
@ -65,10 +65,14 @@ const serverApi = {
|
|
|
|
|
}
|
|
|
|
|
serverConfig.plugin = allConfig.plugin
|
|
|
|
|
|
|
|
|
|
if (allConfig.proxy && allConfig.proxy.enabled) {
|
|
|
|
|
if (allConfig.proxy) {
|
|
|
|
|
serverConfig.proxy = allConfig.proxy
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (allConfig.app) {
|
|
|
|
|
serverConfig.app = allConfig.app
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// fireStatus('ing') // 启动中
|
|
|
|
|
const basePath = serverConfig.setting.userBasePath
|
|
|
|
|
const runningConfigPath = path.join(basePath, '/running.json')
|
|
|
|
|