diff --git a/ddnspod/build.sh b/ddnspod/build.sh index 76bf9efd..5db33da9 100755 --- a/ddnspod/build.sh +++ b/ddnspod/build.sh @@ -1,7 +1,7 @@ #!/bin/sh MODULE=ddnspod -VERSION=0.1.7 +VERSION=0.1.8 TITLE=DDnspod DESCRIPTION=使用Dnspod的ddns服务 HOME_URL=Module_ddnspod.asp diff --git a/ddnspod/config.json.js b/ddnspod/config.json.js index e38de7d4..344c5240 100644 --- a/ddnspod/config.json.js +++ b/ddnspod/config.json.js @@ -1,8 +1,8 @@ { -"version":"0.1.7", -"md5":"41e7334f0e30ddca4b7495931199cfef", +"version":"0.1.8", +"md5":"b97d3fe0b840a6ee4d29fcbd2c5f2504", "home_url":"Module_ddnspod.asp", "title":"DDnspod", "description":"使用Dnspod的ddns服务", -"build_date":"2020-01-03_14:38:36" +"build_date":"2020-09-20_11:56:34" } diff --git a/ddnspod/ddnspod.tar.gz b/ddnspod/ddnspod.tar.gz index 6729e347..241a6e5c 100644 Binary files a/ddnspod/ddnspod.tar.gz and b/ddnspod/ddnspod.tar.gz differ diff --git a/ddnspod/ddnspod/ddnspod/ddnspod.sh b/ddnspod/ddnspod/ddnspod/ddnspod.sh index a1776b6c..3b696503 100755 --- a/ddnspod/ddnspod/ddnspod/ddnspod.sh +++ b/ddnspod/ddnspod/ddnspod/ddnspod.sh @@ -13,7 +13,7 @@ # ====================================变量定义==================================== # 版本号定义 -version="0.1.6" +version="0.1.8" # 导入skipd数据 eval `dbus export ddnspod` @@ -115,10 +115,10 @@ arDdnsCheck() { return 0 } -parseDomain() { - mainDomain=${ddnspod_config_domain#*.} - local tmp=${ddnspod_config_domain%$mainDomain} - subDomain=${tmp%.} +readDomain() { + mainDomain=${ddnspod_config_maindomain} + subDomain=${ddnspod_config_subdomain} + dbus set ddnspod_run_domain=${subDomain}.${mainDomain} } #将执行脚本写入crontab定时运行 @@ -150,7 +150,7 @@ case $ACTION in start) #此处为开机自启动设计 if [ "$ddnspod_enable" == "1" ] && [ "$ddnspod_auto_start" == "1" ];then - parseDomain + readDomain add_ddnspod_cru sleep $ddnspod_delay_time arDdnsCheck $mainDomain $subDomain @@ -161,7 +161,7 @@ stop | kill ) ;; restart) stop_ddnspod - parseDomain + readDomain add_ddnspod_cru sleep $ddnspod_delay_time arDdnsCheck $mainDomain $subDomain diff --git a/ddnspod/ddnspod/webs/Module_ddnspod.asp b/ddnspod/ddnspod/webs/Module_ddnspod.asp index fac33f08..cb0191d2 100644 --- a/ddnspod/ddnspod/webs/Module_ddnspod.asp +++ b/ddnspod/ddnspod/webs/Module_ddnspod.asp @@ -132,6 +132,7 @@ $("#ddnspod_"+params[i]).val(db_ddnspod_[p + params[i]]); } } + $("#ddnspod_run_domain").html(db_ddnspod_['ddnspod_run_domain']); $("#ddnspod_run_state").html(db_ddnspod_['ddnspod_run_status']); setTimeout("write_ddnspod_run_status()", 10000); @@ -268,9 +269,15 @@ - 域名 + 主域名 - + + + + + 子域名 + + @@ -279,6 +286,14 @@ 运行状态 + + 域名 + + + + + + 状态 diff --git a/ddnspod/history/0.1.8/ddnspod.tar.gz b/ddnspod/history/0.1.8/ddnspod.tar.gz new file mode 100644 index 00000000..8d10be2e Binary files /dev/null and b/ddnspod/history/0.1.8/ddnspod.tar.gz differ diff --git a/ddnspod/history/version b/ddnspod/history/version index 61cce0b0..5f847566 100644 --- a/ddnspod/history/version +++ b/ddnspod/history/version @@ -1,2 +1,3 @@ 0.1.6 e5fbc2e4497375308c94e76d05ac547a 0.1.7 41e7334f0e30ddca4b7495931199cfef +0.1.8 26c42d61cf7f976d852a04dd15a35529 diff --git a/ddnspod/version b/ddnspod/version index e09be1e1..d3d6d709 100644 --- a/ddnspod/version +++ b/ddnspod/version @@ -1,2 +1,2 @@ -0.1.7 -41e7334f0e30ddca4b7495931199cfef +0.1.8 +b97d3fe0b840a6ee4d29fcbd2c5f2504 diff --git a/softcenter/app.json.js b/softcenter/app.json.js index e2e66cd5..655a4226 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -1,24 +1,14 @@ { "apps": [ { - "build_date": "2018-12-04_10:17:34", - "description": "让分流更简单", - "home_url": "Module_policy_route.asp", - "md5": "351e13b00885782adb0f09eb188d204e", - "name": "dualwan", - "tar_url": "dualwan/dualwan.tar.gz", - "title": "策略路由", - "version": "2.2" - }, - { - "build_date": "2018-09-12_20:15:49", - "description": "超强的SSH网页客户端~", - "home_url": "Module_shellinabox.asp", - "md5": "c0bcf36273926e7de6705995e57f409a", - "name": "shellinabox", - "tar_url": "shellinabox/shellinabox.tar.gz", - "title": "shellinabox", - "version": "2.0" + "build_date": "2017-09-11_00:04:13", + "description": "中文SSID,装逼利器!", + "home_url": "Module_ssid.asp", + "md5": "a5a0d0b75228af999c23eb219fb9aaa9", + "name": "ssid", + "tar_url": "ssid/ssid.tar.gz", + "title": "中文SSID", + "version": "1.3" }, { "build_date": "2017-09-10_23:58:54", @@ -31,24 +21,34 @@ "version": "0.3.6" }, { - "build_date": "2017-09-11_00:00:09", - "description": "让局域网控制能简单", - "home_url": "", - "md5": "077be5b7a1b6d41d81ae55bec6c1d07a", - "name": "phddns", - "tar_url": "phddns/phddns.tar.gz", - "title": "花生壳内网版", - "version": "0.2" + "build_date": "2018-09-12_20:15:49", + "description": "超强的SSH网页客户端~", + "home_url": "Module_shellinabox.asp", + "md5": "c0bcf36273926e7de6705995e57f409a", + "name": "shellinabox", + "tar_url": "shellinabox/shellinabox.tar.gz", + "title": "shellinabox", + "version": "2.0" }, { - "build_date": "2017-09-11_00:04:13", - "description": "中文SSID,装逼利器!", - "home_url": "Module_ssid.asp", - "md5": "a5a0d0b75228af999c23eb219fb9aaa9", - "name": "ssid", - "tar_url": "ssid/ssid.tar.gz", - "title": "中文SSID", - "version": "1.3" + "build_date": "2017-11-17_12:03:02", + "description": "SVPN让游戏更畅快", + "home_url": "Module_shadowvpn.asp", + "md5": "9c833f6df2fda45a3918fa43ac60e3ac", + "name": "shadowvpn", + "tar_url": "shadowvpn/shadowvpn.tar.gz", + "title": "Shadowvpn", + "version": "3.0" + }, + { + "build_date": "2018-12-04_10:17:34", + "description": "让分流更简单", + "home_url": "Module_policy_route.asp", + "md5": "351e13b00885782adb0f09eb188d204e", + "name": "dualwan", + "tar_url": "dualwan/dualwan.tar.gz", + "title": "策略路由", + "version": "2.2" }, { "build_date": "2017-09-10_23:58:09", @@ -61,14 +61,14 @@ "version": "0.2" }, { - "build_date": "2020-01-03_14:38:36", + "build_date": "2020-09-20_11:56:34", "description": "使用Dnspod的ddns服务", "home_url": "Module_ddnspod.asp", - "md5": "41e7334f0e30ddca4b7495931199cfef", + "md5": "b97d3fe0b840a6ee4d29fcbd2c5f2504", "name": "ddnspod", "tar_url": "ddnspod/ddnspod.tar.gz", "title": "DDnspod", - "version": "0.1.7" + "version": "0.1.8" }, { "build_date": "2017-09-11_00:04:49", @@ -81,14 +81,14 @@ "version": "2.2" }, { - "build_date": "2017-11-17_12:03:02", - "description": "SVPN让游戏更畅快", - "home_url": "Module_shadowvpn.asp", - "md5": "9c833f6df2fda45a3918fa43ac60e3ac", - "name": "shadowvpn", - "tar_url": "shadowvpn/shadowvpn.tar.gz", - "title": "Shadowvpn", - "version": "3.0" + "build_date": "2017-09-11_00:00:09", + "description": "让局域网控制能简单", + "home_url": "", + "md5": "077be5b7a1b6d41d81ae55bec6c1d07a", + "name": "phddns", + "tar_url": "phddns/phddns.tar.gz", + "title": "花生壳内网版", + "version": "0.2" } ], "home_url": "https://raw.githubusercontent.com/koolshare/koolshare.github.io/master",