diff --git a/sub/subJsonService.go b/sub/subJsonService.go index 92519f3e..8bc98dea 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -189,7 +189,7 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} { delete(streamSettings, "sockopt") if s.fragmanet != "" { - streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "TcpNoDelay": true}`) + streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "tcpNoDelay": true}`) } // remove proxy protocol @@ -218,7 +218,7 @@ func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interf tlsData["serverName"] = tData["serverName"] tlsData["alpn"] = tData["alpn"] - if allowInsecure, ok := tlsClientSettings["allowInsecure"].(string); ok { + if allowInsecure, ok := tlsClientSettings["allowInsecure"].(bool); ok { tlsData["allowInsecure"] = allowInsecure } if fingerprint, ok := tlsClientSettings["fingerprint"].(string); ok { diff --git a/web/assets/codemirror/codemirror.js b/web/assets/codemirror/codemirror.js index 034ea2f8..a3cd26c1 100644 --- a/web/assets/codemirror/codemirror.js +++ b/web/assets/codemirror/codemirror.js @@ -538,7 +538,7 @@ var on = function(emitter, type, f) { if (emitter.addEventListener) { - emitter.addEventListener(type, f, { passive: true }); + emitter.addEventListener(type, f, { passive: false }); } else if (emitter.attachEvent) { emitter.attachEvent("on" + type, f); } else { diff --git a/web/html/login.html b/web/html/login.html index 4605a4fd..e9e4e219 100644 --- a/web/html/login.html +++ b/web/html/login.html @@ -374,92 +374,96 @@ - - -
-
- - - - - - - - - - - -
- - - - -

- - {{ i18n "pages.login.title" }} - 3X-UI - -

-
-
- - - - - - - - - - - - - - - - - - - -
- -
-
-
- - - - - - -    - - - - - - - - -   - - - - - - -
-
-
+ + +
+
+ + + + + + + + + + + +
+ + + + +

+ + {{ i18n "pages.login.title" }} + 3X-UI + +

-
-
-
+
+ + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ + + + + + +    + + + + + + + + +   + + + + + + +
+
+
+ + +
+
{{template "js" .}} {{template "component/themeSwitcher" .}} diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index adc199a9..fdb523c3 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -263,7 +263,6 @@ -