diff --git a/githubAction.md b/githubAction.md
index 6aec9359..94461d40 100644
--- a/githubAction.md
+++ b/githubAction.md
@@ -93,6 +93,8 @@
| `CFD_NOTIFY_CONTROL` | 京喜财富岛
控制是否运行脚本后通知 | 非必须 | 输入`true`为通知,不填则为不通知 |
| `JXNC_NOTIFY_LEVEL` | 京喜农场通知控制
推送开关,默认1 | 非必须 | 通知级别 0=只通知成熟;1=本次获得水滴>0;2=任务执行;3=任务执行+未种植种子 |
| `PURCHASE_SHOPS` | 执行`lxk0301/jd_scripts`仓库的脚本是否做加物品至购物车任务。默认关闭不做加购物车任务 | 非必须 | 如需做此类型任务。请设置`true`,目前东东小窝(jd_small_home.js)和跳跳乐瓜分京豆(jd_jump.js)脚本会有加购任务 |
+| `TUAN_ACTIVEID` | 京喜工厂拼团瓜分电力活动的`activeId`
默认读取作者设置的 | 非必须 | 如出现脚本开团提示失败:`活动已结束,请稍后再试~`,可自行抓包替换(开启抓包,进入拼团瓜分电力页面,寻找带有`tuan`的链接里面的`activeId=`) |
+
##### 互助码的填写规则
diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index 6aa2f4f2..f15d4c93 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -39,7 +39,7 @@ const helpAu = true; //帮作者助力 免费拿活动
const notify = $.isNode() ? require('./sendNotify') : '';
let jdNotify = true;//是否关闭通知,false打开通知推送,true关闭通知推送
const randomCount = $.isNode() ? 20 : 5;
-let tuanActiveId = `XBYi-5lVdNspWhlNwhpE6Q==`;
+let tuanActiveId = ``;
const jxOpenUrl = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://wqsd.jd.com/pingou/dream_factory/index.html%22%20%7D`;
let cookiesArr = [], cookie = '', message = '', allMessage = '';
const inviteCodes = [
@@ -1056,6 +1056,12 @@ function CreateTuan() {
console.log(`开团成功tuanId为\n${data.data['tuanId']}`);
$.tuanIds.push(data.data['tuanId']);
} else {
+ //{"msg":"活动已结束,请稍后再试~","nowTime":1621551005,"ret":10218}
+ if (data['res'] === 10218 && $.index === 1) {
+ //只发送一次
+ $.msg($.name, '', `京喜工厂拼团瓜分电力活动团ID(activeId)已失效\n请自行抓包替换(Node环境变量为TUAN_ACTIVEID,iOS端在BoxJx)或者联系作者等待更新`);
+ if ($.isNode()) await notify.sendNotify($.name, `京喜工厂拼团瓜分电力活动团ID(activeId)已失效\n请自行抓包替换(Node环境变量为TUAN_ACTIVEID,iOS端在BoxJx)或者联系作者等待更新`)
+ }
console.log(`开团异常:${JSON.stringify(data)}`);
}
}
@@ -1340,7 +1346,8 @@ function shareCodesFormat() {
}
function requireConfig() {
return new Promise(async resolve => {
- await updateTuanIdsCDN();
+ tuanActiveId = $.isNode() ? (process.env.TUAN_ACTIVEID || tuanActiveId) : ($.getdata('tuanActiveId') || tuanActiveId);
+ if (!tuanActiveId) await updateTuanIdsCDN();
if ($.tuanConfigs && $.tuanConfigs['tuanActiveId']) {
tuanActiveId = $.tuanConfigs['tuanActiveId'];
console.log(`拼团活动ID: 获取成功 ${tuanActiveId}`)
diff --git a/lxk0301.boxjs.json b/lxk0301.boxjs.json
index 505e9884..7210d17b 100644
--- a/lxk0301.boxjs.json
+++ b/lxk0301.boxjs.json
@@ -633,7 +633,7 @@
{
"id": "jd_dreamFactory",
"name": "京喜工厂",
- "keys": ["jd_jxFactory"],
+ "keys": ["jd_jxFactory", "tuanActiveId"],
"descs_html": [
"请在输入框输入跟你互助的京喜工厂的好友互助码",
"同一个京东账号的好友邀请码用@隔开,不同京东账号互助码用换行(return按键)隔开。例:
账号1-好友1邀请码@账号1邀请码-好友2邀请码
账号2-好友1邀请码@账号2-好友2邀请码",
@@ -649,6 +649,13 @@
"autoGrow": true,
"rows": 8,
"desc": "京喜工厂邀请码,同一个京东账号的好友邀请码用@隔开,不同京东账号互助码用换行(return按键)隔开"
+ },
+ {
+ "id": "tuanActiveId",
+ "name": "京喜工厂拼团瓜分电力活动团ID",
+ "val": "",
+ "type": "text",
+ "desc": "默认读取作者设置,如出现脚本提示开团失败:`活动已结束,请稍后再试~`,可自行抓包替换(开启抓包,进入拼团瓜分电力页面,寻找带有`tuan`的链接里面的`activeId=`"
}
],
"icons": [