Skip to content

[pull] master from iouAkira:master #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 25, 2021
Merged

[pull] master from iouAkira:master #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 68 additions & 67 deletions dd_scripts/shell_mod_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,67 +21,67 @@ cp /jds/dd_scripts/genCodeConf.list "$GEN_CODE_LIST"
# git -C /data/cust_repo/monk pull --rebase
# fi

if [ -n "$(ls /data/cust_repo/monk/car/*_*.js)" ]; then
cp -f /data/cust_repo/monk/car/*_*.js /scripts
cd /data/cust_repo/monk/car/
for scriptFile in $(ls *_*.js | grep -v monk_shop_add_to_car | tr "\n" " "); do
if [[ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" && -z $1 ]]; then
cp $scriptFile /scripts
if [ ! -n "$(crontab -l | grep $scriptFile)" ]; then
echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
fi
echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
fi
done
fi
# if [ -n "$(ls /data/cust_repo/monk/car/*_*.js)" ]; then
# cp -f /data/cust_repo/monk/car/*_*.js /scripts
# cd /data/cust_repo/monk/car/
# for scriptFile in $(ls *_*.js | grep -v monk_shop_add_to_car | tr "\n" " "); do
# if [[ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" && -z $1 ]]; then
# cp $scriptFile /scripts
# if [ ! -n "$(crontab -l | grep $scriptFile)" ]; then
# echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
# spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
# fi
# echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
# echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
# fi
# done
# fi

if [ -n "$(ls /data/cust_repo/monk/i-chenzhe/*_*.js | grep -v carnivalcity)" ]; then
cp -f /data/cust_repo/monk/i-chenzhe/*_*.js /scripts
cd /data/cust_repo/monk/i-chenzhe/
for scriptFile in $(ls *_*.js | tr "\n" " "); do
if [ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" ]; then
cp $scriptFile /scripts
if [[ ! -n "$(crontab -l | grep $scriptFile)" && -z $1 ]]; then
echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
fi
echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
fi
done
fi
if [ -n "$(ls /data/cust_repo/monk/member/*_*.js)" ]; then
cp -f /data/cust_repo/monk/member/*_*.js /scripts
cd /data/cust_repo/monk/member/
for scriptFile in $(ls *_*.js | tr "\n" " "); do
if [ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" ]; then
cp $scriptFile /scripts
if [[ ! -n "$(crontab -l | grep $scriptFile)" && -z $1 ]]; then
echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
fi
echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
fi
done
fi
if [ -n "$(ls /data/cust_repo/monk/normal/*_*.js)" ]; then
cp -f /data/cust_repo/monk/normal/*_*.js /scripts
cd /data/cust_repo/monk/normal/
for scriptFile in $(ls *_*.js | tr "\n" " "); do
if [ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" ]; then
cp $scriptFile /scripts
if [[ ! -n "$(crontab -l | grep $scriptFile)" && -z $1 ]]; then
echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
fi
echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
fi
done
fi
# if [ -n "$(ls /data/cust_repo/monk/i-chenzhe/*_*.js | grep -v carnivalcity)" ]; then
# cp -f /data/cust_repo/monk/i-chenzhe/*_*.js /scripts
# cd /data/cust_repo/monk/i-chenzhe/
# for scriptFile in $(ls *_*.js | tr "\n" " "); do
# if [ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" ]; then
# cp $scriptFile /scripts
# if [[ ! -n "$(crontab -l | grep $scriptFile)" && -z $1 ]]; then
# echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
# spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
# fi
# echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
# echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
# fi
# done
# fi
# if [ -n "$(ls /data/cust_repo/monk/member/*_*.js)" ]; then
# cp -f /data/cust_repo/monk/member/*_*.js /scripts
# cd /data/cust_repo/monk/member/
# for scriptFile in $(ls *_*.js | tr "\n" " "); do
# if [ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" ]; then
# cp $scriptFile /scripts
# if [[ ! -n "$(crontab -l | grep $scriptFile)" && -z $1 ]]; then
# echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
# spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
# fi
# echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
# echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
# fi
# done
# fi
# if [ -n "$(ls /data/cust_repo/monk/normal/*_*.js)" ]; then
# cp -f /data/cust_repo/monk/normal/*_*.js /scripts
# cd /data/cust_repo/monk/normal/
# for scriptFile in $(ls *_*.js | tr "\n" " "); do
# if [ -n "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile)" ]; then
# cp $scriptFile /scripts
# if [[ ! -n "$(crontab -l | grep $scriptFile)" && -z $1 ]]; then
# echo "发现以前crontab里面不存在的任务，先跑为敬 $scriptFile"
# spnode /scripts/$scriptFile | ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &
# fi
# echo "#monk-coder仓库任务-$(sed -n "s/.*new Env('\(.*\)').*/\1/p" $scriptFile)($scriptFile)" >>$mergedListFile
# echo "$(sed -n "s/.*cronexpr=\"\(.*\)\".*/\1/p" $scriptFile) spnode /scripts/$scriptFile |ts >>/data/logs/$(echo $scriptFile | sed "s/.js/.log/g") 2>&1 &" >>$mergedListFile
# fi
# done
# fi

