diff --git a/docker/default_task.sh b/docker/default_task.sh index f47d8fdf..d099871c 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -114,3 +114,5 @@ fi echo "加载最新的定时任务文件..." crontab $mergedListFile + +sh -x /scripts/docker/proc_file.sh \ No newline at end of file diff --git a/docker/proc_file.sh b/docker/proc_file.sh new file mode 100644 index 00000000..4674a923 --- /dev/null +++ b/docker/proc_file.sh @@ -0,0 +1,36 @@ +#!/bin/sh +set -e + +echo "整理各个日志文件里面的互助码相关信息。。。" +echo "===========================================================================" +logdDir="/scripts/logs" +sharecodeFile="${logdDir}/sharecode.log" +jdzzFile="${logdDir}/jd_jdzz.log" +jdfactoryFile="${logdDir}/jd_jdfactory.log" +jxFactoryFile="${logdDir}/jd_dreamFactory.log" +plantBean="${logdDir}/jd_plantBean.log" +jdfruit="${logdDir}/jd_fruit.log" +jdpet="${logdDir}/jd_pet.log" + +echo -e >>$sharecodeFile + +sed -n '/京东赚赚好友互助码】.*/'p $jdzzFile | awk '{print $1}' | sort | uniq >>$sharecodeFile +echo "提取京东赚赚助力码完成" + +sed -n '/东东工厂好友互助码】.*/'p $jdfactoryFile | awk '{print $1}' | sort | uniq >>$sharecodeFile +echo "提取东东工厂助力码完成" + +sed -n '/京喜工厂好友互助码.*/'p $jxFactoryFile | awk '{print $1}' | sort | uniq >>$sharecodeFile +echo "提取京喜工厂助力码完成" + +sed -n '/京东种豆得豆好友互助码】.*/'p $plantBean | awk '{print $1}' | sort | uniq >>$sharecodeFile +echo "提取京东种豆助力码完成" + +sed -n '/东东农场好友互助码】.*/'p $jdfruit | awk '{print $1}' | sort | uniq >>$sharecodeFile +echo "提取京东农场助力码完成" + +sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $1}' | sort | uniq >>$sharecodeFile +echo "提取东东萌宠助力码完成" + +echo "===========================================================================" +echo "整理完成,具体结果请查看${sharecodeFile}文件" diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index eb08898f..dbdd5012 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -547,7 +547,7 @@ function userInfo() { } console.log(`当前电力:${data.user.electric}`) console.log(`当前等级:${data.user.currentLevel}`) - console.log(`分享码: ${data.user.encryptPin}`); + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${data.user.encryptPin}`); console.log(`已投入电力:${production.investedElectric}`); console.log(`所需电力:${production.needElectric}`); console.log(`生产进度:${((production.investedElectric / production.needElectric) * 100).toFixed(2)}%`); diff --git a/jd_fruit.js b/jd_fruit.js index 716e133d..c996e7b8 100644 --- a/jd_fruit.js +++ b/jd_fruit.js @@ -85,7 +85,7 @@ async function jdFruit() { // option['media-url'] = $.farmInfo.farmUserPro.goodsImage; subTitle = `【京东账号${$.index}】${$.nickName}`; message = `【水果名称】${$.farmInfo.farmUserPro.name}\n`; - console.log(`\n【您的${$.name}互助码shareCode】 ${$.farmInfo.farmUserPro.shareCode}\n`); + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${$.farmInfo.farmUserPro.shareCode}\n`); console.log(`\n【已成功兑换水果】${$.farmInfo.farmUserPro.winTimes}次\n`); message += `【已兑换水果】${$.farmInfo.farmUserPro.winTimes}次\n`; await masterHelpShare();//助力好友 diff --git a/jd_jdfactory.js b/jd_jdfactory.js index 1ec93e60..0c404e82 100644 --- a/jd_jdfactory.js +++ b/jd_jdfactory.js @@ -446,7 +446,7 @@ function jdfactory_getTaskDetail() { $.taskVos = data.data.result.taskVos;//任务列表 $.taskVos.map(item => { if (item.taskType === 14) { - console.log(`\n您的${$.name}好友助力邀请码:${item.assistTaskDetailVo.taskToken}\n`) + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${item.assistTaskDetailVo.taskToken}\n`) } }) } diff --git a/jd_jdzz.js b/jd_jdzz.js index a7462105..74c2f4a9 100644 --- a/jd_jdzz.js +++ b/jd_jdzz.js @@ -255,7 +255,7 @@ function getUserInfo() { if (safeGet(data)) { data = JSON.parse(data); if (data.data.shareTaskRes) { - console.log(`\n您的${$.name}好友助力码为: ${data.data.shareTaskRes.itemId}\n`); + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${data.data.shareTaskRes.itemId}\n`); } else { console.log(`已满5人助力,暂时看不到您的${$.name}好友助力码`) } diff --git a/jd_pet.js b/jd_pet.js index c0b342fb..3671f3b7 100644 --- a/jd_pet.js +++ b/jd_pet.js @@ -115,7 +115,7 @@ async function jdPet() { } return } - console.log(`\n【您的${$.name}互助码shareCode】 ${$.petInfo.shareCode}\n`); + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${$.petInfo.shareCode}\n`); await taskInit(); if ($.taskInit.resultCode === '9999' || !$.taskInit.result) { console.log('初始化任务异常, 请稍后再试'); diff --git a/jd_plantBean.js b/jd_plantBean.js index b7393db3..4ae0779b 100644 --- a/jd_plantBean.js +++ b/jd_plantBean.js @@ -89,7 +89,7 @@ async function jdPlantBean() { if ($.plantBeanIndexResult.code === '0') { const shareUrl = $.plantBeanIndexResult.data.jwordShareInfo.shareUrl $.myPlantUuid = getParam(shareUrl, 'plantUuid') - console.log(`\n【您的${$.name}互助码】 ${$.myPlantUuid}\n`); + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${$.myPlantUuid}\n`); roundList = $.plantBeanIndexResult.data.roundList; currentRoundId = roundList[1].roundId;//本期的roundId lastRoundId = roundList[0].roundId;//上期的roundId