update 2022-05-14 23:42:02

This commit is contained in:
github-actions[bot] 2022-05-14 23:42:02 +08:00
parent db67ae642e
commit 247e988dc0
6 changed files with 15 additions and 10 deletions

View File

@ -10,7 +10,7 @@ PKG_NAME:=luci-app-cloudflarespeedtest
LUCI_TITLE:=LuCI support for Cloudflares Speed Test LUCI_TITLE:=LuCI support for Cloudflares Speed Test
LUCI_DEPENDS:=+cdnspeedtest +openssl-util +curl LUCI_DEPENDS:=+cdnspeedtest +openssl-util +curl
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_VERSION:=1.4.5 PKG_VERSION:=1.4.6
PKG_RELEASE:=0 PKG_RELEASE:=0
PKG_LICENSE:=AGPL-3.0 PKG_LICENSE:=AGPL-3.0
PKG_MAINTAINER:=mingxiaoyu <fengying0347@163.com> PKG_MAINTAINER:=mingxiaoyu <fengying0347@163.com>

View File

@ -296,7 +296,7 @@ o:depends("DNS_enabled", 1)
o=s:taboption("dnstab", Value,"main_domain",translate("Main Domain"),translate("For example: test.github.com -> github.com")) o=s:taboption("dnstab", Value,"main_domain",translate("Main Domain"),translate("For example: test.github.com -> github.com"))
o.rmempty=true o.rmempty=true
o:depends("DNS_enabled", 1) o:depends("DNS_enabled", 1)
o=s:taboption("dnstab", Value,"sub_domain",translate("Sub Domain"),translate("For example: test.github.com -> test")) o=s:taboption("dnstab", DynamicList,"sub_domain",translate("Sub Domain"),translate("For example: test.github.com -> test"))
o.rmempty=true o.rmempty=true
o:depends("DNS_enabled", 1) o:depends("DNS_enabled", 1)

View File

@ -113,6 +113,7 @@ function speed_test(){
uci commit vssr uci commit vssr
/etc/init.d/vssr restart /etc/init.d/vssr restart
fi fi
echo $command >> $LOG_FILE 2>&1 echo $command >> $LOG_FILE 2>&1
echolog "-----------start----------" echolog "-----------start----------"
$command >> $LOG_FILE 2>&1 $command >> $LOG_FILE 2>&1
@ -258,8 +259,12 @@ function alidns_ip(){
if [ $DNS_enabled -eq "1" ] ;then if [ $DNS_enabled -eq "1" ] ;then
get_servers_config "DNS_type" "app_key" "app_secret" "main_domain" "sub_domain" "line" get_servers_config "DNS_type" "app_key" "app_secret" "main_domain" "sub_domain" "line"
if [ $DNS_type == "aliyu" ] ;then if [ $DNS_type == "aliyu" ] ;then
/usr/bin/cloudflarespeedtest/aliddns.sh $app_key $app_secret $main_domain $sub_domain $line $ipv6_enabled $bestip for sub in $sub_domain
echolog "更新阿里云DNS完成" do
echolog "更新域名$sub 阿里云DNS完成"
/usr/bin/cloudflarespeedtest/aliddns.sh $app_key $app_secret $main_domain $sub $line $ipv6_enabled $bestip
done
fi fi
fi fi
} }

View File

