diff --git a/shadowsocks/config.json.js b/shadowsocks/config.json.js index 3771a99..7a0848e 100644 --- a/shadowsocks/config.json.js +++ b/shadowsocks/config.json.js @@ -1,8 +1,8 @@ { "version":"4.1.7", -"md5":"9674685d2e3f867c32d07d13c1c354cd", +"md5":"95b162f6a0bde010a68ff999290cf5a5", "home_url":"Main_Ss_Content.asp", "title":"科学上网", "description":"科学上网", -"build_date":"2019-01-27_20:20:28" +"build_date":"2019-01-27_21:37:15" } diff --git a/shadowsocks/shadowsocks.tar.gz b/shadowsocks/shadowsocks.tar.gz index 3e0ab22..f96b544 100644 Binary files a/shadowsocks/shadowsocks.tar.gz and b/shadowsocks/shadowsocks.tar.gz differ diff --git a/shadowsocks/shadowsocks/bin/jq b/shadowsocks/shadowsocks/bin/jq index 66d35ff..2042dff 100755 Binary files a/shadowsocks/shadowsocks/bin/jq and b/shadowsocks/shadowsocks/bin/jq differ diff --git a/shadowsocks/shadowsocks/ss/ssconfig.sh b/shadowsocks/shadowsocks/ss/ssconfig.sh index c3ca1eb..104323e 100755 --- a/shadowsocks/shadowsocks/ss/ssconfig.sh +++ b/shadowsocks/shadowsocks/ss/ssconfig.sh @@ -941,8 +941,8 @@ start_haveged(){ } auto_start(){ - [ ! -e "/koolshare/init.d/S99shadowsocks.sh" ] && cp -rf /koolshare/ss/ssconfig.sh /koolshare/init.d/S99shadowsocks.sh - [ ! -e "/koolshare/init.d/N99shadowsocks.sh" ] && cp -rf /koolshare/ss/ssconfig.sh /koolshare/init.d/N99shadowsocks.sh + [ ! -e "/jffs/softcenter/init.d/S99shadowsocks.sh" ] && cp -rf /jffs/softcenter/ss/ssconfig.sh /jffs/softcenter/init.d/S99shadowsocks.sh + [ ! -e "/jffs/softcenter/init.d/N99shadowsocks.sh" ] && cp -rf /jffs/softcenter/ss/ssconfig.sh /jffs/softcenter/init.d/N99shadowsocks.sh } start_kcp(){ @@ -1418,13 +1418,12 @@ creat_v2ray_json(){ "users": [ { "id": "$ss_basic_v2ray_uuid", - "alterId": $ss_basic_v2ray_alterid, + "alterId": "$ss_basic_v2ray_alterid", "security": "$ss_basic_v2ray_security" } ] } - ], - "servers": null + ] }, "streamSettings": { "network": "$ss_basic_v2ray_network", @@ -1436,8 +1435,7 @@ creat_v2ray_json(){ "httpSettings": $h2 }, "mux": { - "enabled": $(get_function_switch $ss_basic_v2ray_mux_enable), - "concurrency": $ss_basic_v2ray_mux_concurrency + "enabled": $(get_function_switch $ss_basic_v2ray_mux_enable) } } } diff --git a/shadowsocks/version b/shadowsocks/version index 50a4e5e..8938d0c 100644 --- a/shadowsocks/version +++ b/shadowsocks/version @@ -1,2 +1,2 @@ 4.1.7 -9674685d2e3f867c32d07d13c1c354cd +95b162f6a0bde010a68ff999290cf5a5 diff --git a/softcenter/app.json.js b/softcenter/app.json.js index 23b3b87..35be812 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -11,10 +11,10 @@ "version": "0.2.3" }, { - "build_date": "2019-01-27_20:20:28", + "build_date": "2019-01-27_21:37:15", "description": "科学上网", "home_url": "Main_Ss_Content.asp", - "md5": "9674685d2e3f867c32d07d13c1c354cd", + "md5": "95b162f6a0bde010a68ff999290cf5a5", "name": "shadowsocks", "tar_url": "shadowsocks/shadowsocks.tar.gz", "title": "科学上网",