Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Windows/SQL_BAK.xaml.cs

@@ -32,12 +32,24 @@ namespace formula_manage.Windows
         bool SQLBAK;
         bool SQLTIME;
         int Time;
+        string SQLIP;
+        string SQLNAME;
+        bool SQLMOD;
+        string SQLUSER;
+        string SQLPASS;
 
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
         private void Window_SQLBAK(object sender, RoutedEventArgs e)  //打开页面
         {
-            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //读配置文件
+
+            SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
+            SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
+            SQLMOD = Boolean.Parse( Configini.IniReadvalue("SQL_SERVER", "SQL3"));
+            SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
+            SQLPASS = Configini.IniReadvalue("SQL_SERVER", "SQL5");
+
             SQLBAK = Boolean.Parse(Configini.IniReadvalue("SQL_BAK", "S1"));
             SQL_DISPEN_bak.Text = Configini.IniReadvalue("SQL_BAK", "S2");
             SQLTIME = Boolean.Parse(Configini.IniReadvalue("SQL_BAK", "S3"));
@@ -95,8 +107,21 @@ namespace formula_manage.Windows
             Configini.IniWritevalue("SQL_BAK", "S4", Time.ToString());   //保存自动备份周期
         }
 
+        string Connstr_SC;
+
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
+            if (SQLMOD)    //连接数据库测试
+            {
+                Connstr_SC = "server=" + SQLIP + ";database=" + SQLNAME + ";Trusted_Connection=SSPI";
+
+            }
+            else
+            {
+                Connstr_SC = "server=" + SQLIP + ";database=" + SQLNAME + ";User ID=" + SQLUSER + ";Password=" + SQLPASS;
+            }
+
+
 
         }