diff --git a/android/app/build.gradle b/android/app/build.gradle
index 64c55a5..da8605d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     namespace "com.network.proxy"
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdk flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5e2ce8f..e22bc34 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
             android:name=".VpnAlertDialog"
             android:exported="false">
             <intent-filter>
-                <action android:name="ProxyVpnService" />
+                <action android:name="com.network.proxy.ProxyVpnService" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/kotlin/com/network/proxy/ProxyVpnService.kt b/android/app/src/main/kotlin/com/network/proxy/ProxyVpnService.kt
index d822fb9..7a0be10 100644
--- a/android/app/src/main/kotlin/com/network/proxy/ProxyVpnService.kt
+++ b/android/app/src/main/kotlin/com/network/proxy/ProxyVpnService.kt
@@ -1,5 +1,6 @@
 package com.network.proxy
 
+import ProxyVpnRunnable
 import android.content.Intent
 import android.net.ProxyInfo
 import android.net.VpnService
@@ -42,22 +43,36 @@ class ProxyVpnService : VpnService() {
         vpnInterface = createVpnInterface(proxyHost, proxyPort)
         if (vpnInterface == null) {
             val alertDialog = Intent(applicationContext, VpnAlertDialog::class.java)
+                .setAction("com.network.proxy.ProxyVpnService")
             alertDialog.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             startActivity(alertDialog)
+            return
         }
+
+        var vpnRunnable = ProxyVpnRunnable(
+            vpnInterface!!,
+            proxyConfig.ip,
+            proxyConfig.port,
+            interceptedPorts.toIntArray()
+        )
     }
 
     private fun createVpnInterface(proxyHost: String, proxyPort: Int): ParcelFileDescriptor? {
         return Builder()
+            .setMtu(1500)
             .addAddress("10.0.0.2", 32)
             .addRoute("0.0.0.0", 0)
+            .addDnsServer("114.114.114.114")
+            .addDnsServer("8.8.8.8")
             .setSession(baseContext.applicationInfo.name)
-            .also {
+            .allowBypass()
+            .apply {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    it.addDisallowedApplication(baseContext.packageName)
-                        .setHttpProxy(ProxyInfo.buildDirectProxy(proxyHost, proxyPort))
+                    addDisallowedApplication(baseContext.packageName)
+                    setHttpProxy(ProxyInfo.buildDirectProxy(proxyHost, proxyPort))
                 }
             }
+            .setBlocking(true) // We use a blocking loop to read in ProxyVpnRunnable
             .establish()
     }
 
