diff --git a/shadowsocks/config.json.js b/shadowsocks/config.json.js index f421fad..5bda9b8 100644 --- a/shadowsocks/config.json.js +++ b/shadowsocks/config.json.js @@ -1,8 +1,8 @@ { "version":"3.0.5", -"md5":"8e2dcfc093371d6b90df36170c1d4ed5", +"md5":"b5f12528f5cb2e249c4bbd8a6ae9c312", "home_url":"Main_Ss_Content.asp", "title":"shadowsocks", "description":"shadowsocks", -"build_date":"2019-01-15_14:10:56" +"build_date":"2019-01-15_22:19:54" } diff --git a/shadowsocks/history/3.0.5/shadowsocks.tar.gz b/shadowsocks/history/3.0.5/shadowsocks.tar.gz new file mode 100644 index 0000000..fb79d15 Binary files /dev/null and b/shadowsocks/history/3.0.5/shadowsocks.tar.gz differ diff --git a/shadowsocks/shadowsocks.tar.gz b/shadowsocks/shadowsocks.tar.gz index fb79d15..b730481 100644 Binary files a/shadowsocks/shadowsocks.tar.gz and b/shadowsocks/shadowsocks.tar.gz differ diff --git a/shadowsocks/shadowsocks/bin/rss-tunnel b/shadowsocks/shadowsocks/bin/rss-tunnel new file mode 100755 index 0000000..81f0480 Binary files /dev/null and b/shadowsocks/shadowsocks/bin/rss-tunnel differ diff --git a/shadowsocks/shadowsocks/install.sh b/shadowsocks/shadowsocks/install.sh index ab165b4..8eeb3fa 100755 --- a/shadowsocks/shadowsocks/install.sh +++ b/shadowsocks/shadowsocks/install.sh @@ -140,15 +140,4 @@ if [ "$ss_basic_enable" == "1" ];then fi echo_date 更新完毕,请等待网页自动刷新! echo XU6J03M6 -sleep 1 -killall ssconfig.sh >/dev/null 2>&1 -killall sh >/dev/null 2>&1 -kill `pidof ssconfig.sh` >/dev/null 2>&1 - - - - - - - diff --git a/shadowsocks/shadowsocks/webs/Main_SsLocal_Content.asp b/shadowsocks/shadowsocks/webs/Main_SsLocal_Content.asp index f224d17..a9327a3 100755 --- a/shadowsocks/shadowsocks/webs/Main_SsLocal_Content.asp +++ b/shadowsocks/shadowsocks/webs/Main_SsLocal_Content.asp @@ -133,7 +133,10 @@ function onSubmitCtrl(o, s) { if(validForm()){ showSSLoadingBar(5); document.form.action_mode.value = s; - updateOptions(); + document.form.enctype = ""; + document.form.encoding = ""; + document.form.action_script.value = "ss_socks5.sh"; + document.form.submit(); } } @@ -141,14 +144,6 @@ function done_validating(action){ return true; } -function updateOptions(){ - document.form.enctype = ""; - document.form.encoding = ""; - document.form.action = "/applydb.cgi?p=ss_local_"; - document.form.action_script.value = "ss_socks5.sh"; - document.form.submit(); -} - function validForm(){ var is_ok = true; return is_ok; @@ -178,7 +173,7 @@ function update_visibility(){ -
+ diff --git a/shadowsocks/version b/shadowsocks/version index 5dcd817..ffcffe6 100644 --- a/shadowsocks/version +++ b/shadowsocks/version @@ -1,2 +1,2 @@ 3.0.5 -8e2dcfc093371d6b90df36170c1d4ed5 +b5f12528f5cb2e249c4bbd8a6ae9c312 diff --git a/softcenter/app.json.js b/softcenter/app.json.js index 1628e5a..335341c 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -11,10 +11,10 @@ "version": "0.2.3" }, { - "build_date": "2019-01-15_14:10:56", + "build_date": "2019-01-15_22:19:54", "description": "shadowsocks", "home_url": "Main_Ss_Content.asp", - "md5": "8e2dcfc093371d6b90df36170c1d4ed5", + "md5": "b5f12528f5cb2e249c4bbd8a6ae9c312", "name": "shadowsocks", "tar_url": "shadowsocks/shadowsocks.tar.gz", "title": "shadowsocks", @@ -92,7 +92,7 @@ } ], "home_url": "https://raw.githubusercontent.com/paldier/softcenter/master", - "md5": "9efbbd79792c6d7eb0fc834a8fcb2ae9", + "md5": "b03df0d21a5710dc9af3605189eed16a", "tar_url": "softcenter/softcenter.tar.gz", "version": "1.1.6" } \ No newline at end of file diff --git a/softcenter/config.json.js b/softcenter/config.json.js index 3d87d37..0ee7b98 100644 --- a/softcenter/config.json.js +++ b/softcenter/config.json.js @@ -1,4 +1,4 @@ { "version":"1.1.6", -"md5":"9efbbd79792c6d7eb0fc834a8fcb2ae9" +"md5":"b03df0d21a5710dc9af3605189eed16a" } diff --git a/softcenter/push_message.json.js b/softcenter/push_message.json.js index ea38838..1e462d5 100644 --- a/softcenter/push_message.json.js +++ b/softcenter/push_message.json.js @@ -1,7 +1,7 @@ { "title":"梅林固件 - 软件中心", -"content1":"软件中心测试版:(2018年12月6日):", +"content1":"软件中心测试版:(2019年1月15日):", "content2":"原软件中心暂时保留且用法不变;", "content3":"新软件中心暂时不要启用和原软件中心冲突的插件", -"content4":"离线安装暂时不可用" +"content4":"部分插件显示异常" } diff --git a/softcenter/softcenter.tar.gz b/softcenter/softcenter.tar.gz index 7ea0ea9..8a0a888 100644 Binary files a/softcenter/softcenter.tar.gz and b/softcenter/softcenter.tar.gz differ diff --git a/softcenter/softcenter/webs/Main_Soft_setting.asp b/softcenter/softcenter/webs/Main_Soft_setting.asp index 4817784..69abcd3 100644 --- a/softcenter/softcenter/webs/Main_Soft_setting.asp +++ b/softcenter/softcenter/webs/Main_Soft_setting.asp @@ -88,7 +88,7 @@ function upload_ok(isok) { function start_install() { document.form.action_mode.value = ' Refresh '; document.form.action = "/applydb.cgi?p=soft"; - document.form.SystemCmd.value = "ks_tar_intall.sh"; + document.form.action_script.value = "ks_tar_intall.sh"; document.form.enctype = ""; document.form.encoding = ""; document.form.submit(); @@ -144,7 +144,6 @@ function checkCmdRet(){ "/> - "/> @@ -168,11 +167,10 @@ function checkCmdRet(){
-
  • 通过本页面,你可以上传插件的离线安装包来安装插件,此功能需要在7.0及以上的固件才能使用;
  • +
  • 通过本页面,你可以上传插件的离线安装包来安装插件,此功能需要在蓝洞及K3C固件上使用;
  • 离线安装会自动解压tar.gz后缀的压缩包,识别压缩包一级目录下的install.sh文件并执行;
  • 建议开发者将插件版本号,md5等信息在install.sh文件内进行写入;
  • 此页面也能用来安装SS离线安装包,方便用户进行回滚操作,上传前需要将历史文件包改名为shadowsocks.tar.gz,建议安装时关闭SS,安装后需要重新提交才能看到安装的版本号;
  • -
  • 此功能暂时不可能,待修复;
  • diff --git a/softcenter/version b/softcenter/version index 9958b64..f851d31 100644 --- a/softcenter/version +++ b/softcenter/version @@ -1,2 +1,2 @@ 1.1.6 -9efbbd79792c6d7eb0fc834a8fcb2ae9 +b03df0d21a5710dc9af3605189eed16a