diff --git a/repo/js/AutoPlanDomain/config/config.js b/repo/js/AutoPlanDomain/config/config.js index 297944076..9e4d8f26e 100644 --- a/repo/js/AutoPlanDomain/config/config.js +++ b/repo/js/AutoPlanDomain/config/config.js @@ -11,7 +11,8 @@ const config = { api: { httpPullJsonConfig: undefined, httpPushAllJsonConfig: undefined, - } + }, + open: {open_push: false} }, info: { key: undefined,//密钥 @@ -408,6 +409,11 @@ async function initConfig() { throw new Error("密钥不匹配!") } } + config.user.uid = await ocrUid() + config.bgi_tools.api.httpPullJsonConfig=settings.bgi_tools_http_pull_json_config + config.bgi_tools.api.httpPushAllJsonConfig=settings.bgi_tools_http_push_all_json_config + config.bgi_tools.open.open_push=settings.bgi_tools_open_push + const domainList = JSON.parse(file.readTextSync(config.path.domain)) || [{ name: undefined, type: undefined, @@ -459,7 +465,6 @@ async function initConfig() { }) loads.sort((a, b) => a.order - b.order) config.domain.loads = loads - config.user.uid = await ocrUid() } export { diff --git a/repo/js/AutoPlanDomain/main.js b/repo/js/AutoPlanDomain/main.js index 834bcf5b8..cae85d068 100644 --- a/repo/js/AutoPlanDomain/main.js +++ b/repo/js/AutoPlanDomain/main.js @@ -119,7 +119,7 @@ async function loadMode(Load, autoFightOrderSet, domainConfig) { break case LoadType.bgi_tools: // 通过bgi_tools方式加载配置 - const uidConfigListBgiTools = await pullJsonConfig(config.user.uid)||[] + const uidConfigListBgiTools = await pullJsonConfig(config.user.uid+'')||[] if (uidConfigListBgiTools?.length > 0) { // 如果配置列表不为空,遍历并添加到结果集合中 uidConfigListBgiTools.forEach(item => { diff --git a/repo/js/AutoPlanDomain/settings.json b/repo/js/AutoPlanDomain/settings.json index af129b899..a47329d8c 100644 --- a/repo/js/AutoPlanDomain/settings.json +++ b/repo/js/AutoPlanDomain/settings.json @@ -28,6 +28,11 @@ "type": "input-text", "label": "bgi_tools拉取配置api(去看文档)" }, + { + "name": "bgi_tools_open_push", + "type": "checkbox", + "label": "开始推送bgi_tools配置" + }, { "name": "bgi_tools_http_push_all_json_config", "type": "input-text",