diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 2d45f02bd..7c4e42248 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 -PKG_VERSION:=1.17-3 +PKG_VERSION:=1.17-4 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/user.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/user.lua index 390a2e466..1936256c4 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/user.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/user.lua @@ -97,7 +97,6 @@ protocol:value("http", "HTTP") protocol:value("socks", "Socks") protocol:value("shadowsocks", "Shadowsocks") protocol:value("trojan", "Trojan") -protocol:value("mtproto", "MTProto") protocol:value("dokodemo-door", "dokodemo-door") protocol:depends("type", "V2ray") protocol:depends("type", "Xray") @@ -150,17 +149,6 @@ password:depends("type", "Brook") password:depends({ type = "V2ray", protocol = "shadowsocks" }) password:depends({ type = "Xray", protocol = "shadowsocks" }) -mtproto_password = s:option(Value, "mtproto_password", translate("Password"), translate("The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f.")) -mtproto_password:depends({ type = "V2ray", protocol = "mtproto" }) -mtproto_password:depends({ type = "Xray", protocol = "mtproto" }) -mtproto_password.default = arg[1] -function mtproto_password.cfgvalue(self, section) - return m:get(section, "password") -end -function mtproto_password.write(self, section, value) - m:set(section, "password", value) -end - d_protocol = s:option(ListValue, "d_protocol", translate("Destination protocol")) d_protocol:value("tcp", "TCP") d_protocol:value("udp", "UDP") diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua index 821bc1336..88cf40282 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua @@ -317,14 +317,6 @@ function gen_config_server(node) clients = clients } end - elseif node.protocol == "mtproto" then - settings = { - users = { - { - secret = (node.password == nil) and "" or node.password - } - } - } elseif node.protocol == "dokodemo-door" then settings = { network = node.d_protocol, diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po index 9910e2b7e..f161e9715 100644 --- a/luci-app-passwall2/po/zh-cn/passwall2.po +++ b/luci-app-passwall2/po/zh-cn/passwall2.po @@ -1150,9 +1150,6 @@ msgstr "显示节点检测" msgid "Show Show IP111" msgstr "显示IP111" -msgid "The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f." -msgstr "MTProto 协议必须为 32 个字符,仅可包含 0 到 9 和 a 到 f 之间的字符。" - msgid "Destination protocol" msgstr "目标协议"