diff --git a/android/app/src/main/kotlin/com/network/proxy/VpnSocketProxy.java b/android/app/src/main/kotlin/com/network/proxy/VpnSocketProxy.java
new file mode 100644
index 0000000..4f0d7fe
--- /dev/null
+++ b/android/app/src/main/kotlin/com/network/proxy/VpnSocketProxy.java
@@ -0,0 +1,38 @@
+package com.network.proxy;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+public class VpnSocketProxy {
+
+    FileChannel vpnInput;
+    FileChannel vpnOutput;
+
+    public VpnSocketProxy(FileDescriptor fileDescriptor) {
+         vpnInput = new FileInputStream(fileDescriptor).getChannel();
+         vpnOutput = new FileOutputStream(fileDescriptor).getChannel();
+    }
+
+
+
+    public void accept(byte[] buffer) throws Exception {
+        // Allocate the buffer for a single packet.
+        ByteBuffer packet = ByteBuffer.allocate(32767);
+        while (true) {
+            int read = vpnInput.read(packet);
+            if (read > 0) {
+                packet.flip();
+                packet.clear();
+                vpnOutput.write(packet);
+                packet.clear();
+            } else {
+                break;
+            }
+        }
+    }
+
+
+}
diff --git a/android/app/src/main/kotlin/com/network/proxy/vpn/ProxyVpnRunnable.kt b/android/app/src/main/kotlin/com/network/proxy/vpn/ProxyVpnRunnable.kt
new file mode 100644
index 0000000..19be97f
--- /dev/null
+++ b/android/app/src/main/kotlin/com/network/proxy/vpn/ProxyVpnRunnable.kt
@@ -0,0 +1,116 @@
+
+import android.os.ParcelFileDescriptor
+import android.util.Log
+import android.util.SparseArray
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.InterruptedIOException
+import java.net.ConnectException
+import java.net.InetSocketAddress
+import java.nio.ByteBuffer
+
+const val MAX_PACKET_LEN = 1500
+const val TAG = "ProxyVpnRunnable"
+
+class ProxyVpnRunnable(
+    vpnInterface: ParcelFileDescriptor,
+    proxyHost: String,
+    proxyPort: Int,
+    redirectPorts: IntArray
+) : Runnable {
+
+    @Volatile private var running = false
+
+    private val vpnReadStream = FileInputStream(vpnInterface.fileDescriptor)
+
+    // 此VPN接收的来自上游服务器的数据包
+    private val vpnWriteStream = FileOutputStream(vpnInterface.fileDescriptor)
+    private val vpnPacketWriter = ClientPacketWriter(vpnWriteStream)
+    private val vpnPacketWriterThread = Thread(vpnPacketWriter)
+
+    // Background service & task for non-blocking socket
+    private val nioService = SocketNIODataService(vpnPacketWriter)
+    private val dataServiceThread = Thread(nioService, "Socket NIO thread")
+
+    private val manager = SessionManager()
+    private val handler = SessionHandler(manager, nioService, vpnPacketWriter)
+
+    // Allocate the buffer for a single packet.
+    private val packet = ByteBuffer.allocate(MAX_PACKET_LEN)
+
+    //重定向流量应该转发到代理地址
+    private val portRedirections = SparseArray<InetSocketAddress>().apply {
+        val proxyAddress = InetSocketAddress(proxyHost, proxyPort)
+        redirectPorts.forEach {
+            append(it, proxyAddress)
+        }
+    }
+
+    override fun run() {
+        Log.i(TAG, "Vpn thread starting")
+
+        manager.setTcpPortRedirections(portRedirections)
+        dataServiceThread.start()
+        vpnPacketWriterThread.start()
+
+        var data: ByteArray
+        var length: Int
+
+        running = true
+        while (running) {
+            try {
+                data = packet.array()
+
+                length = vpnReadStream.read(data)
+                if (length > 0) {
+                    try {
+                        packet.limit(length)
+                        handler.handlePacket(packet)
+                    } catch (e: Exception) {
+                        val errorMessage = (e.message ?: e.toString())
+                        Log.e(TAG, errorMessage)
+
+                        val isIgnorable =
+                            (e is ConnectException && errorMessage == "Permission denied") ||
+                                    // Nothing we can do if the internet goes down:
+                                    (e is ConnectException && errorMessage == "Network is unreachable") ||
+                                    (e is ConnectException && errorMessage.contains("ENETUNREACH")) ||
+                                    // Too many open files - can't make more sockets, not much we can do:
+                                    (e is ConnectException && errorMessage == "Too many open files") ||
+                                    (e is ConnectException && errorMessage.contains("EMFILE")) ||
+                                    // IPv6 is not supported here yet:
+                                    (e is PacketHeaderException && errorMessage.contains("IP version should be 4 but was 6"))
+
+                        if (!isIgnorable) {
+                            Sentry.capture(e)
+                        }
+                    }
+
+                    packet.clear()
+                } else {
+                    Thread.sleep(10)
+                }
+            } catch (e: InterruptedException) {
+                Log.i(TAG, "Sleep interrupted: " + e.message)
+            } catch (e: InterruptedIOException) {
+                Log.i(TAG, "Read interrupted: " + e.message)
+            }
+        }
+
+        Log.i(TAG, "Vpn thread shutting down")
+    }
+
+    fun stop() {
+        if (running) {
+            running = false
+            nioService.shutdown()
+            dataServiceThread.interrupt()
+
+            vpnPacketWriter.shutdown()
+            vpnPacketWriterThread.interrupt()
+        } else {
+            Log.w(TAG, "Vpn runnable stopped, but it's not running")
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index f7eb7f6..b7c2752 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/lib/network/handler.dart b/lib/network/handler.dart
index 481fe73..402ba54 100644
--- a/lib/network/handler.dart
+++ b/lib/network/handler.dart
@@ -118,6 +118,8 @@ class HttpChannelHandler extends ChannelHandler<HttpRequest> {
 
   /// 转发请求
   Future<void> forward(Channel channel, HttpRequest httpRequest) async {
+    log.i("[${channel.id}] ${httpRequest.method.name} ${httpRequest.requestUrl}");
+
     //获取远程连接
     var remoteChannel = await _getRemoteChannel(channel, httpRequest);
 
diff --git a/lib/network/host_port.dart b/lib/network/host_port.dart
index da7a434..c978e66 100644
--- a/lib/network/host_port.dart
+++ b/lib/network/host_port.dart
@@ -25,13 +25,13 @@ HostAndPort getHostAndPort(HttpRequest request) {
     requestUri = request.headers.get(HttpHeaders.HOST)!;
   }
 
-  return HostAndPort.of(requestUri, ssl: request.method == HttpMethod.connect ? true : null);
+  return HostAndPort.of(requestUri);
 }
 
 class HostAndPort {
   static const String httpScheme = "http://";
   static const String httpsScheme = "https://";
-  final String scheme;
+  String scheme;
   String host;
   final int port;
 
diff --git a/lib/network/network.dart b/lib/network/network.dart
index 447636f..e49f4a9 100644
--- a/lib/network/network.dart
+++ b/lib/network/network.dart
@@ -67,7 +67,11 @@ class Network {
     }
 
     //ssl握手
-    if (hostAndPort?.isSsl() == true) {
+    if (hostAndPort?.isSsl() == true || (data.length > 3 && data.first == 0x16 && data[1] == 0x03 && data[2] == 0x01)) {
+      if (hostAndPort?.scheme == HostAndPort.httpScheme) {
+        hostAndPort?.scheme = HostAndPort.httpsScheme;
+      }
+
       ssl(channel, hostAndPort!, data);
       return;
     }
diff --git a/lib/ui/desktop/toolbar/phone_connect.dart b/lib/ui/desktop/toolbar/phone_connect.dart
index 9ff3b08..f93729c 100644
--- a/lib/ui/desktop/toolbar/phone_connect.dart
+++ b/lib/ui/desktop/toolbar/phone_connect.dart
@@ -74,7 +74,7 @@ class _PhoneConnectState extends State<PhoneConnect> {
                       })
                 ]),
                 const SizedBox(height: 10),
-                const Text("请使用手机版扫描二维码"),
+                const Text("请使用手机版扫描二维码", style: TextStyle(fontSize: 17)),
               ],
             )));
   }
