Переделали коннектор подключения к базе добавили диспоз
This commit is contained in:
parent
ab3a9dda50
commit
be69295017
|
|
@ -51,7 +51,6 @@ namespace Reseter2
|
||||||
//ListComp.SetSelected(1,true);
|
//ListComp.SetSelected(1,true);
|
||||||
this.SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
|
this.SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
|
||||||
this.Save += settingWordsControl1.Save;
|
this.Save += settingWordsControl1.Save;
|
||||||
this.Save += settingSCCMControl1.Save;
|
this.Save += settingSCCMControl1.Save;
|
||||||
this.Save += settingRebootControl1.Save;
|
this.Save += settingRebootControl1.Save;
|
||||||
|
|
@ -91,15 +90,6 @@ namespace Reseter2
|
||||||
tabControl1.SelectedIndex = 1;
|
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()
|
public void UpdateTree()
|
||||||
{
|
{
|
||||||
treeView1.Nodes.Clear();
|
treeView1.Nodes.Clear();
|
||||||
|
|
|
||||||
|
|
@ -59,15 +59,5 @@ namespace Reseter2.Properties {
|
||||||
resourceCulture = value;
|
resourceCulture = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Поиск локализованного ресурса типа System.Byte[].
|
|
||||||
/// </summary>
|
|
||||||
internal static byte[] MySql_Data {
|
|
||||||
get {
|
|
||||||
object obj = ResourceManager.GetObject("MySql_Data", resourceCulture);
|
|
||||||
return ((byte[])(obj));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -117,8 +117,4 @@
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
|
||||||
<data name="MySql_Data" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>MySql.Data.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
</root>
|
</root>
|
||||||
|
|
@ -54,10 +54,6 @@
|
||||||
<ApplicationIcon>reseter.ico</ApplicationIcon>
|
<ApplicationIcon>reseter.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="MySql.Data, Version=9.0.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
|
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
<HintPath>Properties\MySql.Data.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.DirectoryServices" />
|
<Reference Include="System.DirectoryServices" />
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,6 @@ namespace Reseter2.Seacher
|
||||||
public void Change(ResultUpdate sender, string seach);
|
public void Change(ResultUpdate sender, string seach);
|
||||||
public IComp Result(int index);
|
public IComp Result(int index);
|
||||||
public string ResultString(int index);
|
public string ResultString(int index);
|
||||||
public void Activate();
|
|
||||||
public void Deactivate();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
using MySql.Data.MySqlClient;
|
using System.Data.SqlClient;
|
||||||
using MySqlX.XDevAPI.Common;
|
|
||||||
using MySqlX.XDevAPI.Relational;
|
|
||||||
using Reseter2.SCCMsearch;
|
using Reseter2.SCCMsearch;
|
||||||
using Reseter2.Setting;
|
using Reseter2.Setting;
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -11,22 +9,23 @@ using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Forms;
|
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
using static Reseter2.Seacher.SeahcLocal;
|
using static Reseter2.Seacher.SeahcLocal;
|
||||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
namespace Reseter2.Seacher
|
namespace Reseter2.Seacher
|
||||||
{
|
{
|
||||||
internal class SeachSCCM : ISeaherMetod
|
internal class SeachSCCM : ISeaherMetod
|
||||||
{
|
{
|
||||||
private MySql.Data.MySqlClient.MySqlConnection Connection;
|
private SqlConnection Connection;
|
||||||
private IAuthType AuthType;
|
private IAuthType AuthType;
|
||||||
private List<IComp> comps = new List<IComp>();
|
private List<IComp> comps = new List<IComp>();
|
||||||
private ResultUpdate Update;
|
private ResultUpdate Update;
|
||||||
private bool enable;
|
private bool enable;
|
||||||
private string error;
|
private string error;
|
||||||
private Mode mode;
|
private Mode mode;
|
||||||
|
private Timer TimerDisconnect;
|
||||||
|
|
||||||
private enum Mode{
|
private enum Mode{
|
||||||
PCname,
|
PCname,
|
||||||
|
|
@ -123,10 +122,10 @@ namespace Reseter2.Seacher
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string sql = QueryBilder(seach);
|
string sql = QueryBilder(seach);
|
||||||
MySqlCommand sqlCom = new MySqlCommand(sql, Connection);
|
SqlCommand sqlCom = new SqlCommand(sql, Connection);
|
||||||
// Connection.Open();
|
// Connection.Open();
|
||||||
sqlCom.ExecuteNonQuery();
|
sqlCom.ExecuteNonQuery();
|
||||||
MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCom);
|
SqlDataAdapter dataAdapter = new SqlDataAdapter(sqlCom);
|
||||||
DataTable dt = new DataTable();
|
DataTable dt = new DataTable();
|
||||||
dataAdapter.Fill(dt);
|
dataAdapter.Fill(dt);
|
||||||
|
|
||||||
|
|
@ -156,8 +155,8 @@ namespace Reseter2.Seacher
|
||||||
enable = false;
|
enable = false;
|
||||||
result.Add("Ничего не найдено");
|
result.Add("Ничего не найдено");
|
||||||
}
|
}
|
||||||
|
TimerDisconnect.Change(30000, 30000);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
public void Activate()
|
public void Activate()
|
||||||
{
|
{
|
||||||
|
|
@ -166,10 +165,12 @@ namespace Reseter2.Seacher
|
||||||
string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString() + ";charset=utf8";
|
string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString() + ";charset=utf8";
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect);
|
Connection = new SqlConnection(stringConnect);
|
||||||
Connection.Open();
|
Connection.Open();
|
||||||
Console.WriteLine("Подключились");
|
Console.WriteLine("Подключились");
|
||||||
error = "Подключенно";
|
error = "Подключенно";
|
||||||
|
TimerCallback TimerDelegate = new TimerCallback(Deactivate);
|
||||||
|
TimerDisconnect = new Timer(TimerDelegate, null, 30000,30000);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|
@ -180,10 +181,14 @@ namespace Reseter2.Seacher
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Deactivate()
|
public void Deactivate(object obj)
|
||||||
{
|
{
|
||||||
Connection.Close();
|
Connection.Close();
|
||||||
Connection = null;
|
Connection = null;
|
||||||
|
TimerDisconnect.Dispose();
|
||||||
|
List<string> result = new List<string>();
|
||||||
|
result.Add("Введите запрос");
|
||||||
|
Update(result, false, 14);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IComp Result(int index)
|
public IComp Result(int index)
|
||||||
|
|
@ -210,7 +215,7 @@ namespace Reseter2.Seacher
|
||||||
string stringConnect = "server=" + server + ";database=" + basa + ";" + AuthType.AuthString();
|
string stringConnect = "server=" + server + ";database=" + basa + ";" + AuthType.AuthString();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect);
|
Connection = new SqlConnection(stringConnect);
|
||||||
Connection.Open();
|
Connection.Open();
|
||||||
error = "Подключенно";
|
error = "Подключенно";
|
||||||
}
|
}
|
||||||
|
|
@ -224,9 +229,9 @@ namespace Reseter2.Seacher
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string sql = "SELECT * FROM dbo._RES_COLL_SMS00001 LIMIT 1";
|
string sql = "SELECT * FROM dbo._RES_COLL_SMS00001 LIMIT 1";
|
||||||
MySqlCommand sqlCom = new MySqlCommand(sql, Connection);
|
SqlCommand sqlCom = new SqlCommand(sql, Connection);
|
||||||
sqlCom.ExecuteNonQuery();
|
sqlCom.ExecuteNonQuery();
|
||||||
MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCom);
|
SqlDataAdapter dataAdapter = new SqlDataAdapter(sqlCom);
|
||||||
DataTable dt = new DataTable();
|
DataTable dt = new DataTable();
|
||||||
dataAdapter.Fill(dt);
|
dataAdapter.Fill(dt);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,5 @@ namespace Reseter2.Seacher
|
||||||
}
|
}
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
public void Activate() { }
|
|
||||||
public void Deactivate() { }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue