diff --git a/softcenter/softcenter/install.sh b/softcenter/softcenter/install.sh index fdb3fcf..9397d41 100755 --- a/softcenter/softcenter/install.sh +++ b/softcenter/softcenter/install.sh @@ -7,6 +7,8 @@ softcenter_install() { cp -rf /tmp/softcenter/bin/* /jffs/softcenter/bin/ cp -rf /tmp/softcenter/perp/* /jffs/softcenter/perp/ cp -rf /tmp/softcenter/scripts/* /jffs/softcenter/scripts/ + mkdir /jffs/softcenter/lib/ + cp -rf /tmp/softcenter/lib/* /jffs/softcenter/lib/ chmod 755 /jffs/softcenter/bin/* chmod 755 /jffs/softcenter/perp/* chmod 755 /jffs/softcenter/perp/.boot/* diff --git a/v2ray/config.json.js b/v2ray/config.json.js index 92d9643..64812bd 100644 --- a/v2ray/config.json.js +++ b/v2ray/config.json.js @@ -1,8 +1,8 @@ { "version":"4.13.0", -"md5":"9ef8deadd029b47b4bf59a2c7f9b8a96", +"md5":"72a421802e093e7cc52d89c8e05a5bbf", "home_url":"Module_v2ray.asp", "title":"v2ray", "description":"v2ray", -"build_date":"2019-01-29_20:02:27" +"build_date":"2019-02-04_20:27:44" } diff --git a/v2ray/v2ray.tar.gz b/v2ray/v2ray.tar.gz index 3ab165f..a91e343 100644 Binary files a/v2ray/v2ray.tar.gz and b/v2ray/v2ray.tar.gz differ diff --git a/v2ray/v2ray/scripts/v2ray-rules.sh b/v2ray/v2ray/scripts/v2ray-rules.sh index 6490739..6adb401 100644 --- a/v2ray/v2ray/scripts/v2ray-rules.sh +++ b/v2ray/v2ray/scripts/v2ray-rules.sh @@ -192,7 +192,7 @@ service restart_dnsmasq /jffs/softcenter/scripts/v2ray_mon.sh & logger -t "v2ray" "守护进程启动" - +echo "$(date "+%F %T"): 守护进程启动" >> /tmp/v2ray.log if [ "$all_proxy" = "1" ] ;then @@ -246,6 +246,7 @@ if [ "$udp_enable" == "1" ] ;then fi fi logger -t "v2ray" "启动完毕!" +echo "$(date "+%F %T"): 启动完毕" >> /tmp/v2ray.log exit 0 fi diff --git a/v2ray/v2ray/scripts/v2ray_config.sh b/v2ray/v2ray/scripts/v2ray_config.sh index 2ad6f62..d897ce4 100644 --- a/v2ray/v2ray/scripts/v2ray_config.sh +++ b/v2ray/v2ray/scripts/v2ray_config.sh @@ -285,6 +285,7 @@ killall -q -9 v2ray_mon.sh >/dev/null 2>&1 && killall v2ray_mon.sh >/dev/null 2> killall -q -9 dns2socks 2>/dev/null && killall dns2socks 2>/dev/null killall -q -9 v2ray 2>/dev/null && killall v2ray 2>/dev/null killall -q pdnsd 2>/dev/null +/jffs/softcenter/scripts/v2ray-rules.sh clean 2>/dev/null service restart_dnsmasq >/dev/null 2>&1 [ "-e /jffs/softcenter/init.d/S99v2ray.sh" ] && rm -rf /jffs/softcenter/init.d/S99v2ray.sh } @@ -312,7 +313,7 @@ if [ "$v2ray_dnsmode" == "0" ];then fi v2ray_serverip /jffs/softcenter/bin/v2ray -format pb -config "$V2RAY_CONFIG_FILE_PB" >/dev/null 2>&1 & -/jffs/softcenter/scripts/v2ray-rules.sh $mip 1234 & +/jffs/softcenter/scripts/v2ray-rules.sh $mip 1234 & /usr/sbin/ssr-state 2>/dev/null & exit 0 } diff --git a/v2ray/v2ray/webs/Module_v2ray.asp b/v2ray/v2ray/webs/Module_v2ray.asp index 65c77d5..ee242e7 100644 --- a/v2ray/v2ray/webs/Module_v2ray.asp +++ b/v2ray/v2ray/webs/Module_v2ray.asp @@ -177,9 +177,7 @@ if (E("v2ray_use_json").checked == true){ return false; } } -document.form.save_name.disabled=true; -document.form.save_content.disabled=true; -showLoading(1); +showLoading(5); document.form.submit(); } function reload_Soft_Center() { @@ -306,7 +304,7 @@ function verifyFields(r) {
-
+ "> @@ -322,9 +320,7 @@ function verifyFields(r) { "> "> "> -"> - - +"> diff --git a/v2ray/version b/v2ray/version index 88e5230..d0a8fd0 100644 --- a/v2ray/version +++ b/v2ray/version @@ -1,2 +1,2 @@ 4.13.0 -9ef8deadd029b47b4bf59a2c7f9b8a96 +72a421802e093e7cc52d89c8e05a5bbf