Optimize codes

tindy2013 · tindy2013 · commit 9534d104dd00 · 2019-08-28T14:38:55.000+08:00
diff --git a/Netch/Controllers/SSController.cs b/Netch/Controllers/SSController.cs
@@ -54,9 +54,9 @@ public bool Start(Objects.Server server, Objects.Mode mode)
             Instance = MainController.GetProcess();
             Instance.StartInfo.FileName = "bin\\Shadowsocks.exe";
             
-            if(!String.IsNullOrWhiteSpace(server.Plugin) && !String.IsNullOrWhiteSpace(server.PluginOptions))
+            if(!String.IsNullOrWhiteSpace(server.OBFS) && !String.IsNullOrWhiteSpace(server.OBFSParam))
             {
-                Instance.StartInfo.Arguments = String.Format("-s {0} -p {1} -b 0.0.0.0 -l 2801 -m {2} -k \"{3}\" -u --plugin {4} --plugin-opts \"{5}\"", server.Address, server.Port, server.EncryptMethod, server.Password, server.Plugin, server.PluginOptions);
+                Instance.StartInfo.Arguments = String.Format("-s {0} -p {1} -b 0.0.0.0 -l 2801 -m {2} -k \"{3}\" -u --plugin {4} --plugin-opts \"{5}\"", server.Address, server.Port, server.EncryptMethod, server.Password, server.OBFS, server.OBFSParam);
             }
             else
             {
diff --git a/Netch/Forms/Server/Shadowsocks.cs b/Netch/Forms/Server/Shadowsocks.cs
@@ -42,8 +42,8 @@ private void Shadowsocks_Load(object sender, EventArgs e)
                 PortTextBox.Text = Global.Server[Index].Port.ToString();
                 PasswordTextBox.Text = Global.Server[Index].Password;
                 EncryptMethodComboBox.SelectedIndex = Global.EncryptMethods.SS.IndexOf(Global.Server[Index].EncryptMethod);
-                PluginTextBox.Text = Global.Server[Index].Plugin;
-                PluginOptionsTextBox.Text = Global.Server[Index].PluginOptions;
+                PluginTextBox.Text = Global.Server[Index].OBFS;
+                PluginOptionsTextBox.Text = Global.Server[Index].OBFSParam;
             }
             else
             {
@@ -93,8 +93,8 @@ private void ControlButton_Click(object sender, EventArgs e)
                     Port = int.Parse(PortTextBox.Text),
                     Password = PasswordTextBox.Text,
                     EncryptMethod = EncryptMethodComboBox.Text,
-                    Plugin = PluginTextBox.Text,
-                    PluginOptions = PluginOptionsTextBox.Text                 
+                    OBFS = PluginTextBox.Text,
+                    OBFSParam = PluginOptionsTextBox.Text                 
                 });
             }
             else
@@ -108,8 +108,8 @@ private void ControlButton_Click(object sender, EventArgs e)
                     Port = int.Parse(PortTextBox.Text),
                     Password = PasswordTextBox.Text,
                     EncryptMethod = EncryptMethodComboBox.Text,
-                    Plugin = PluginTextBox.Text,
-                    PluginOptions = PluginOptionsTextBox.Text
+                    OBFS = PluginTextBox.Text,
+                    OBFSParam = PluginOptionsTextBox.Text
                 };
             }
 
diff --git a/Netch/Objects/Server.cs b/Netch/Objects/Server.cs
@@ -69,25 +69,15 @@ public class Server
         public string ProtocolParam;
 
         /// <summary>
-        ///     混淆
+        ///     混淆（SSR）/ 插件（SS）
         /// </summary>
         public string OBFS;
 
         /// <summary>
-        ///     混淆参数
+        ///     混淆参数（SSR）/ 插件参数（SS）
         /// </summary>
         public string OBFSParam;
 
-        /// <summary>
-        ///     插件（SS）
-        /// </summary>
-        public string Plugin;
-
-        /// <summary>
-        ///     插件参数（SS）
-        /// </summary>
-        public string PluginOptions;
-
         /// <summary>
         ///		传输协议（V2）
         /// </summary>
diff --git a/Netch/Utils/ShareLink.cs b/Netch/Utils/ShareLink.cs
@@ -120,8 +120,8 @@ public static string URLSafeBase64Decode(string text)
 
                             data.EncryptMethod = match.Groups["method"].Value;
                             data.Password = match.Groups["password"].Value;
-                            data.Plugin = plugins[0];
-                            data.PluginOptions = plugins[1];
+                            data.OBFS = plugins[0];
+                            data.OBFSParam = plugins[1];
                         }
 
                         if (!Global.EncryptMethods.SS.Contains(data.EncryptMethod))

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ public bool Start(Objects.Server server, Objects.Mode mode)`
`54`	`54`	`Instance = MainController.GetProcess();`
`55`	`55`	`Instance.StartInfo.FileName = "bin\\Shadowsocks.exe";`
`56`	`56`
`57`		`- if(!String.IsNullOrWhiteSpace(server.Plugin) && !String.IsNullOrWhiteSpace(server.PluginOptions))`
	`57`	`+ if(!String.IsNullOrWhiteSpace(server.OBFS) && !String.IsNullOrWhiteSpace(server.OBFSParam))`
`58`	`58`	`{`
`59`		`- Instance.StartInfo.Arguments = String.Format("-s {0} -p {1} -b 0.0.0.0 -l 2801 -m {2} -k \"{3}\" -u --plugin {4} --plugin-opts \"{5}\"", server.Address, server.Port, server.EncryptMethod, server.Password, server.Plugin, server.PluginOptions);`
	`59`	`+ Instance.StartInfo.Arguments = String.Format("-s {0} -p {1} -b 0.0.0.0 -l 2801 -m {2} -k \"{3}\" -u --plugin {4} --plugin-opts \"{5}\"", server.Address, server.Port, server.EncryptMethod, server.Password, server.OBFS, server.OBFSParam);`
`60`	`60`	`}`
`61`	`61`	`else`
`62`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ public static string URLSafeBase64Decode(string text)`
`120`	`120`
`121`	`121`	`data.EncryptMethod = match.Groups["method"].Value;`
`122`	`122`	`data.Password = match.Groups["password"].Value;`
`123`		`- data.Plugin = plugins[0];`
`124`		`- data.PluginOptions = plugins[1];`
	`123`	`+ data.OBFS = plugins[0];`
	`124`	`+ data.OBFSParam = plugins[1];`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if (!Global.EncryptMethods.SS.Contains(data.EncryptMethod))`