Skip to content

Commit

Permalink
增加CFD_NOTIFY_CONTROL,JD_JXD_EXCHANGE,JOY_RUN_HELP_MYSELF以及jd_global助力码。
Browse files Browse the repository at this point in the history
  • Loading branch information
anonymousUse committed Mar 8, 2021
1 parent d47bd0e commit 7823f3b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 14 deletions.
11 changes: 10 additions & 1 deletion git_pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ function Git_PullScripts {
echo
}

## 更新docker-entrypoint
function Update_Entrypoint {
if [[ $(cat ${ShellDir}/docker/docker-entrypoint.sh) != $(cat /usr/local/bin/docker-entrypoint.sh) ]]; then
cp -f ${ShellDir}/docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
chmod 777 /usr/local/bin/docker-entrypoint.sh
fi
}

## 用户数量UserSum
function Count_UserSum {
i=1
Expand Down Expand Up @@ -321,8 +329,9 @@ fi
echo -e "\nJS脚本目录:${ScriptsDir}\n"
echo -e "--------------------------------------------------------------\n"

## 更新shell,更新crontab
## 更新shell,更新docker-entrypoint, crontab
Git_PullShell
Update_Entrypoint
[[ ${ExitStatusShell} -eq 0 ]] && echo -e "更新shell成功...\n" || echo -e "更新shell失败,请检查原因...\n"
[[ $(date "+%-H") -le 2 ]] && Update_Cron

Expand Down
1 change: 1 addition & 0 deletions jd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ function Combin_All {
export JD_CASH_SHARECODES=$(Combin_Sub ForOtherCash)
export JDSGMH_SHARECODES=$(Combin_Sub ForOtherSgmh)
export JDCFD_SHARECODES=$(Combin_Sub ForOtherCfd)
export JDGLOBAL_SHARECODES=$(Combin_Sub ForOtherGlobal)
}

## 转换JD_BEAN_SIGN_STOP_NOTIFY或JD_BEAN_SIGN_NOTIFY_SIMPLE
Expand Down
39 changes: 26 additions & 13 deletions sample/config.sh.sample
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Version: v3.27.0
## Version: v3.28.0
## Date: 2021-03-08
## Update Content: 增加CFD_NOTIFY_CONTROL和JD_JXD_EXCHANGE
## Update Content: 增加CFD_NOTIFY_CONTROL,JD_JXD_EXCHANGE,JOY_RUN_HELP_MYSELF以及jd_global助力码。

## 上面版本号中,如果第2位数字有变化,那么代表增加了新的参数,如果只有第3位数字有变化,仅代表更新了注释,没有增加新的参数,可更新可不更新

Expand Down Expand Up @@ -378,6 +378,25 @@ ForOtherCfd5=""
ForOtherCfd6=""


################################## 定义jd_global活动互助(选填) ##################################
## 具体填法及要求详见本文件最下方“互助码填法示例”
MyGlobal1=""
MyGlobal2=""
MyGlobal3=""
MyGlobal4=""
MyGlobal5=""
MyGlobal6=""
MyGlobalA=""
MyGlobalB=""

ForOtherGlobal1=""
ForOtherGlobal2=""
ForOtherGlobal3=""
ForOtherGlobal4=""
ForOtherGlobal5=""
ForOtherGlobal6=""


################################## 定义jd_superMarket蓝币兑换数量(选填) ##################################
## jd_superMarket蓝币兑换,可用值包括:
## 一、0:表示不兑换京豆,这也是js脚本的默认值
Expand All @@ -393,17 +412,6 @@ export MARKET_COIN_TO_BEANS="0"
export MARKET_REWARD_NOTIFY=""


################################## 定义jd_superMarket是否自动升级商品和货架(选填) ##################################
## 升级顺序:解锁升级商品、升级货架,默认 "true" 自动升级,如需关闭自动升级,请改为 "false"
export SUPERMARKET_UPGRADE=""


################################## 定义jd_superMarket是否自动更换商圈(选填) ##################################
## 小于对方300热力值自动更换商圈队伍,默认 "true" 自动更换,如不想更换商圈,请改为 "false"
## 目前已无此功能,申明了也无效
# export BUSINESS_CIRCLE_JUMP=""


################################## 定义jd_superMarket是否自动使用金币去抽奖(选填) ##################################
## 是否用金币去抽奖,默认 "false" 关闭,如需开启,请修改为 "true"
export SUPERMARKET_LOTTERY=""
Expand Down Expand Up @@ -463,6 +471,11 @@ export JOY_RUN_FLAG=""
export JOY_TEAM_LEVEL=""


################################## 定义jd_joy赛跑自己账号内部是否开启互助(选填) ##################################
## 输入 true 为开启内部互助
export JOY_RUN_HELP_MYSELF=""


################################## 定义jd_joy赛跑获胜后是否推送通知(选填) ##################################
## 控制jd_joy.js脚本jd_joy赛跑获胜后是否推送通知,"false" 为否(不推送通知消息),"true" 为是(即:发送推送通知消息),默认为 "true"
export JOY_RUN_NOTIFY=""
Expand Down

0 comments on commit 7823f3b

Please sign in to comment.