diff --git a/Login.xaml b/Login.xaml
index cc8c6e3..745ae05 100644
--- a/Login.xaml
+++ b/Login.xaml
@@ -16,9 +16,9 @@
-
-
-
+
+
+
diff --git a/Login.xaml.cs b/Login.xaml.cs
index 8e16bf1..e76dcc1 100644
--- a/Login.xaml.cs
+++ b/Login.xaml.cs
@@ -61,24 +61,23 @@ namespace formula_manage
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
-
string TEXT_SQLIP;
string TEXT_SQLNAME;
string TEXT_SQMOD;
string TEXT_SQLUSER;
string TEXT_SQLPASWOR;
string Connstr_SC;
- int i;
private void Window_Loaded(object sender, RoutedEventArgs e)
{
+ logon.IsEnabled = false; //关闭登录按钮
+
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
- int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL3"), out i); //读数据库状态配置文件
- if (i == 0)
+ if (TEXT_SQMOD == "0") //判断连接方式
{
Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
}
@@ -86,10 +85,13 @@ namespace formula_manage
{
Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
}
- SqlConnection conn_DBC = new SqlConnection(Connstr_SC);
- conn_DBC.Open();
- conn_DBC.Close();
+ SqlConnection conn_SC = new SqlConnection(Connstr_SC);
+ conn_SC.Open();
+ // conn_SC.OpenAsync();
+ conn_SC.Close();
+
+ logon.IsEnabled = true; //允许登录按钮
UserClass.PressKey.PressKeys(Keys.Tab, false);
UserClass.PressKey.PressKeys(Keys.Tab, true);
}