# echo "附加功能3，拉取@nianyuguai的longzhuzhu仓库的代码，并增加相关任务"
# if [ ! -d "/data/cust_repo/longzhuzhu/" ]; then
Expand All @@ -92,6 +92,7 @@ fi
# git -C /data/cust_repo/longzhuzhu reset --hard
# git -C /data/cust_repo/longzhuzhu pull --rebase
# fi

if [ -n "$(ls /data/cust_repo/longzhuzhu/qx/*_*.js)" ]; then
cp -f /data/cust_repo/longzhuzhu/qx/*_*.js /scripts
cd /data/cust_repo/longzhuzhu/qx/
Expand Down Expand Up @@ -177,17 +178,17 @@ sed -i "/TG_USER_ID =/s/= \(.*\)/= $TG_USER_ID/g" /data/cust_repo/curtinlv/OpenC
# echo "#curtinlv的赚京豆 " >>$mergedListFile
# echo "05 0,7,23 * * * cd /data/cust_repo/curtinlv && python3 jd_zjd.py |ts >>/data/logs/jd_zjd.log 2>&1 &" >>$mergedListFile

echo "#curtinlv抢京豆" >>$mergedListFile
echo "11 0 * * * cd /data/cust_repo/curtinlv && python3 jd_qjd.py |ts >>/data/logs/jd_qjd.log 2>&1 &" >>$mergedListFile
# echo "#curtinlv抢京豆" >>$mergedListFile
# echo "11 0 * * * cd /data/cust_repo/curtinlv && python3 jd_qjd.py |ts >>/data/logs/jd_qjd.log 2>&1 &" >>$mergedListFile

echo "#curtinlv东东超市兑换" >>$mergedListFile
sed -i "/coinToBeans =/s/''/'京豆包'/g" /data/cust_repo/curtinlv/jd_blueCoin.py
sed -i "/blueCoin_Cc = /s/False/True/g" /data/cust_repo/curtinlv/jd_blueCoin.py
echo "59 23 * * * cd /data/cust_repo/curtinlv && python3 jd_blueCoin.py |ts >>/data/logs/jd_blueCoinPy.log 2>&1 &" >>$mergedListFile

echo "#curtinlv的会员开卡仓库任务 " >>$mergedListFile
echo "2 8,15 * * * cd /data/cust_repo/curtinlv/OpenCard && python3 jd_OpenCard.py |ts >>/data/logs/jd_OpenCard.log 2>&1 &" >>$mergedListFile
# echo "#curtinlv的会员开卡仓库任务 " >>$mergedListFile
# echo "2 8,15 * * * cd /data/cust_repo/curtinlv/OpenCard && python3 jd_OpenCard.py |ts >>/data/logs/jd_OpenCard.log 2>&1 &" >>$mergedListFile

echo "#curtinlv的关注有礼任务 " >>$mergedListFile
cat /data/cookies.list >/data/cust_repo/curtinlv/getFollowGifts/JDCookies.txt
echo "15 8,15 * * * cd /data/cust_repo/curtinlv/getFollowGifts && python3 jd_getFollowGift.py |ts >>/data/logs/jd_getFollowGift.log 2>&1 &" >>$mergedListFile
# echo "#curtinlv的关注有礼任务 " >>$mergedListFile
# cat /data/cookies.list >/data/cust_repo/curtinlv/getFollowGifts/JDCookies.txt
# echo "15 8,15 * * * cd /data/cust_repo/curtinlv/getFollowGifts && python3 jd_getFollowGift.py |ts >>/data/logs/jd_getFollowGift.log 2>&1 &" >>$mergedListFile