Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -10,6 +10,7 @@ jxFactoryFile="${logdDir}/jd_dreamFactory.log"
|
|||||||
plantBean="${logdDir}/jd_plantBean.log"
|
plantBean="${logdDir}/jd_plantBean.log"
|
||||||
jdfruit="${logdDir}/jd_fruit.log"
|
jdfruit="${logdDir}/jd_fruit.log"
|
||||||
jdpet="${logdDir}/jd_pet.log"
|
jdpet="${logdDir}/jd_pet.log"
|
||||||
|
jdcrazyJoy="${logdDir}/jd_crazy_joy.log"
|
||||||
|
|
||||||
echo -e >$sharecodeFile
|
echo -e >$sharecodeFile
|
||||||
|
|
||||||
@@ -31,6 +32,9 @@ echo "提取京东农场助力码完成"
|
|||||||
sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
|
sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
|
||||||
echo "提取东东萌宠助力码完成"
|
echo "提取东东萌宠助力码完成"
|
||||||
|
|
||||||
|
sed -n '/crazyJoy任务好友互助码】.*/'p $jdcrazyJoy | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
|
||||||
|
echo "提取crazyJoy任务助力码完成"
|
||||||
|
|
||||||
echo "==========================================================================="
|
echo "==========================================================================="
|
||||||
echo "整理完成,具体结果请查看${sharecodeFile}文件"
|
echo "整理完成,具体结果请查看${sharecodeFile}文件"
|
||||||
|
|
||||||
@@ -38,17 +42,18 @@ echo "处理jd_crazy_joy_coin任务。。。"
|
|||||||
if [ ! $CRZAY_JOY_COIN_ENABLE ]; then
|
if [ ! $CRZAY_JOY_COIN_ENABLE ]; then
|
||||||
echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务,并重启"
|
echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务,并重启"
|
||||||
eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
|
eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
|
||||||
node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1 &
|
echo '' >/scripts/logs/jd_crazy_joy_coin.log
|
||||||
|
node /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 &
|
||||||
echo "默认jd_crazy_joy_coin重启完成"
|
echo "默认jd_crazy_joy_coin重启完成"
|
||||||
else
|
else
|
||||||
if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then
|
if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then
|
||||||
echo "配置启用jd_crazy_joy_coin,杀掉jd_crazy_joy_coin任务,并重启"
|
echo "配置启用jd_crazy_joy_coin,杀掉jd_crazy_joy_coin任务,并重启"
|
||||||
eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
|
eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
|
||||||
node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1 &
|
echo '' >/scripts/logs/jd_crazy_joy_coin.log
|
||||||
|
node /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 &
|
||||||
echo "配置jd_crazy_joy_coin重启完成"
|
echo "配置jd_crazy_joy_coin重启完成"
|
||||||
else
|
else
|
||||||
eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
|
eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
|
||||||
echo "已配置不启用jd_crazy_joy_coin任务,不处理"
|
echo "已配置不启用jd_crazy_joy_coin任务,不处理"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@@ -325,7 +325,7 @@ function getUserInfo(code = "EdLPh8A6X5G1iWXu-uPYfA==") {
|
|||||||
if (safeGet(data)) {
|
if (safeGet(data)) {
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
if (data.success && data.data && data.data.userInviteCode) {
|
if (data.success && data.data && data.data.userInviteCode) {
|
||||||
console.log(`您的助力码为: ${data.data.userInviteCode}`)
|
console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${data.data.userInviteCode}`)
|
||||||
$.selfCodes.push(data.data.userInviteCode)
|
$.selfCodes.push(data.data.userInviteCode)
|
||||||
$.nextCode = data.data.userInviteCode
|
$.nextCode = data.data.userInviteCode
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user