diff --git a/Podfile.lock b/Podfile.lock
index 953089e..d6f58f8 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -17,7 +17,7 @@ DEPENDENCIES:
   - SwiftyJSON
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs:
+  https://github.com/CocoaPods/Specs.git:
     - Alamofire
     - MASShortcut
     - QRCoder
@@ -45,4 +45,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 6196a63d3d6fcd5c461152d1c910391f609a3bba
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.8.4
diff --git a/V2rayU.xcodeproj/project.pbxproj b/V2rayU.xcodeproj/project.pbxproj
index acef3d8..846a6dc 100644
--- a/V2rayU.xcodeproj/project.pbxproj
+++ b/V2rayU.xcodeproj/project.pbxproj
@@ -330,7 +330,6 @@
 		664EB373216C9A5E00B6AE0D /* V2rayU */ = {
 			isa = PBXGroup;
 			children = (
-				669312912413E3A000C043F8 /* trojan */,
 				66F07CF8236D79540088A4AE /* ping.swift */,
 				66F411B421CA8921007AAC10 /* cmd.sh */,
 				6608D9B82182BBAC00A0E0DD /* v2ray */,
@@ -358,13 +357,6 @@
 			path = V2rayU;
 			sourceTree = "<group>";
 		};
-		669312912413E3A000C043F8 /* trojan */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = trojan;
-			sourceTree = "<group>";
-		};
 		66AD532D241496EF0070529C /* Common */ = {
 			isa = PBXGroup;
 			children = (
@@ -858,7 +850,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = BLHQ787DMR;
+				DEVELOPMENT_TEAM = RJYEH6TCJD;
 				INFOPLIST_FILE = V2rayULauncher/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -880,7 +872,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = BLHQ787DMR;
+				DEVELOPMENT_TEAM = RJYEH6TCJD;
 				INFOPLIST_FILE = V2rayULauncher/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1066,13 +1058,13 @@
 			baseConfigurationReference = 8E15DFCD449143CCC309A1A0 /* Pods-V2rayU.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 2.3.1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = BLHQ787DMR;
+				DEVELOPMENT_TEAM = RJYEH6TCJD;
 				ENABLE_ONLY_ACTIVE_RESOURCES = YES;
 				INFOPLIST_FILE = V2rayU/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1097,13 +1089,13 @@
 			baseConfigurationReference = 29B27CD97A6B24986CAF0BFD /* Pods-V2rayU.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 2.3.1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = BLHQ787DMR;
+				DEVELOPMENT_TEAM = RJYEH6TCJD;
 				ENABLE_ONLY_ACTIVE_RESOURCES = YES;
 				INFOPLIST_FILE = V2rayU/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1128,7 +1120,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = BLHQ787DMR;
+				DEVELOPMENT_TEAM = RJYEH6TCJD;
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1140,7 +1132,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = BLHQ787DMR;
+				DEVELOPMENT_TEAM = RJYEH6TCJD;
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
diff --git a/V2rayU/Base.lproj/ConfigWindow.xib b/V2rayU/Base.lproj/ConfigWindow.xib
index 19b1b60..7b2d2c8 100644
--- a/V2rayU/Base.lproj/ConfigWindow.xib
+++ b/V2rayU/Base.lproj/ConfigWindow.xib
@@ -91,7 +91,7 @@
         <window title="V2rayU" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="196" y="240" width="597" height="566"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="597" height="566"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -127,7 +127,7 @@
                         </clipView>
                         <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/>
                         <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="CcG-vA-eQv">
-                            <rect key="frame" x="1" y="184" width="148" height="15"/>
+                            <rect key="frame" x="1" y="183" width="148" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="aeH-wA-qiH">
@@ -255,15 +255,15 @@ Gw
                                             <rect key="frame" x="8" y="8" width="377" height="428"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <clipView key="contentView" id="0rS-HW-TeI">
-                                                <rect key="frame" x="1" y="1" width="360" height="426"/>
+                                                <rect key="frame" x="1" y="1" width="375" height="426"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" selectionGranularity="word" allowsUndo="YES" allowsNonContiguousLayout="YES" textCompletion="NO" smartInsertDelete="YES" id="dNK-7u-GUm">
-                                                        <rect key="frame" x="0.0" y="0.0" width="364" height="426"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="379" height="426"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                        <size key="minSize" width="360" height="426"/>
+                                                        <size key="minSize" width="375" height="426"/>
                                                         <size key="maxSize" width="400" height="10000000"/>
                                                         <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                     </textView>
@@ -275,7 +275,7 @@ Gw
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
                                             <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="PcW-ea-yMr">
-                                                <rect key="frame" x="361" y="1" width="15" height="426"/>
+                                                <rect key="frame" x="360" y="1" width="16" height="426"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
                                         </scrollView>
@@ -470,13 +470,13 @@ Gw
                                                                 <menuItem title="vless" id="WU9-bB-1IX">
                                                                     <modifierMask key="keyEquivalentModifierMask"/>
                                                                 </menuItem>
-                                                                <menuItem title="shadowsocks" id="5a1-ro-mjU">
+                                                                <menuItem title="trojan" enabled="NO" id="awP-ro-Z4d">
                                                                     <modifierMask key="keyEquivalentModifierMask"/>
                                                                 </menuItem>
-                                                                <menuItem title="socks" id="VGB-NZ-XaQ">
+                                                                <menuItem title="shadowsocks" id="5a1-ro-mjU">
                                                                     <modifierMask key="keyEquivalentModifierMask"/>
                                                                 </menuItem>
-                                                                <menuItem title="trojan" hidden="YES" enabled="NO" id="awP-ro-Z4d">
+                                                                <menuItem title="socks" id="VGB-NZ-XaQ">
                                                                     <modifierMask key="keyEquivalentModifierMask"/>
                                                                 </menuItem>
                                                             </items>
@@ -645,7 +645,7 @@ Gw
                                                                 </subviews>
                                                             </view>
                                                             <view hidden="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rJI-46-Le8" userLabel="Vless">
-                                                                <rect key="frame" x="0.0" y="2" width="358" height="140"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="358" height="140"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 <subviews>
                                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="26f-zo-KeJ">
@@ -667,7 +667,7 @@ Gw
                                                                         </textFieldCell>
                                                                     </textField>
                                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DnC-Cl-XHL">
-                                                                        <rect key="frame" x="153" y="47" width="36" height="17"/>
+                                                                        <rect key="frame" x="30" y="47" width="36" height="17"/>
                                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="level:" id="7QY-Ks-X8I">
                                                                             <font key="font" metaFont="system"/>
@@ -722,7 +722,7 @@ Gw
                                                                         </textFieldCell>
                                                                     </textField>
                                                                     <textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cfE-ED-uw4">
-                                                                        <rect key="frame" x="196" y="44" width="56" height="22"/>
+                                                                        <rect key="frame" x="74" y="44" width="56" height="22"/>
                                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="H4P-sI-pqn">
                                                                             <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="RFs-Eg-w0D"/>
@@ -1754,7 +1754,7 @@ Gw
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="76o-eU-kIf">
-                        <rect key="frame" x="60" y="67" width="62" height="17"/>
+                        <rect key="frame" x="60" y="68" width="62" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="inline" title="show log" bezelStyle="inline" alignment="center" borderStyle="border" inset="2" id="OQK-lm-eg7">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/V2rayU/ConfigWindow.swift b/V2rayU/ConfigWindow.swift
index 43b35d9..232c81d 100644
--- a/V2rayU/ConfigWindow.swift
+++ b/V2rayU/ConfigWindow.swift
@@ -53,7 +53,7 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
     @IBOutlet weak var vmessLevel: NSTextField!
     @IBOutlet weak var vmessUserId: NSTextField!
     @IBOutlet weak var vmessSecurity: NSPopUpButton!
-    
+
     // vless
     @IBOutlet weak var vlessAddr: NSTextField!
     @IBOutlet weak var vlessPort: NSTextField!
@@ -270,7 +270,7 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
             user.security = self.vmessSecurity.titleOfSelectedItem!
         }
         v2rayConfig.serverVmess.users[0] = user
-        
+
         // vless
         v2rayConfig.serverVless.address = self.vlessAddr.stringValue
         v2rayConfig.serverVmess.port = Int(self.vlessPort.intValue)
@@ -287,6 +287,11 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
             v2rayConfig.serverShadowsocks.method = self.shadowsockMethod.titleOfSelectedItem ?? "aes-256-cfb"
         }
 
+        // trojan
+        v2rayConfig.serverTrojan.address = self.trojanAddr.stringValue
+        v2rayConfig.serverTrojan.port = Int(self.trojanPort.intValue)
+        v2rayConfig.serverTrojan.password = self.trojanPass.stringValue
+
         // socks5
         v2rayConfig.serverSocks5.servers[0].address = self.socks5Addr.stringValue
         v2rayConfig.serverSocks5.servers[0].port = Int(self.socks5Port.intValue)
@@ -375,7 +380,7 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
             self.vmessUserId.stringValue = user.id
             self.vmessSecurity.selectItem(withTitle: user.security)
         }
-        
+
         // vless
         self.vlessAddr.stringValue = v2rayConfig.serverVless.address
         self.vmessPort.intValue = Int32(v2rayConfig.serverVless.port)
@@ -400,6 +405,15 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
             self.socks5User.stringValue = users[0].user
             self.socks5Pass.stringValue = users[0].pass
         }
+
+        // trojan
+        self.trojanAddr.stringValue = v2rayConfig.serverTrojan.address
+        self.trojanPass.stringValue = v2rayConfig.serverTrojan.password
+        if v2rayConfig.serverTrojan.port > 0 {
+            self.trojanPort.stringValue = String(v2rayConfig.serverTrojan.port)
+        }
+
+
         // ========================== server end =======================
 
         // ========================== stream start =======================
diff --git a/V2rayU/v2ray/V2rayConfig.swift b/V2rayU/v2ray/V2rayConfig.swift
index 6d2f09d..06cb21a 100644
--- a/V2rayU/v2ray/V2rayConfig.swift
+++ b/V2rayU/v2ray/V2rayConfig.swift
@@ -119,6 +119,7 @@ class V2rayConfig: NSObject {
     var serverSocks5 = V2rayOutboundSocks()
     var serverShadowsocks = V2rayOutboundShadowsockServer()
     var serverVless = V2rayOutboundVLessItem()
+    var serverTrojan = V2rayOutboundTrojanServer()
 
     // transfor
     var streamNetwork = V2rayStreamSettings.network.tcp.rawValue
@@ -512,7 +513,7 @@ class V2rayConfig: NSObject {
             }
             vless!.vnext = [self.serverVless]
             outbound.settingVLess = vless
-            
+
             var mux = V2rayOutboundMux()
             mux.enabled = self.enableMux
             mux.concurrency = self.mux
@@ -528,10 +529,19 @@ class V2rayConfig: NSObject {
             ss!.servers = [self.serverShadowsocks]
             outbound.settingShadowsocks = ss
             break
+
         case V2rayProtocolOutbound.socks:
-            print("self.serverSocks5", self.serverSocks5)
             outbound.settingSocks = self.serverSocks5
             break
+
+        case V2rayProtocolOutbound.trojan:
+            var tro = outbound.settingTrojan
+            if tro == nil {
+                tro = V2rayOutboundTrojan()
+            }
+            tro!.servers = [self.serverTrojan]
+            outbound.settingTrojan = tro
+            break
         default:
             break
         }
@@ -576,12 +586,12 @@ class V2rayConfig: NSObject {
                 self.error = "missing vmess.address"
                 return
             }
-            
+
             if self.serverVless.port == 0 {
                 self.error = "missing vmess.port"
                 return
             }
-            
+
             if self.serverVless.users.count > 0 {
                 if self.serverVless.users[0].id.count == 0 {
                     self.error = "missing vless.users[0].id"
@@ -619,6 +629,18 @@ class V2rayConfig: NSObject {
                 self.error = "missing socks.port";
                 return
             }
+            break
+        case V2rayProtocolOutbound.trojan.rawValue:
+            if self.serverTrojan.address.count == 0 {
+                self.error = "missing trojan.address"
+                return
+            }
+
+            if self.serverTrojan.port == 0 {
+                self.error = "missing trojan.port"
+                return
+            }
+
             break
         default:
             self.error = "missing outbound.protocol";
@@ -658,7 +680,7 @@ class V2rayConfig: NSObject {
             var vless = V2rayOutboundVLess()
             vless.vnext = [self.serverVless]
             outbound.settingVLess = vless
-            
+
             var mux = V2rayOutboundMux()
             mux.enabled = self.enableMux
             mux.concurrency = self.mux
@@ -974,7 +996,7 @@ class V2rayConfig: NSObject {
                 // set into inbound
                 v2rayInbound.settingVMess = settings
                 break
-                
+
             case .vless:
                 var settings = V2rayInboundVLess()
                 if jsonParams["settings"]["clients"].dictionaryValue.count > 0 {
@@ -989,9 +1011,9 @@ class V2rayConfig: NSObject {
                     }
                     settings.clients = clients
                 }
-                
+
                 settings.decryption = jsonParams["settings"]["decryption"].stringValue
-                
+
                 if jsonParams["settings"]["fallbacks"].dictionaryValue.count > 0 {
                     var fallbacks: [V2rayInboundVLessFallback] = []
                     for subJson in jsonParams["settings"]["fallbacks"].arrayValue {
@@ -1004,9 +1026,39 @@ class V2rayConfig: NSObject {
                     }
                     settings.fallbacks = fallbacks
                 }
-                
+
                 v2rayInbound.settingVLess = settings
                 break
+
+            case .trojan:
+                var settings = V2rayInboundTrojan()
+                if jsonParams["settings"]["clients"].dictionaryValue.count > 0 {
+                    var clients: [V2rayInboundTrojanClient] = []
+                    for subJson in jsonParams["settings"]["clients"].arrayValue {
+                        var client = V2rayInboundTrojanClient()
+                        client.password = subJson["password"].stringValue
+                        client.level = subJson["level"].intValue
+                        client.email = subJson["email"].stringValue
+                        clients.append(client)
+                    }
+                    settings.clients = clients
+                }
+
+                if jsonParams["settings"]["fallbacks"].dictionaryValue.count > 0 {
+                    var fallbacks: [V2rayInboundTrojanFallback] = []
+                    for subJson in jsonParams["settings"]["fallbacks"].arrayValue {
+                        var fallback = V2rayInboundTrojanFallback()
+                        fallback.alpn = subJson["alpn"].stringValue
+                        fallback.path = subJson["path"].stringValue
+                        fallback.dest = subJson["dest"].intValue
+                        fallback.xver = subJson["xver"].intValue
+                        fallbacks.append(fallback)
+                    }
+                    settings.fallbacks = fallbacks
+                }
+
+                v2rayInbound.settingTrojan = settings
+                break
             }
         }
 
@@ -1207,17 +1259,17 @@ class V2rayConfig: NSObject {
                 v2rayOutbound.mux = mux
 
                 break
-                
+
             case .vless:
                 var settingVLess = V2rayOutboundVLess()
                 var vnext: [V2rayOutboundVLessItem] = []
-                
+
                 jsonParams["settings"]["vnext"].arrayValue.forEach { val in
                     var item = V2rayOutboundVLessItem()
-                    
+
                     item.address = val["address"].stringValue
                     item.port = val["port"].intValue
-                    
+
                     var users: [V2rayOutboundVLessUser] = []
                     val["users"].arrayValue.forEach { val in
                         var user = V2rayOutboundVLessUser()
@@ -1230,17 +1282,37 @@ class V2rayConfig: NSObject {
                     item.users = users
                     vnext.append(item)
                 }
-                
+
                 settingVLess.vnext = vnext
                 v2rayOutbound.settingVLess = settingVLess
-                
+
                 var mux = V2rayOutboundMux()
                 mux.enabled = self.enableMux
                 mux.concurrency = self.mux
                 v2rayOutbound.mux = mux
-                
+
+                break
+
+            case .trojan:
+                var settingTrojan = V2rayOutboundTrojan()
+                var servers: [V2rayOutboundTrojanServer] = []
+                // servers
+                jsonParams["settings"]["servers"].arrayValue.forEach { val in
+                    var server = V2rayOutboundTrojanServer()
+                    server.address = val["address"].stringValue
+                    server.password = val["password"].stringValue
+                    server.port = val["port"].intValue
+                    server.level = val["level"].intValue
+                    server.email = val["email"].stringValue
+
+                    // append
+                    servers.append(server)
+                }
+                settingTrojan.servers = servers
+                // set into outbound
+                v2rayOutbound.settingTrojan = settingTrojan
+
                 break
-                
             }
         }
 
@@ -1262,7 +1334,7 @@ class V2rayConfig: NSObject {
         if v2rayOutbound.protocol == V2rayProtocolOutbound.vmess && v2rayOutbound.settingVMess != nil && v2rayOutbound.settingVMess!.vnext.count > 0 {
             self.serverVmess = v2rayOutbound.settingVMess!.vnext[0]
         }
-        
+
         if v2rayOutbound.protocol == V2rayProtocolOutbound.vless && v2rayOutbound.settingVLess != nil && v2rayOutbound.settingVLess!.vnext.count > 0 {
             self.serverVless = v2rayOutbound.settingVLess!.vnext[0]
         }
@@ -1271,6 +1343,11 @@ class V2rayConfig: NSObject {
             self.serverShadowsocks = v2rayOutbound.settingShadowsocks!.servers[0]
         }
 
+        if v2rayOutbound.protocol == V2rayProtocolOutbound.trojan && v2rayOutbound.settingTrojan != nil && v2rayOutbound.settingTrojan!.servers.count > 0 {
+            self.serverTrojan = v2rayOutbound.settingTrojan!.servers[0]
+        }
+
+
         return (v2rayOutbound)
     }
 
diff --git a/V2rayU/v2ray/v2rayInbound.swift b/V2rayU/v2ray/v2rayInbound.swift
index bf9111e..1245017 100644
--- a/V2rayU/v2ray/v2rayInbound.swift
+++ b/V2rayU/v2ray/v2rayInbound.swift
@@ -23,6 +23,7 @@ struct V2rayInbound: Codable {
     var settingShadowsocks: V2rayInboundShadowsocks?
     var settingVMess: V2rayInboundVMess?
     var settingVLess: V2rayInboundVLess?
+    var settingTrojan: V2rayInboundTrojan?
 
     enum CodingKeys: String, CodingKey {
         case port
@@ -71,6 +72,9 @@ extension V2rayInbound {
         case .vless:
             settingVLess = try container.decode(V2rayInboundVLess.self, forKey: CodingKeys.settings)
             break
+        case .trojan:
+            settingTrojan = try container.decode(V2rayInboundTrojan.self, forKey: CodingKeys.settings)
+            break
         }
     }
 
@@ -112,6 +116,9 @@ extension V2rayInbound {
         case .vless:
             try container.encode(self.settingVLess, forKey: .settings)
             break
+        case .trojan:
+            try container.encode(self.settingTrojan, forKey: .settings)
+            break
         }
     }
 }
@@ -216,3 +223,22 @@ struct V2rayInboundVLessFallback: Codable {
     var dest: Int = 80
     var xver: Int = 0
 }
+
+struct V2rayInboundTrojan: Codable {
+    var clients: [V2rayInboundTrojanClient]?
+    var decryption: String = "none"
+    var fallbacks: [V2rayInboundTrojanFallback]? = [V2rayInboundTrojanFallback()]
+}
+
+struct V2rayInboundTrojanClient: Codable {
+    var password: String = ""
+    var level: Int = 0
+    var email: String?
+}
+
+struct V2rayInboundTrojanFallback: Codable {
+    var alpn: String? = ""
+    var path: String? = ""
+    var dest: Int = 80
+    var xver: Int = 0
+}
diff --git a/V2rayU/v2ray/v2rayOutbound.swift b/V2rayU/v2ray/v2rayOutbound.swift
index daa6dc4..a059f00 100644
--- a/V2rayU/v2ray/v2rayOutbound.swift
+++ b/V2rayU/v2ray/v2rayOutbound.swift
@@ -18,6 +18,7 @@ enum V2rayProtocolOutbound: String, Codable {
     case dns
     case http
     case vless
+    case trojan
 }
 
 struct V2rayOutbound: Codable {
@@ -36,6 +37,7 @@ struct V2rayOutbound: Codable {
     var settingDns: V2rayOutboundDns?
     var settingHttp: V2rayOutboundHttp?
     var settingVLess: V2rayOutboundVLess?
+    var settingTrojan: V2rayOutboundTrojan?
 
     enum CodingKeys: String, CodingKey {
         case sendThrough
@@ -97,8 +99,13 @@ extension V2rayOutbound {
             break
         case .http:
             settingHttp = try container.decode(V2rayOutboundHttp.self, forKey: CodingKeys.settings)
+            break
         case .vless:
             settingVLess = try container.decode(V2rayOutboundVLess.self, forKey: CodingKeys.settings)
+            break
+        case .trojan:
+            settingTrojan = try container.decode(V2rayOutboundTrojan.self, forKey: CodingKeys.settings)
+            break
         }
     }
 
@@ -153,6 +160,9 @@ extension V2rayOutbound {
         case .vless:
             try container.encode(self.settingVLess, forKey: .settings)
             break
+        case .trojan:
+            try container.encode(self.settingTrojan, forKey: .settings)
+            break
         }
     }
 }
@@ -269,3 +279,15 @@ struct V2rayOutboundVLessUser: Codable {
     var encryption: String = "none"
     var level: Int = 0
 }
+
+struct V2rayOutboundTrojan: Codable {
+    var servers: [V2rayOutboundTrojanServer] = [V2rayOutboundTrojanServer()]
+}
+
+struct V2rayOutboundTrojanServer: Codable {
+    var address: String = ""
+    var port: Int = 0
+    var password: String = ""
+    var level: Int = 0
+    var email: String = ""
+}
diff --git a/V2rayU/v2ray/v2rayStruct.swift b/V2rayU/v2ray/v2rayStruct.swift
index 33d251b..9858a2f 100644
--- a/V2rayU/v2ray/v2rayStruct.swift
+++ b/V2rayU/v2ray/v2rayStruct.swift
@@ -33,6 +33,7 @@ enum V2rayProtocolInbound: String, CaseIterable, Codable {
     case socks
     case vmess
     case vless
+    case trojan
 }
 
 // log