Merge branch 'master' into rewrite

* master:
  Update TCP/config_server.json

VMess+TCP/config_server.json

@@ -1,51 +1,51 @@
 {
-  "log": {
-    "loglevel": "warning"
-  },
-  "routing": {
-    "domainStrategy": "AsIs",
-    "rules": [
-      {
-        "ip": [
-          "geoip:private"
-        ],
-        "outboundTag": "blocked",
-        "port": null,
-        "type": "field"
-      }
-    ]
-  },
-  "inbounds": [
-    {
-      "port": 1234,
-      "protocol": "vmess",
-      "settings": {
-        "clients": [
-          {
-            "id": "e2b39869-7e9e-411b-a561-00904419bed9",
-            "alterId": 100,
-            "testsEnabled": "VMessAEAD"
-          }
+    "log": {
+        "loglevel": "warning"
+    },
+    "routing": {
+        "domainStrategy": "AsIs",
+        "rules": [
+            {
+                "ip": [
+                    "geoip:private"
+                ],
+                "outboundTag": "blocked",
+                "port": null,
+                "type": "field"
+            }
         ]
-      },
-      "tag": "tcp",
-      "streamSettings": {
-        "network": "tcp"
-      }
-    }
-  ],
-  "outbounds": [
-    {
-      "protocol": "freedom",
-      "settings": {
-      },
-      "tag": "direct"
     },
-    {
-      "protocol": "blackhole",
-      "settings": {
-      },
-      "tag": "blocked"
-    }
-  ]
+    "inbounds": [
+        {
+            "port": 1234,
+            "protocol": "vmess",
+            "settings": {
+                "clients": [
+                    {
+                        "id": "",
+                        "alterId": 100,
+                        "testsEnabled": "VMessAEAD"
+                    }
+                ]
+            },
+            "tag": "tcp",
+            "streamSettings": {
+                "network": "tcp"
+            }
+        }
+    ],
+    "outbounds": [
+        {
+            "protocol": "freedom",
+            "settings": {
+            },
+            "tag": "direct"
+        },
+        {
+            "protocol": "blackhole",
+            "settings": {
+            },
+            "tag": "blocked"
+        }
+    ]
 }