diff --git a/Reseter2/Form1.cs b/Reseter2/Form1.cs index 28fc653..bc11afa 100644 --- a/Reseter2/Form1.cs +++ b/Reseter2/Form1.cs @@ -51,7 +51,6 @@ namespace Reseter2 //ListComp.SetSelected(1,true); this.SetStyle(ControlStyles.OptimizedDoubleBuffer, true); InitializeComponent(); - AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); this.Save += settingWordsControl1.Save; this.Save += settingSCCMControl1.Save; this.Save += settingRebootControl1.Save; @@ -91,15 +90,6 @@ namespace Reseter2 tabControl1.SelectedIndex = 1; } - Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) - { - if (args.Name.Contains("MySql.Data.dll")) - { - return Assembly.Load(Reseter2.Properties.Resources.MySql_Data); - } - return null; - } - public void UpdateTree() { treeView1.Nodes.Clear(); diff --git a/Reseter2/Properties/Resources.Designer.cs b/Reseter2/Properties/Resources.Designer.cs index 986a540..86aa7d7 100644 --- a/Reseter2/Properties/Resources.Designer.cs +++ b/Reseter2/Properties/Resources.Designer.cs @@ -59,15 +59,5 @@ namespace Reseter2.Properties { resourceCulture = value; } } - - /// - /// Поиск локализованного ресурса типа System.Byte[]. - /// - internal static byte[] MySql_Data { - get { - object obj = ResourceManager.GetObject("MySql_Data", resourceCulture); - return ((byte[])(obj)); - } - } } } diff --git a/Reseter2/Properties/Resources.resx b/Reseter2/Properties/Resources.resx index c43ed49..1af7de1 100644 --- a/Reseter2/Properties/Resources.resx +++ b/Reseter2/Properties/Resources.resx @@ -117,8 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MySql.Data.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file diff --git a/Reseter2/Reseter2.csproj b/Reseter2/Reseter2.csproj index bc6f37c..76022d7 100644 --- a/Reseter2/Reseter2.csproj +++ b/Reseter2/Reseter2.csproj @@ -54,10 +54,6 @@ reseter.ico - - False - Properties\MySql.Data.dll - diff --git a/Reseter2/Seacher/ISeaherMetod.cs b/Reseter2/Seacher/ISeaherMetod.cs index 2f0e48d..783d7ae 100644 --- a/Reseter2/Seacher/ISeaherMetod.cs +++ b/Reseter2/Seacher/ISeaherMetod.cs @@ -12,8 +12,6 @@ namespace Reseter2.Seacher public void Change(ResultUpdate sender, string seach); public IComp Result(int index); public string ResultString(int index); - public void Activate(); - public void Deactivate(); } } diff --git a/Reseter2/Seacher/SeachSCCM.cs b/Reseter2/Seacher/SeachSCCM.cs index 4eb1eb4..b45dfc3 100644 --- a/Reseter2/Seacher/SeachSCCM.cs +++ b/Reseter2/Seacher/SeachSCCM.cs @@ -1,6 +1,4 @@ -using MySql.Data.MySqlClient; -using MySqlX.XDevAPI.Common; -using MySqlX.XDevAPI.Relational; +using System.Data.SqlClient; using Reseter2.SCCMsearch; using Reseter2.Setting; using System; @@ -11,22 +9,23 @@ using System.Reflection; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Windows.Forms; using System.Xml.Linq; using static Reseter2.Seacher.SeahcLocal; using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; +using System.Threading; namespace Reseter2.Seacher { internal class SeachSCCM : ISeaherMetod { - private MySql.Data.MySqlClient.MySqlConnection Connection; + private SqlConnection Connection; private IAuthType AuthType; private List comps = new List(); private ResultUpdate Update; private bool enable; private string error; private Mode mode; + private Timer TimerDisconnect; private enum Mode{ PCname, @@ -123,10 +122,10 @@ namespace Reseter2.Seacher try { string sql = QueryBilder(seach); - MySqlCommand sqlCom = new MySqlCommand(sql, Connection); + SqlCommand sqlCom = new SqlCommand(sql, Connection); // Connection.Open(); sqlCom.ExecuteNonQuery(); - MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCom); + SqlDataAdapter dataAdapter = new SqlDataAdapter(sqlCom); DataTable dt = new DataTable(); dataAdapter.Fill(dt); @@ -156,8 +155,8 @@ namespace Reseter2.Seacher enable = false; result.Add("Ничего не найдено"); } - - return result; + TimerDisconnect.Change(30000, 30000); + return result; } public void Activate() { @@ -166,10 +165,12 @@ namespace Reseter2.Seacher string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString() + ";charset=utf8"; try { - Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect); + Connection = new SqlConnection(stringConnect); Connection.Open(); Console.WriteLine("Подключились"); error = "Подключенно"; + TimerCallback TimerDelegate = new TimerCallback(Deactivate); + TimerDisconnect = new Timer(TimerDelegate, null, 30000,30000); } catch { @@ -180,10 +181,14 @@ namespace Reseter2.Seacher } - public void Deactivate() + public void Deactivate(object obj) { Connection.Close(); Connection = null; + TimerDisconnect.Dispose(); + List result = new List(); + result.Add("Введите запрос"); + Update(result, false, 14); } public IComp Result(int index) @@ -210,7 +215,7 @@ namespace Reseter2.Seacher string stringConnect = "server=" + server + ";database=" + basa + ";" + AuthType.AuthString(); try { - Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect); + Connection = new SqlConnection(stringConnect); Connection.Open(); error = "Подключенно"; } @@ -224,9 +229,9 @@ namespace Reseter2.Seacher try { string sql = "SELECT * FROM dbo._RES_COLL_SMS00001 LIMIT 1"; - MySqlCommand sqlCom = new MySqlCommand(sql, Connection); + SqlCommand sqlCom = new SqlCommand(sql, Connection); sqlCom.ExecuteNonQuery(); - MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCom); + SqlDataAdapter dataAdapter = new SqlDataAdapter(sqlCom); DataTable dt = new DataTable(); dataAdapter.Fill(dt); diff --git a/Reseter2/Seacher/SeahcLocal.cs b/Reseter2/Seacher/SeahcLocal.cs index 019d9be..c6c62f5 100644 --- a/Reseter2/Seacher/SeahcLocal.cs +++ b/Reseter2/Seacher/SeahcLocal.cs @@ -82,7 +82,5 @@ namespace Reseter2.Seacher } return buf; } - public void Activate() { } - public void Deactivate() { } } }