Skip to content
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

enhance log and IPV4 result #135

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

enhance log and IPV4 result #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef01ea4
Update pushplus_check.sh
babylife Jun 16, 2023
927827e
Update pushplus_dhcp_trigger.sh
babylife Jun 16, 2023
3f33576
Update pushplus_ifup_trigger.sh
babylife Jun 16, 2023
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
17 changes: 10 additions & 7 deletions pushplus/pushplus/scripts/pushplus_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ if [[ "${pushplus_info_wan}" == "1" ]]; then
router_wan0_gw=$(nvram get wan0_gw_ifname)
router_wan0_ip=$(nvram get wan0_ipaddr)
if [[ "${pushplus_info_pub}" == "1" ]]; then
router_wan0_ip4=$(curl -4 --interface ${router_wan0_gw} -s http://api.ip.sb/ip 2>&1)
router_wan0_ip6=$(curl -6 --interface ${router_wan0_gw} -s http://api.ip.sb/ip 2>&1)
router_wan0_ip4=$(curl -4 -s http://api.ip.sb/ip 2>&1)
router_wan0_ip6=$(curl -6 -s http://api.ip.sb/ip 2>&1)
else
router_wan0_ip4=${router_wan0_ip}
router_wan0_ip6=""
Expand Down Expand Up @@ -170,7 +170,7 @@ if [[ "${pushplus_info_wan}" == "1" ]]; then
router_wan1_proto=$(nvram get wan1_proto)
router_wan1_ip=$(nvram get wan1_ipaddr)
if [[ "${pushplus_info_pub}" == "1" ]]; then
router_wan1_ip4=$(curl -4 --interface ${router_wan1_gw} -s http://api.ip.sb/ip 2>&1)
router_wan1_ip4=$(curl -4 -s http://api.ip.sb/ip 2>&1)
router_wan1_ip6=$(curl -6 --interface ${router_wan1_gw} -s http://api.ip.sb/ip 2>&1)
else
router_wan1_ip4=${router_wan1_ip}
Expand Down Expand Up @@ -413,7 +413,7 @@ if [[ "${pushplus_info_dhcp}" == "1" ]]; then
fi

echo '}' >>${pushplus_info_text}

#logger "[pushplus] pushplus_info_text为：${pushplus_info_text}"
pushplus_send_content=$(jq -c . ${pushplus_info_text})
pushplus_send_title="${send_title}状态信息"

Expand All @@ -426,9 +426,12 @@ for nu in ${token_nu}; do
url="https://www.pushplus.plus/send/${pushplus_config_token}"
reqstr="curl -H \"content-type:application/json\" -X POST -d '{\"template\":\"route\",\"topic\":\""${pushplus_config_topic}"\",\"channel\":\""${pushplus_config_channel}"\",\"title\":\""${pushplus_send_title}"\",\"content\":"${pushplus_send_content}"}' ${url}"
result=$(eval ${reqstr})
if [[ -n "$(echo $result | grep "success")" ]]; then
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 成功！！"
[ "${pushplus_info_logger}" == "1" ]&& logger "[pushplus] reqstr为：${reqstr}"
if [[ -n "$(echo $result | grep "请求成功")" ]]; then
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 成功！！,返回结果为：${result}"
#logger "[pushplus] 返回结果为：${result}"
else
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 失败，请检查网络及配置！"
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 失败，请检查网络及配置！返回结果为：${result}"
#logger "[pushplus] 返回结果为：${result}"
fi
done
2 changes: 1 addition & 1 deletion pushplus/pushplus/scripts/pushplus_dhcp_trigger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ for nu in ${token_nu}; do
url="https://www.pushplus.plus/send/${pushplus_config_token}"
reqstr="curl -H \"content-type:application/json\" -X POST -d '{\"template\":\"route\",\"topic\":\""${pushplus_config_topic}"\",\"channel\":\""${pushplus_config_channel}"\",\"title\":\""${pushplus_send_title}"\",\"content\":"${pushplus_send_content}"}' ${url}"
result=$(eval ${reqstr})
if [[ -n "$(echo $result | grep "success")" ]]; then
if [[ -n "$(echo $result | grep "请求成功")" ]]; then
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 成功！！"
else
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 失败，请检查网络及配置！"
Expand Down
13 changes: 8 additions & 5 deletions pushplus/pushplus/scripts/pushplus_ifup_trigger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ router_wan0_ifname=$(nvram get wan0_ifname)
router_wan0_gw=$(nvram get wan0_gw_ifname)
router_wan0_ip=$(nvram get wan0_ipaddr)
if [[ "${pushplus_info_pub}" == "1" ]]; then
router_wan0_ip4=$(curl -4 --interface ${router_wan0_gw} -s http://api.ip.sb/ip 2>&1)
router_wan0_ip6=$(curl -6 --interface ${router_wan0_gw} -s http://api.ip.sb/ip 2>&1)
router_wan0_ip4=$(curl -4 -s http://api.ip.sb/ip 2>&1)
router_wan0_ip6=$(curl -6 -s http://api.ip.sb/ip 2>&1)
else
router_wan0_ip4=${router_wan0_ip}
router_wan0_ip6=""
Expand Down Expand Up @@ -96,10 +96,13 @@ for nu in ${token_nu}; do
url="https://www.pushplus.plus/send/${pushplus_config_token}"
reqstr="curl -H \"content-type:application/json\" -X POST -d '{\"template\":\"route\",\"topic\":\""${pushplus_config_topic}"\",\"channel\":\""${pushplus_config_channel}"\",\"title\":\""${pushplus_send_title}"\",\"content\":"${pushplus_send_content}"}' ${url}"
result=$(eval ${reqstr})
if [[ -n "$(echo $result | grep "success")" ]]; then
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 成功！！"
[ "${pushplus_info_logger}" == "1" ]&& logger "[pushplus] reqstr为：${reqstr}"
if [[ -n "$(echo $result | grep "请求成功")" ]]; then
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 成功！！,返回结果为：${result}"
#logger "[pushplus] 返回结果为：${result}"
else
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 失败，请检查网络及配置！"
[ "${pushplus_info_logger}" == "1" ] && logger "[pushplus]: 网络重启信息推送到 TOKEN No.${nu} 失败，请检查网络及配置！返回结果为：${result}"
#logger "[pushplus] 返回结果为：${result}"
fi
done
sleep 2
Expand Down