diff --git a/lib/ui/desktop/toolbar/setting/request_rewrite.dart b/lib/ui/desktop/toolbar/setting/request_rewrite.dart
index 2c9b4aa..ddddcac 100644
--- a/lib/ui/desktop/toolbar/setting/request_rewrite.dart
+++ b/lib/ui/desktop/toolbar/setting/request_rewrite.dart
@@ -130,7 +130,7 @@ class RuleAddDialog extends StatelessWidget {
     String? responseBody = rule?.responseBody;
 
     return AlertDialog(
-        title: const Text("添加请求重写规则", style: TextStyle(fontSize: 16)),
+        title: const Text("添加请求重写规则", style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600)),
         scrollable: true,
         content: Form(
             key: formKey,
@@ -267,7 +267,7 @@ class _RequestRuleListState extends State<RequestRuleList> {
                       cells: [
                         DataCell(Text(widget.requestRewrites.rules[index].enabled ? "是" : "否")),
                         DataCell(ConstrainedBox(
-                            constraints: const BoxConstraints(minWidth: 60,maxWidth: 280),
+                            constraints: const BoxConstraints(minWidth: 60, maxWidth: 280),
                             child: Text(
                                 '${widget.requestRewrites.rules[index].domain ?? ''}${widget.requestRewrites.rules[index].path}'))),
                         DataCell(Container(
diff --git a/pubspec.lock b/pubspec.lock
index 3243a4d..ab0c9c6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -150,14 +150,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
-  flutter_json:
-    dependency: "direct main"
-    description:
-      name: flutter_json
-      sha256: "38d76ffce9b3ae3b6a7de7c5dfd57a05f59fae2d0f0351b52524cc69f7ed2725"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.0.1+1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -292,34 +284,34 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.0"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
+      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.27"
+    version: "2.1.0"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297"
+      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.4"
+    version: "2.3.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -332,10 +324,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.0"
   platform:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index ef4f148..7508a18 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,10 +14,9 @@ dependencies:
   basic_utils: ^5.6.1
   logger: ^2.0.1
   date_format: ^2.0.7
-  flutter_json: ^0.0.1+1
   window_manager: ^0.3.5
   desktop_multi_window: ^0.2.0
-  path_provider: ^2.0.15
+  path_provider: ^2.1.0
   url_launcher: ^6.1.11
   proxy_manager: ^0.0.3
   qr_flutter: ^4.1.0