diff --git a/luci-app-fchomo/htdocs/luci-static/resources/fchomo.js b/luci-app-fchomo/htdocs/luci-static/resources/fchomo.js index 6504802b6..b2bd2b1f8 100644 --- a/luci-app-fchomo/htdocs/luci-static/resources/fchomo.js +++ b/luci-app-fchomo/htdocs/luci-static/resources/fchomo.js @@ -1001,8 +1001,10 @@ function handleGenKey(option) { if (option === 'uuid' || option.match(/_uuid/)) required_method = 'uuid'; - else if (type === 'shadowsocks') + else if (type === 'shadowsocks' && option === 'shadowsocks_password') required_method = this.section.getOption('shadowsocks_chipher')?.formvalue(section_id); + else if (type === 'trojan' && option === 'trojan_ss_password') + required_method = this.section.getOption('trojan_ss_chipher')?.formvalue(section_id); switch (required_method) { /* NONE */ diff --git a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/server.js b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/server.js index 5cb36b56a..11bea8353 100644 --- a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/server.js +++ b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/server.js @@ -273,7 +273,7 @@ return view.extend({ o.depends({plugin: 'shadow-tls'}); o.modalonly = true; - o = s.taboption('field_general', form.Value, 'plugin_opts_thetlspassword', _('Plugin: ') + _('Password')); + o = s.taboption('field_general', hm.GenValue, 'plugin_opts_thetlspassword', _('Plugin: ') + _('Password')); o.password = true; o.rmempty = false; o.depends({plugin: 'shadow-tls'}); diff --git a/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh b/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh index 9918f366e..7d9f46474 100755 --- a/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh +++ b/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh @@ -13,18 +13,18 @@ do_install() { exit 1 fi - [ -z "$image_name" ] && image_name="registry.cn-qingdao.aliyuncs.com/feishuwg/p2p:v2.2" + [ -z "$image_name" ] && image_name="registry.cn-qingdao.aliyuncs.com/feishuwg/p2p:latest" echo "docker pull ${image_name}" docker pull ${image_name} docker rm -f feishuvpn - local cmd="docker run --restart=unless-stopped -d -h FeiShuVpnServer -v \"$config:/data/conf\" " + local cmd="docker run --restart=unless-stopped -d -h FeiShuVpnServer -v \"$config:/app/data\" " cmd="$cmd\ --cap-add=ALL \ --privileged=true \ --device=/dev/net/tun \ - --dns=127.0.0.1 \ + --dns=223.5.5.5 \ --network=host " # local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"