@ -23,7 +23,7 @@ m.description=translate("Convert Subscribe function of Online is Supported By su
"<br/>".. "<br/>"..
"<br/>"..translate("If you need to customize the external configuration file (subscription conversion template), please write it according to the instructions, upload it to the accessible location of the external network, and fill in the address correctly when using it").. "<br/>"..translate("If you need to customize the external configuration file (subscription conversion template), please write it according to the instructions, upload it to the accessible location of the external network, and fill in the address correctly when using it")..
"<br/>".. "<br/>"..
"<br/>"..translate("If you have a recommended external configuration file (subscription conversion template), you can modify by following The file format of /usr/share/opencrash/res/sub_ini.list and pr") "<br/>"..translate("If you have a recommended external configuration file (subscription conversion template), you can modify by following The file format of /usr/share/openclash/res/sub_ini.list and pr")
m.redirect = luci.dispatcher.build_url("admin/services/openclash/config-subscribe") m.redirect = luci.dispatcher.build_url("admin/services/openclash/config-subscribe")
if m.uci:get(openclash, sid) ~= "config_subscribe" then if m.uci:get(openclash, sid) ~= "config_subscribe" then
luci.http.redirect(m.redirect) luci.http.redirect(m.redirect)

View File

@ -1564,7 +1564,7 @@ msgstr "开始下载"
msgid "Download Successful, Start Pre Update Test..." msgid "Download Successful, Start Pre Update Test..."
msgstr "下载成功,开始进行更新前测试..." msgstr "下载成功,开始进行更新前测试..."
msgid "Pre Update Test Failed, The File is Saved in /tmp/opencrash.ipk, Please Try to Update Manually!" msgid "Pre Update Test Failed, The File is Saved in /tmp/openclash.ipk, Please Try to Update Manually!"
msgstr "更新前测试失败,文件保存在 /tmp/openclash.ipk请尝试手动更新" msgstr "更新前测试失败,文件保存在 /tmp/openclash.ipk请尝试手动更新"
msgid "Pre Update Test Passed, Ready to Update and Please Do not Refresh The Page and Other Operations..." msgid "Pre Update Test Passed, Ready to Update and Please Do not Refresh The Page and Other Operations..."
@ -2113,7 +2113,7 @@ msgstr "subconverter 外部配置(订阅转换模板)说明https://github.com
msgid "If you need to customize the external configuration file (subscription conversion template), please write it according to the instructions, upload it to the accessible location of the external network, and fill in the address correctly when using it" msgid "If you need to customize the external configuration file (subscription conversion template), please write it according to the instructions, upload it to the accessible location of the external network, and fill in the address correctly when using it"
msgstr "如需自定义外部配置文件(订阅转换模板),请按照说明编写后上传至外部网络可访问的位置,并在使用时正确填写地址" msgstr "如需自定义外部配置文件(订阅转换模板),请按照说明编写后上传至外部网络可访问的位置,并在使用时正确填写地址"
msgid "If you have a recommended external configuration file (subscription conversion template), you can modify by following The file format of /usr/share/opencrash/res/sub_ini.list and pr" msgid "If you have a recommended external configuration file (subscription conversion template), you can modify by following The file format of /usr/share/openclash/res/sub_ini.list and pr"
msgstr "如您有值得推荐的外部配置文件(订阅转换模板),可以按照 /usr/share/openclash/res/sub_ini.list 的文件格式修改后提交PR" msgstr "如您有值得推荐的外部配置文件(订阅转换模板),可以按照 /usr/share/openclash/res/sub_ini.list 的文件格式修改后提交PR"
msgid "Note: To restore the default configuration, try accessing:" msgid "Note: To restore the default configuration, try accessing:"
@ -2933,4 +2933,4 @@ msgid "Enable Tcp Concurrent"
msgstr "*启用 TCP 并发" msgstr "*启用 TCP 并发"
msgid "TCP Concurrent Request IPs, Choose The Lowest Latency One To Connection" msgid "TCP Concurrent Request IPs, Choose The Lowest Latency One To Connection"
msgstr "TCP 并发请求所有 IP 地址,然后选择延迟最低的一个进行连接" msgstr "TCP 并发请求所有 IP 地址,然后选择延迟最低的一个进行连接"

View File

@ -47,7 +47,7 @@ if [ "$(expr "$OP_LV" \> "$OP_CV")" -eq 1 ] && [ -f "$LAST_OPVER" ]; then
LOG_OUT "【OpenClash - v$LAST_VER】Download Successful, Start Pre Update Test..." LOG_OUT "【OpenClash - v$LAST_VER】Download Successful, Start Pre Update Test..."
if [ -z "$(opkg install /tmp/openclash.ipk --noaction 2>/dev/null |grep 'Upgrading luci-app-openclash on root' 2>/dev/null)" ]; then if [ -z "$(opkg install /tmp/openclash.ipk --noaction 2>/dev/null |grep 'Upgrading luci-app-openclash on root' 2>/dev/null)" ]; then
LOG_OUT "【OpenClash - v$LAST_VER】Pre Update Test Failed, The File is Saved in /tmp/opencrash.ipk, Please Try to Update Manually!" LOG_OUT "【OpenClash - v$LAST_VER】Pre Update Test Failed, The File is Saved in /tmp/openclash.ipk, Please Try to Update Manually!"
if [ "$(uci -q get openclash.config.config_reload)" -eq 0 ]; then if [ "$(uci -q get openclash.config.config_reload)" -eq 0 ]; then
/etc/init.d/openclash restart >/dev/null 2>&1 & /etc/init.d/openclash restart >/dev/null 2>&1 &
else else
@ -123,4 +123,4 @@ else
SLOG_CLEAN SLOG_CLEAN
fi fi
fi fi
del_lock del_lock