Merge pull request #34 from MHSanaei/dev

i hate myself

config/version

@@ -1 +1 @@
-1.1.0
+1.1.1

install.sh

@@ -98,8 +98,8 @@ config_after_install() {
             /usr/local/x-ui/x-ui setting -username ${usernameTemp} -password ${passwordTemp}
             echo -e "this is a fresh installation,will generate random login info for security concerns:"
             echo -e "###############################################"
-            echo -e "${green}user name:${usernameTemp}${plain}"
-            echo -e "${green}user password:${passwordTemp}${plain}"
+            echo -e "${green}username:${usernameTemp}${plain}"
+            echo -e "${green}password:${passwordTemp}${plain}"
             echo -e "###############################################"
             echo -e "${red}if you forgot your login info,you can type x-ui and then type 7 to check after installation${plain}"
         else

web/assets/js/model/xray.js

@@ -1156,14 +1156,12 @@ class Inbound extends XrayCommonClass {
             }
         }
 		
-		 if (this.xtls) {
-            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
-                address = this.stream.tls.server;
-                if (type === "tcp") {
-                    params.set("flow", this.settings.vlesses[clientIndex].flow);
-                }
+		 if (this.XTLS) {
+				if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
+				address = this.stream.tls.server;
+				}
+			params.set("flow", this.settings.vlesses[clientIndex].flow);
 			}
-        }
 
         const link = `vless://${uuid}@${address}:${port}`;
         const url = new URL(link);
@@ -1245,20 +1243,18 @@ class Inbound extends XrayCommonClass {
             params.set("alpn", this.stream.tls.alpn[0]);
             if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
                 address = this.stream.tls.server;
-                }
-            if (this.stream.tls.settings[0]['serverName'] !== ''){
-                params.set("sni", this.stream.tls.settings[0]['serverName']);
 			}
+			if (this.stream.tls.settings[0]['serverName'] !== ''){
+                params.set("sni", this.stream.tls.settings[0]['serverName']);
+            }
         }
 		
-		if (this.xtls) {
-            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
-                address = this.stream.tls.server;
-                 if (type === "tcp" && this.settings.trojans[clientIndex].flow.length > 0) {
-                    params.set("flow", this.settings.trojans[clientIndex].flow);
-                }
+		 if (this.XTLS) {
+				if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
+				address = this.stream.tls.server;
+				}
+			params.set("flow", this.settings.trojans[clientIndex].flow);
 			}
-        }
         
         const link = `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;
         const url = new URL(link);