diff --git a/aliddns/aliddns.tar.gz b/aliddns/aliddns.tar.gz index b132788..114ab53 100644 Binary files a/aliddns/aliddns.tar.gz and b/aliddns/aliddns.tar.gz differ diff --git a/aliddns/aliddns/webs/Module_aliddns.asp b/aliddns/aliddns/webs/Module_aliddns.asp index d2cfc91..25f65c9 100644 --- a/aliddns/aliddns/webs/Module_aliddns.asp +++ b/aliddns/aliddns/webs/Module_aliddns.asp @@ -8,17 +8,109 @@ Aliddns + - - + + + + + + + + + + + - +
+ +
+"> +" disabled> +"> +"> @@ -107,7 +199,7 @@
 
- +
@@ -127,83 +219,5 @@ - - diff --git a/aliddns/config.json.js b/aliddns/config.json.js index 08cf693..b08fa23 100644 --- a/aliddns/config.json.js +++ b/aliddns/config.json.js @@ -1,8 +1,8 @@ { "version":"1.2", -"md5":"b775cde3f6f8f552f28c59e8d2d95bc1", +"md5":"15afe00f95c31fdee8ae7a0ada6518ea", "home_url":"Module_aliddns.asp", "title":"aliddns", "description":"阿里云解析自动更新IP", -"build_date":"2019-01-12_22:19:14" +"build_date":"2019-03-12_21:19:57" } diff --git a/aliddns/version b/aliddns/version index bf9faad..1b22643 100644 --- a/aliddns/version +++ b/aliddns/version @@ -1,2 +1,2 @@ 1.2 -b775cde3f6f8f552f28c59e8d2d95bc1 +15afe00f95c31fdee8ae7a0ada6518ea diff --git a/dc1svr/dc1svr/install.sh b/dc1svr/dc1svr/install.sh index 78a46fa..2be51f4 100644 --- a/dc1svr/dc1svr/install.sh +++ b/dc1svr/dc1svr/install.sh @@ -16,7 +16,7 @@ cp -rf /tmp/dc1svr/res/* /jffs/softcenter/res/ # delete install tar rm -rf /tmp/dc1svr* >/dev/null 2>&1 -chmod a+x /jffs/softcenter/scripts/dc1.sh +chmod a+x /jffs/softcenter/scripts/dc1svr.sh chmod 0755 /jffs/softcenter/bin/dc1svr dbus set dc1svr_version="1.1" dbus set softcenter_module_dc1svr_version="1.0" diff --git a/dc1svr/dc1svr/webs/Module_dc1svr.asp b/dc1svr/dc1svr/webs/Module_dc1svr.asp index 1be2f5e..bddcc22 100644 --- a/dc1svr/dc1svr/webs/Module_dc1svr.asp +++ b/dc1svr/dc1svr/webs/Module_dc1svr.asp @@ -66,12 +66,11 @@ url: 'https://raw.githubusercontent.com/paldier/softcenter/master/dc1svr/config.json.js', type: 'GET', success: function(res) { - var txt = $j(res.responseText).text(); if(typeof(txt) != "undefined" && txt.length > 0) { //console.log(txt); var obj = $j.parseJSON(txt.replace("'", "\"")); $j("#dc1svr_version_status").html("当前版本：" + obj.version); - if(obj.version != db_dc1svr_["dc1svr_version"]) { + if(obj.version != db_dc1svr_['dc1svr_version']) { $j("#dc1svr_version_status").html("有新版本：" + obj.version); } } @@ -148,8 +147,7 @@
当前版本：<% dbus_get_def("dc1svr_version", "未知"); %>
-
- [ 更新日志 ] +
diff --git a/kms/build.sh b/kms/build.sh index 17661a5..06bd3fe 100755 --- a/kms/build.sh +++ b/kms/build.sh @@ -2,7 +2,7 @@ MODULE=kms -VERSION=1.5 +VERSION=1.6.1 TITLE=kms DESCRIPTION=kms HOME_URL=Module_kms.asp diff --git a/kms/config.json.js b/kms/config.json.js index bb19181..c454789 100644 --- a/kms/config.json.js +++ b/kms/config.json.js @@ -1,8 +1,8 @@ { -"version":"1.5", -"md5":"963a0702e0e37aa67a64c674544f30a6", +"version":"1.6.1", +"md5":"350c920ca9d060b2bd86885fb4c37b16", "home_url":"Module_kms.asp", "title":"kms", "description":"kms", -"build_date":"2019-01-13_19:04:43" +"build_date":"2019-03-12_22:24:36" } diff --git a/kms/kms.tar.gz b/kms/kms.tar.gz index 6088f6e..4f10484 100644 Binary files a/kms/kms.tar.gz and b/kms/kms.tar.gz differ diff --git a/kms/kms/webs/Module_kms.asp b/kms/kms/webs/Module_kms.asp index bf6144f..bea26ad 100644 --- a/kms/kms/webs/Module_kms.asp +++ b/kms/kms/webs/Module_kms.asp @@ -52,8 +52,7 @@ }); } - function onSubmitCtrl(o, s) { - document.form.action_mode.value = s; + function onSubmitCtrl() { showLoading(3); document.form.submit(); } @@ -68,7 +67,6 @@ url: 'https://raw.githubusercontent.com/paldier/softcenter/master/kms/config.json.js', type: 'GET', success: function(res) { - var txt = $j(res.responseText).text(); if(typeof(txt) != "undefined" && txt.length > 0) { //console.log(txt); var obj = $j.parseJSON(txt.replace("'", "\"")); @@ -81,8 +79,6 @@ }); } - var enable_ss = "<% nvram_get("enable_ss"); %>"; - var enable_soft = "<% nvram_get("enable_soft"); %>"; function menu_hook(title, tab) { tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "KMS"); tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_kms.asp"); @@ -98,7 +94,7 @@ - + @@ -152,7 +148,7 @@
当前版本：<% dbus_get_def("kms_version", "未知"); %>
-
+
[ 更新日志 ] diff --git a/kms/version b/kms/version index 07b7158..cb2901b 100644 --- a/kms/version +++ b/kms/version @@ -1,2 +1,2 @@ -1.5 -963a0702e0e37aa67a64c674544f30a6 +1.6.1 +350c920ca9d060b2bd86885fb4c37b16 diff --git a/shadowsocks/config.json.js b/shadowsocks/config.json.js index 58bb098..c3b2a77 100644 --- a/shadowsocks/config.json.js +++ b/shadowsocks/config.json.js @@ -1,8 +1,8 @@ { "version":"4.1.7", -"md5":"e385009a9ab5998e14ba6dc8b58a1a20", +"md5":"788b5477ee258af4e7303d8e3b40b912", "home_url":"Main_Ss_Content.asp", "title":"科学上网", "description":"科学上网", -"build_date":"2019-01-27_22:50:42" +"build_date":"2019-03-11_23:33:28" } diff --git a/shadowsocks/shadowsocks.tar.gz b/shadowsocks/shadowsocks.tar.gz index 1f5f5de..78f1bb0 100644 Binary files a/shadowsocks/shadowsocks.tar.gz and b/shadowsocks/shadowsocks.tar.gz differ diff --git a/shadowsocks/shadowsocks/bin/udpspeederv1 b/shadowsocks/shadowsocks/bin/speederv1 similarity index 100% rename from shadowsocks/shadowsocks/bin/udpspeederv1 rename to shadowsocks/shadowsocks/bin/speederv1 diff --git a/shadowsocks/shadowsocks/bin/udpspeederv2 b/shadowsocks/shadowsocks/bin/speederv2 similarity index 100% rename from shadowsocks/shadowsocks/bin/udpspeederv2 rename to shadowsocks/shadowsocks/bin/speederv2 diff --git a/shadowsocks/version b/shadowsocks/version index fde9736..38b6475 100644 --- a/shadowsocks/version +++ b/shadowsocks/version @@ -1,2 +1,2 @@ 4.1.7 -e385009a9ab5998e14ba6dc8b58a1a20 +788b5477ee258af4e7303d8e3b40b912 diff --git a/shellinabox/Changelog.txt b/shellinabox/Changelog.txt new file mode 100644 index 0000000..5200551 --- /dev/null +++ b/shellinabox/Changelog.txt @@ -0,0 +1,11 @@ +Koolshare Asuswrt-Merlin adm Changelog +=========================================== +1.1 + - fix fix wan access + +1.1 + - change change redirection + +1.0 + - add add shellinabox + diff --git a/shellinabox/backup.sh b/shellinabox/backup.sh new file mode 100755 index 0000000..3a5dbc3 --- /dev/null +++ b/shellinabox/backup.sh @@ -0,0 +1,24 @@ +#! /bin/sh + +# you can do something here +# this shell scripts will run at the end of build.py scripts + +tar_name="$1.tar.gz" + +mkdir -p history +if [ ! -f ./history/version ];then + touch ./history/version +fi + +version_old=`cat history/version | awk '{print $1}' | sort -rn |sed -n 1p` +version_new=`cat config.json.js |grep "version"|cut -d"\"" -f 4` +md5_old=`cat history/version | sort -nk1 | awk '{print $1}' |sed -n 1p` +md5_new=` md5sum $tar_name | awk '{print $1}'` + +if [ -f ./$tar_name ];then + if [ "$version_old" != "$version_new" ];then + mkdir ./history/$version_new/ + cp ./$tar_name ./history/$version_new/ + echo $version_new $md5_new >> ./history/version + fi +fi \ No newline at end of file diff --git a/shellinabox/build.sh b/shellinabox/build.sh new file mode 100755 index 0000000..bcd6387 --- /dev/null +++ b/shellinabox/build.sh @@ -0,0 +1,23 @@ +#!/bin/sh + + +MODULE=shellinabox +VERSION="2.0" +TITLE=shellinabox +DESCRIPTION=超强的SSH网页客户端~ +HOME_URL=Module_shellinabox.asp + +# Check and include base +DIR="$( cd "$( dirname "$BASH_SOURCE[0]" )" && pwd )" + +# now include build_base.sh +. $DIR/../softcenter/build_base.sh + +# change to module directory +cd $DIR + +# do something here +do_build_result + +# now backup +sh backup.sh $MODULE diff --git a/shellinabox/config.json.js b/shellinabox/config.json.js new file mode 100644 index 0000000..b9a5076 --- /dev/null +++ b/shellinabox/config.json.js @@ -0,0 +1,8 @@ +{ +"version":"2.0", +"md5":"e9eea13a1762f8a08795b396fa586736", +"home_url":"Module_shellinabox.asp", +"title":"shellinabox", +"description":"超强的SSH网页客户端~", +"build_date":"2019-03-12_12:30:05" +} diff --git a/shellinabox/history/2.0/shellinabox.tar.gz b/shellinabox/history/2.0/shellinabox.tar.gz new file mode 100644 index 0000000..6748ec7 Binary files /dev/null and b/shellinabox/history/2.0/shellinabox.tar.gz differ diff --git a/shellinabox/history/version b/shellinabox/history/version new file mode 100644 index 0000000..d94da48 --- /dev/null +++ b/shellinabox/history/version @@ -0,0 +1 @@ +2.0 c0bcf36273926e7de6705995e57f409a diff --git a/shellinabox/shellinabox.tar.gz b/shellinabox/shellinabox.tar.gz new file mode 100644 index 0000000..2354b72 Binary files /dev/null and b/shellinabox/shellinabox.tar.gz differ diff --git a/shellinabox/shellinabox/install.sh b/shellinabox/shellinabox/install.sh new file mode 100755 index 0000000..2dab09b --- /dev/null +++ b/shellinabox/shellinabox/install.sh @@ -0,0 +1,12 @@ +#! /bin/sh + + cp -rf /tmp/shellinabox/shellinabox /jffs/softcenter/ + cp -rf /tmp/shellinabox/scripts/* /jffs/softcenter/scripts/ + cp -rf /tmp/shellinabox/res/* /jffs/softcenter/res/ + cp -rf /tmp/shellinabox/webs/* /jffs/softcenter/webs + chmod 755 /jffs/softcenter/shellinabox/* + chmod 755 /jffs/softcenter/scripts/shellinabox_start.sh + killall shellinaboxd + sleep 1 + rm -rf /tmp/shellinabox* + diff --git a/shellinabox/shellinabox/res/icon-shellinabox.png b/shellinabox/shellinabox/res/icon-shellinabox.png new file mode 100644 index 0000000..e026432 Binary files /dev/null and b/shellinabox/shellinabox/res/icon-shellinabox.png differ diff --git a/shellinabox/shellinabox/scripts/shellinabox_start.sh b/shellinabox/shellinabox/scripts/shellinabox_start.sh new file mode 100644 index 0000000..fad5016 --- /dev/null +++ b/shellinabox/shellinabox/scripts/shellinabox_start.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +eval `dbus export webshell_` +source /jffs/softcenter/scripts/base.sh + +stop() { +killall -9 shellinaboxd +iptables -D INPUT -p tcp --dport 4200 -j ACCEPT + echo "webshell已关闭。">> /tmp/webshell.log +[ -e "/jffs/softcenter/init.d/S96webshell.sh" ] && rm -rf /jffs/softcenter/init.d/S96webshell.sh +} + +start() { +#不重复启动 +icount=`ps -w|grep shellinaboxd|grep -v grep|wc -l` +if [ $icount != 0 ] ;then +stop +sleep 2 +fi +/usr/sbin/webshell/shellinaboxd --css=/usr/sbin/webshell/white-on-black.css --service=/:LOGIN -b --disable-ssl +iptables -I INPUT -p tcp --dport 4200 -j ACCEPT +#这里有个bug，系统启动时wan还没有上线，所以wan的端口是没有打开的 + echo "webshell已启动。">> /tmp/webshell.log +[ ! -e "/jffs/softcenter/init.d/S96webshell.sh" ] && cp -rf /jffs/softcenter/scripts/shellinabox_start.sh /jffs/softcenter/init.d/S96webshell.sh +} + +restart() { + stop + sleep 1 + if [ "$webshell_enable" == "1" ] ;then + start + fi +} + +restart diff --git a/shellinabox/shellinabox/shellinabox/shellinaboxd b/shellinabox/shellinabox/shellinabox/shellinaboxd new file mode 100755 index 0000000..21ec6ac Binary files /dev/null and b/shellinabox/shellinabox/shellinabox/shellinaboxd differ diff --git a/shellinabox/shellinabox/shellinabox/white-on-black.css b/shellinabox/shellinabox/shellinabox/white-on-black.css new file mode 100755 index 0000000..893a69a --- /dev/null +++ b/shellinabox/shellinabox/shellinabox/white-on-black.css @@ -0,0 +1,64 @@ +#vt100 #cursor.bright { + background-color: white; + color: black; +} + +#vt100 #cursor.dim { + background-color: black; + opacity: 0.2; + -moz-opacity: 0.2; + filter: alpha(opacity=20); +} + +#vt100 #scrollable { + font-size: 13px; + color: #ffffff; + background-color: #2B373B; +} + +#vt100 #scrollable.inverted { + font-size: 13px; + color: #2B373B; + background-color: #ffffff; +} + +#vt100 .ansiDef { + font-size: 13px; + color: #ffffFf; +} + +#vt100 .ansiDefR { + font-size: 13px; + color: #2B373B; +} + +#vt100 .bgAnsiDef { + font-size: 13px; + background-color: #2B373B; +} + +#vt100 .bgAnsiDefR { + font-size: 13px; + background-color: #ffffFf; +} + +#vt100 #scrollable.inverted .ansiDef { + font-size: 13px; + color: #2B373B; +} + +#vt100 #scrollable.inverted .ansiDefR { + font-size: 13px; + color: #ffffFf; +} + +#vt100 #scrollable.inverted .bgAnsiDef { + font-size: 13px; + background-color: #ffffFf; +} + +#vt100 #scrollable.inverted .bgAnsiDefR { + font-size: 13px; + background-color: #2B373B; +} + diff --git a/shellinabox/shellinabox/webs/Module_shellinabox.asp b/shellinabox/shellinabox/webs/Module_shellinabox.asp new file mode 100644 index 0000000..5447ddf --- /dev/null +++ b/shellinabox/shellinabox/webs/Module_shellinabox.asp @@ -0,0 +1,166 @@ + + + + + + + + +<#587#> - webshell + + + + + + + + + + + + + + + + + + + + +
+ + + +"> + + + + + + +" disabled> +"> +"> + + + + + + + +
  + + + + + + + + +
+ + + + + + +
+
 
+
+ + + + +
+
WebShell
+
+ +
+
+
+
+
+ + + + + + +
+
+		   +使用简介： +
    +
  1. webshell可以使你在web页面进行命令行管理
    2. +
  2. 登录名和密码与web一致
    3. +
  3. 你可以在此开启webshell后点击“打开窗口”按钮来使用
    4. +
+提示： +
    +
  1. webshell使用的端口号为4200
+
+
+
+ + + + + + + + + + + + + + + + +
服务信息
启用WebShell +
+
+ +
+
管理窗口 + +
日志信息
+ +
+
+ +
+
+
+		 
+ + + + diff --git a/shellinabox/version b/shellinabox/version new file mode 100644 index 0000000..d492306 --- /dev/null +++ b/shellinabox/version @@ -0,0 +1,2 @@ +2.0 +e9eea13a1762f8a08795b396fa586736 diff --git a/softcenter/app.json.js b/softcenter/app.json.js index a33a95d..b1bbea1 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -11,15 +11,25 @@ "version": "0.2.3" }, { - "build_date": "2019-01-27_22:50:42", + "build_date": "2019-03-11_23:33:28", "description": "科学上网", "home_url": "Main_Ss_Content.asp", - "md5": "e385009a9ab5998e14ba6dc8b58a1a20", + "md5": "788b5477ee258af4e7303d8e3b40b912", "name": "shadowsocks", "tar_url": "shadowsocks/shadowsocks.tar.gz", "title": "科学上网", "version": "4.1.7" }, + { + "build_date": "2019-03-12_12:30:05", + "description": "超强的SSH网页客户端~", + "home_url": "Module_shellinabox.asp", + "md5": "e9eea13a1762f8a08795b396fa586736", + "name": "shellinabox", + "tar_url": "shellinabox/shellinabox.tar.gz", + "title": "shellinabox", + "version": "2.0" + }, { "build_date": "2019-01-13_23:00:27", "description": "Cloudflare解析自动更新IP", @@ -91,14 +101,14 @@ "version": "2.1" }, { - "build_date": "2019-01-13_19:04:43", + "build_date": "2019-03-12_22:24:36", "description": "kms", "home_url": "Module_kms.asp", - "md5": "963a0702e0e37aa67a64c674544f30a6", + "md5": "350c920ca9d060b2bd86885fb4c37b16", "name": "kms", "tar_url": "kms/kms.tar.gz", "title": "kms", - "version": "1.5" + "version": "1.6.1" }, { "build_date": "2019-02-20_23:06:16", @@ -121,10 +131,10 @@ "version": "1.4.16" }, { - "build_date": "2019-01-12_22:19:14", + "build_date": "2019-03-12_21:19:57", "description": "阿里云解析自动更新IP", "home_url": "Module_aliddns.asp", - "md5": "b775cde3f6f8f552f28c59e8d2d95bc1", + "md5": "15afe00f95c31fdee8ae7a0ada6518ea", "name": "aliddns", "tar_url": "aliddns/aliddns.tar.gz", "title": "aliddns", @@ -151,10 +161,10 @@ "version": "0.1.6" }, { - "build_date": "2019-02-04_20:27:44", + "build_date": "2019-03-13_21:53:27", "description": "v2ray", "home_url": "Module_v2ray.asp", - "md5": "72a421802e093e7cc52d89c8e05a5bbf", + "md5": "700544f47fff165b2b6644ec6bd6a84c", "name": "v2ray", "tar_url": "v2ray/v2ray.tar.gz", "title": "v2ray", diff --git a/v2ray/config.json.js b/v2ray/config.json.js index 64812bd..ebbdac1 100644 --- a/v2ray/config.json.js +++ b/v2ray/config.json.js @@ -1,8 +1,8 @@ { "version":"4.13.0", -"md5":"72a421802e093e7cc52d89c8e05a5bbf", +"md5":"700544f47fff165b2b6644ec6bd6a84c", "home_url":"Module_v2ray.asp", "title":"v2ray", "description":"v2ray", -"build_date":"2019-02-04_20:27:44" +"build_date":"2019-03-13_21:53:27" } diff --git a/v2ray/v2ray.tar.gz b/v2ray/v2ray.tar.gz index a91e343..788e3bd 100644 Binary files a/v2ray/v2ray.tar.gz and b/v2ray/v2ray.tar.gz differ diff --git a/v2ray/v2ray/install.sh b/v2ray/v2ray/install.sh index bdc469a..24fc5db 100755 --- a/v2ray/v2ray/install.sh +++ b/v2ray/v2ray/install.sh @@ -1,9 +1,9 @@ #! /bin/sh cd /tmp -cp -rf /tmp/v2ray/v2ray /jffs/softcenter/bin/ -cp -rf /tmp/v2ray/v2ctl /jffs/softcenter/bin/ -cp -rf /tmp/v2ray/geosite.dat /jffs/softcenter/bin/ -cp -rf /tmp/v2ray/geoip.dat /jffs/softcenter/bin/ +cp -rf /tmp/v2ray/bin/v2ray /jffs/softcenter/bin/ +cp -rf /tmp/v2ray/bin/v2ctl /jffs/softcenter/bin/ +cp -rf /tmp/v2ray/bin/geosite.dat /jffs/softcenter/bin/ +cp -rf /tmp/v2ray/bin/geoip.dat /jffs/softcenter/bin/ cp -rf /tmp/v2ray/webs/Module_v2ray.asp /jffs/softcenter/webs/ cp -rf /tmp/v2ray/res/* /jffs/softcenter/res/ cp -rf /tmp/v2ray/scripts/*.sh /jffs/softcenter/scripts/ diff --git a/v2ray/v2ray/scripts/v2ray_config.sh b/v2ray/v2ray/scripts/v2ray_config.sh index d897ce4..c77be84 100644 --- a/v2ray/v2ray/scripts/v2ray_config.sh +++ b/v2ray/v2ray/scripts/v2ray_config.sh @@ -268,7 +268,7 @@ creat_v2ray_json(){ fi echo "$(date "+%F %T")测试V2Ray配置文件..... " >> /tmp/v2ray.log - cd /koolshare/bin + cd /jffs/softcenter/bin result=$(v2ray -test -config="$V2RAY_CONFIG_FILE" | grep "Configuration OK.") if [ -n "$result" ];then echo "$(date "+%F %T") $result" >> /tmp/v2ray.log diff --git a/v2ray/v2ray/webs/Module_v2ray.asp b/v2ray/v2ray/webs/Module_v2ray.asp index ee242e7..88dc683 100644 --- a/v2ray/v2ray/webs/Module_v2ray.asp +++ b/v2ray/v2ray/webs/Module_v2ray.asp @@ -119,7 +119,7 @@ function update_v2ray_ui(obj) { el.value = obj[field]; } } - E("v2ray_json").value = do_js_beautify(Base64.decode(E("v2ray_json").value)); + //E("v2ray_json").value = do_js_beautify(Base64.decode(E("v2ray_json").value)); } function isJSON(str) { if (typeof str == 'string' && str) { @@ -140,7 +140,7 @@ function isJSON(str) { function applyRule() { if (E("v2ray_use_json").checked == true){ if(E('v2ray_json').value.indexOf("vmess://") != -1){ - var vmess_node = JSON.parse(Base64.decode(E('v2ray_json').value.split("//"))); + var vmess_node = JSON.parse(Base64.decode(E('v2ray_json').value.split("//")[1])); console.log("use v2ray vmess://"); console.log(vmess_node); document.form.v2ray_server.value = vmess_node.add; @@ -314,13 +314,13 @@ function verifyFields(r) { " disabled> "> -"> -"> -"> -"> -"> -"> -"> + + + + + + + @@ -453,31 +453,31 @@ document.form.v2ray_udp_enable.value = 0; @@ -547,7 +547,7 @@ document.form.v2ray_udp_enable.value = 0; diff --git a/v2ray/version b/v2ray/version index d0a8fd0..8618b49 100644 --- a/v2ray/version +++ b/v2ray/version @@ -1,2 +1,2 @@ 4.13.0 -72a421802e093e7cc52d89c8e05a5bbf +700544f47fff165b2b6644ec6bd6a84c
 
使用json配置 - +