Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Windows/Sql.xaml.cs

@@ -143,10 +143,35 @@ namespace formula_manage.Windows
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
-            string ConnstrWindows = "server=DESKTOP-MR6U33G\\SQLEXPRESS;database=BatchDyeingCentral;Trusted_Connection=SSPI";
+            string ConnstrWindows;
+            if (TEXT_SQMOD.Text == "Windows 身份认证")
+            {
+                ConnstrWindows = "server=" + TEXT_SQLIP.Text + ";database=" + TEXT_SQLNAME.Text + ";Trusted_Connection=SSPI";
+
+            }
+            else
+            {
+                ConnstrWindows = "server=" + TEXT_SQLIP.Text + ";database=" + TEXT_SQLNAME.Text + ";User ID=" + TEXT_SQLUSER.Text + ";Password=" + TEXT_SQLPASWORD.Text;
+            }
+            //  ConnstrWindows = "server=.\\SQLEXPRESS;database=BatchDyeingCentral;Trusted_Connection=SSPI";
+
+            if (TEXT_SQLINK.IsChecked.GetValueOrDefault())
+            {
+                if (TEXT_SQMOD2.Text == "Windows 身份认证")
+                {
+                    ConnstrWindows = "server=" + TEXT_SQLIP2.Text + ";database=" + TEXT_SQLNAME2.Text + ";Trusted_Connection=SSPI";
+
+                }
+                else
+                {
+                    ConnstrWindows = "server=" + TEXT_SQLIP2.Text + ";database=" + TEXT_SQLNAME2.Text + ";User ID=" + TEXT_SQLUSER2.Text + ";Password=" + TEXT_SQLPASWORD2.Text;
+                }
+            }
+
             SqlConnection conn = new SqlConnection(ConnstrWindows);
             conn.Open();
-            System.Windows.MessageBox.Show("完成");
+            conn.Close();
+            System.Windows.MessageBox.Show("数据库连接成功");
         }
 
         private void TEXT_SQLINK_Checked(object sender, RoutedEventArgs e)