diff --git a/package/lean/ddns-scripts_dnspod/Makefile b/package/lean/ddns-scripts_dnspod/Makefile index 3f564bd482..db94d661fd 100644 --- a/package/lean/ddns-scripts_dnspod/Makefile +++ b/package/lean/ddns-scripts_dnspod/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_dnspod PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Small_5 diff --git a/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh b/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh index ec2e0a9294..9438d4b601 100644 --- a/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh +++ b/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh @@ -78,7 +78,8 @@ dnspod_transfer() { __ERR=`jsonfilter -i $DATFILE -e "@.status.code"` [ $__ERR -eq 1 ] && return 0 - [ $__ERR -ne 0 ] && write_log 3 "Error message:[$(jsonfilter -i $DATFILE -e "@.status.message")]" + [ $__A -eq 0 ] && [ $__ERR -eq 10 ] && return 0 + write_log 3 "Error message:[$(jsonfilter -i $DATFILE -e "@.status.message")]" if [ $VERBOSE -gt 1 ]; then write_log 4 "Transfer failed - detailed mode: $VERBOSE - Do not try again after an error" @@ -98,43 +99,45 @@ dnspod_transfer() { #添加解析记录 add_domain() { -dnspod_transfer 1 -write_log 7 "Add new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP] successfully!" -return 0 + dnspod_transfer 1 + write_log 7 "Add new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP] successfully!" + return 0 } #修改解析记录 update_domain() { -dnspod_transfer 2 -write_log 7 "Modify new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP],[TTL:$__TTL] successfully!" -return 0 + dnspod_transfer 2 + write_log 7 "Modify new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP],[TTL:$__TTL] successfully!" + return 0 } #获取域名解析记录 describe_domain() { ret=0 - __POST="login_token=$username,$password&format=json&domain=$__DOMAIN" - __POST1="$__POST&sub_domain=$__HOST&value=$__IP&record_type=$__TYPE&record_line_id=0" + __POST="login_token=$username,$password&format=json&domain=$__DOMAIN&sub_domain=$__HOST" + __POST1="$__POST&value=$__IP&record_type=$__TYPE&record_line_id=0" dnspod_transfer 0 - __value=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].name"` + __TMP=`jsonfilter -i $DATFILE -e "@.records[@.type!='NS']"` + __value=`jsonfilter -s "$__TMP" -e "@.name"` if [ "$__value" == "" ]; then write_log 7 "Parsing record:[${__HOST}.${__DOMAIN}] does not exist" ret=1 else - __value=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].type"` + __RECID=`jsonfilter -s "$__TMP" -e "@.id"` + __value=`jsonfilter -s "$__TMP" -e "@.type"` + __TTL=`jsonfilter -s "$__TMP" -e "@.ttl"` + write_log 7 "Get parsing recordID:[$__RECID]" if [ "$__value" != "$__TYPE" ]; then write_log 7 "Current parsing [type:$__TYPE], get mismatched [type:$__value]" + write_log 7 "Address needs to be modified, local address:[$__IP]" ret=2 else - __RECID=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].id"` - write_log 7 "Get parsing recordID:[$__RECID]" - __RECIP=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].value"` + __RECIP=`jsonfilter -s "$__TMP" -e "@.value"` if [ "$__RECIP" != "$__IP" ]; then write_log 7 "Address needs to be modified, local address:[$__IP]" ret=2 fi fi - __TTL=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].ttl"` fi } diff --git a/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh b/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh index 576ce4fbc0..be71d6356c 100644 --- a/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh +++ b/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh @@ -86,7 +86,8 @@ dnspod_transfer() { __ERR=`jsonfilter -i $DATFILE -e "@.status.code"` [ $__ERR -eq 1 ] && return 0 - [ $__ERR -ne 0 ] && write_log 3 "Error message:[$(jsonfilter -i $DATFILE -e "@.status.message")]" + [ $__A -eq 1 ] && [ $__ERR -eq 10 ] && return 0 + write_log 3 "Error message:[$(jsonfilter -i $DATFILE -e "@.status.message")]" if [ $VERBOSE -gt 1 ]; then write_log 4 "Transfer failed - detailed mode: $VERBOSE - Do not try again after an error" @@ -106,16 +107,16 @@ dnspod_transfer() { #添加解析记录 add_domain() { -dnspod_transfer 2 -write_log 7 "Add new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP] successfully!" -return 0 + dnspod_transfer 2 + write_log 7 "Add new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP] successfully!" + return 0 } #修改解析记录 update_domain() { -dnspod_transfer 3 -write_log 7 "Modify new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP],[TTL:$__TTL] successfully!" -return 0 + dnspod_transfer 3 + write_log 7 "Modify new parsing record [${__HOST}.${__DOMAIN}],[type:$__TYPE],[ip:$__IP],[TTL:$__TTL] successfully!" + return 0 } #获取域名解析记录 @@ -123,28 +124,30 @@ describe_domain() { ret=0 dnspod_transfer 0 __TOKEN=`jsonfilter -i $DATFILE -e "@.user_token"` - __POST="user_token=$__TOKEN&format=json&domain=$__DOMAIN" - __POST1="$__POST&sub_domain=$__HOST&value=$__IP&record_type=$__TYPE&record_line=default" + __POST="user_token=$__TOKEN&format=json&domain=$__DOMAIN&sub_domain=$__HOST" + __POST1="$__POST&value=$__IP&record_type=$__TYPE&record_line=default" dnspod_transfer 1 - __value=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].name"` + __TMP=`jsonfilter -i $DATFILE -e "@.records[@.type!='NS']"` + __value=`jsonfilter -s "$__TMP" -e "@.name"` if [ "$__value" == "" ]; then write_log 7 "Parsing record:[${__HOST}.${__DOMAIN}] does not exist" ret=1 else - __value=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].type"` + __RECID=`jsonfilter -s "$__TMP" -e "@.id"` + __value=`jsonfilter -s "$__TMP" -e "@.type"` + __TTL=`jsonfilter -s "$__TMP" -e "@.ttl"` + write_log 7 "Get parsing recordID:[$__RECID]" if [ "$__value" != "$__TYPE" ]; then write_log 7 "Current parsing [type:$__TYPE], get mismatched [type:$__value]" + write_log 7 "Address needs to be modified, local address:[$__IP]" ret=2 else - __RECID=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].id"` - write_log 7 "Get parsing recordID:[$__RECID]" - __RECIP=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].value"` + __RECIP=`jsonfilter -s "$__TMP" -e "@.value"` if [ "$__RECIP" != "$__IP" ]; then write_log 7 "Address needs to be modified, local address:[$__IP]" ret=2 fi fi - __TTL=`jsonfilter -i $DATFILE -e "@.records[@.name='$__HOST'].ttl"` fi } diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index 74821fa98b..5b03959844 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -350,7 +350,6 @@ o = s:option(Flag, "mux", translate("Mux")) o.rmempty = true o.default = "0" o:depends("type", "v2ray") -o:depends("type", "trojan") o = s:option(Value, "concurrency", translate("Concurrency")) o.datatype = "uinteger" @@ -363,6 +362,7 @@ o.rmempty = true o.default = "0" o:depends("type", "ssr") o:depends("type", "ss") +o:depends("type", "trojan") o = s:option(Flag, "switch_enable", translate("Enable Auto Switch")) o.rmempty = false diff --git a/package/lean/npc/Makefile b/package/lean/npc/Makefile index f14c1cf9cc..a29d311754 100644 --- a/package/lean/npc/Makefile +++ b/package/lean/npc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=npc -PKG_VERSION:=0.26.0 +PKG_VERSION:=0.26.1 PKG_RELEASE:=1 ifeq ($(ARCH),mipsel)