diff --git a/shadowsocks/config.json.js b/shadowsocks/config.json.js index c3b2a77..c0463fe 100644 --- a/shadowsocks/config.json.js +++ b/shadowsocks/config.json.js @@ -1,8 +1,8 @@ { "version":"4.1.7", -"md5":"788b5477ee258af4e7303d8e3b40b912", +"md5":"cc7c3e0dd22e83afb228d50739213710", "home_url":"Main_Ss_Content.asp", "title":"科学上网", "description":"科学上网", -"build_date":"2019-03-11_23:33:28" +"build_date":"2019-03-14_21:34:03" } diff --git a/shadowsocks/shadowsocks.tar.gz b/shadowsocks/shadowsocks.tar.gz index 78f1bb0..2148079 100644 Binary files a/shadowsocks/shadowsocks.tar.gz and b/shadowsocks/shadowsocks.tar.gz differ diff --git a/shadowsocks/shadowsocks/res/ss-menu.js b/shadowsocks/shadowsocks/res/ss-menu.js index 3bdd721..1daceea 100755 --- a/shadowsocks/shadowsocks/res/ss-menu.js +++ b/shadowsocks/shadowsocks/res/ss-menu.js @@ -120,7 +120,7 @@ if (typeof btoa == "Function") { }; } else { Base64 = { - _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", + _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", encode: function(e) { var t = ""; var n, r, i, s, o, u, a; diff --git a/shadowsocks/version b/shadowsocks/version index 38b6475..bc22c64 100644 --- a/shadowsocks/version +++ b/shadowsocks/version @@ -1,2 +1,2 @@ 4.1.7 -788b5477ee258af4e7303d8e3b40b912 +cc7c3e0dd22e83afb228d50739213710 diff --git a/shellinabox/config.json.js b/shellinabox/config.json.js index b9a5076..82f0c14 100644 --- a/shellinabox/config.json.js +++ b/shellinabox/config.json.js @@ -1,8 +1,8 @@ { "version":"2.0", -"md5":"e9eea13a1762f8a08795b396fa586736", +"md5":"069306ee5ed27db3b0d8dbf64ac449bb", "home_url":"Module_shellinabox.asp", "title":"shellinabox", "description":"超强的SSH网页客户端~", -"build_date":"2019-03-12_12:30:05" +"build_date":"2019-03-14_22:28:34" } diff --git a/shellinabox/shellinabox.tar.gz b/shellinabox/shellinabox.tar.gz index 2354b72..0ebc65a 100644 Binary files a/shellinabox/shellinabox.tar.gz and b/shellinabox/shellinabox.tar.gz differ diff --git a/shellinabox/shellinabox/scripts/shellinabox_start.sh b/shellinabox/shellinabox/scripts/shellinabox_start.sh index fad5016..28790a5 100644 --- a/shellinabox/shellinabox/scripts/shellinabox_start.sh +++ b/shellinabox/shellinabox/scripts/shellinabox_start.sh @@ -11,6 +11,7 @@ iptables -D INPUT -p tcp --dport 4200 -j ACCEPT } start() { +[ "$webshell_enable" == "0" ] && exit 0 #不重复启动 icount=`ps -w|grep shellinaboxd|grep -v grep|wc -l` if [ $icount != 0 ] ;then diff --git a/shellinabox/version b/shellinabox/version index d492306..67af11d 100644 --- a/shellinabox/version +++ b/shellinabox/version @@ -1,2 +1,2 @@ 2.0 -e9eea13a1762f8a08795b396fa586736 +069306ee5ed27db3b0d8dbf64ac449bb diff --git a/softcenter/app.json.js b/softcenter/app.json.js index b1bbea1..557bf4d 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -11,20 +11,20 @@ "version": "0.2.3" }, { - "build_date": "2019-03-11_23:33:28", + "build_date": "2019-03-14_21:34:03", "description": "科学上网", "home_url": "Main_Ss_Content.asp", - "md5": "788b5477ee258af4e7303d8e3b40b912", + "md5": "cc7c3e0dd22e83afb228d50739213710", "name": "shadowsocks", "tar_url": "shadowsocks/shadowsocks.tar.gz", "title": "科学上网", "version": "4.1.7" }, { - "build_date": "2019-03-12_12:30:05", + "build_date": "2019-03-14_22:28:34", "description": "超强的SSH网页客户端~", "home_url": "Module_shellinabox.asp", - "md5": "e9eea13a1762f8a08795b396fa586736", + "md5": "069306ee5ed27db3b0d8dbf64ac449bb", "name": "shellinabox", "tar_url": "shellinabox/shellinabox.tar.gz", "title": "shellinabox", diff --git a/v2ray/v2ray/res/ss-menu.js b/v2ray/v2ray/res/ss-menu.js index 3bdd721..1daceea 100755 --- a/v2ray/v2ray/res/ss-menu.js +++ b/v2ray/v2ray/res/ss-menu.js @@ -120,7 +120,7 @@ if (typeof btoa == "Function") { }; } else { Base64 = { - _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", + _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", encode: function(e) { var t = ""; var n, r, i, s, o, u, a;