Merge pull request #33 from mingxiaoyu/dev

Alidns  multiple  domain

applications/luci-app-cloudflarespeedtest/Makefile

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

applications/luci-app-cloudflarespeedtest/luasrc/model/cbi/cloudflarespeedtest/cloudflarespeedtest.lua

@@ -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.rmempty=true
 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:depends("DNS_enabled", 1)
 

applications/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh

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