host.ini replace host.cfg

Dataconfig增加host.ini文件;推荐使用host.ini作为系统配置文件.

SCADA/DataConfig/host.ini

@@ -0,0 +1,6 @@
+[HOST]
+SERVER=lochost
+
+[DATABASE]
+CONNSTRING=Data Source=.\SQLEXPRESS;Initial Catalog=SCADA;Integrated Security=True
+ARCHIVE=D:\HDA

SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.vshost.exe.manifest

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref

@@ -1,8 +0,0 @@
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.i.cs
-
-FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;;
-FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;;
-FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;;
-FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;;
-FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;;
-

SCADA/Program/DataHelper/DataHelper.cs

@@ -4,6 +4,8 @@ using System.Data.SqlClient;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
+using System.Runtime.InteropServices;
+using System.Text;
 
 namespace DatabaseLib
 {
@@ -29,8 +31,12 @@ namespace DatabaseLib
             get { return m_Path; }
         }
 
+        const string CFGPATH = @"C:\DataConfig\host.cfg";
+        const string INIPATH = @"C:\DataConfig\host.ini";
         const string DATALOGSOURCE = "Data Operations";
         const string DATALOGNAME = "Data Log";
+        const int STRINGMAX = 255;
+
         static EventLog Log;
 
         static DataHelper()
@@ -40,17 +46,30 @@ namespace DatabaseLib
             Log = new EventLog(DATALOGNAME);
             try
             {
-                using (StreamReader objReader = new StreamReader(@"C:\DataConfig\host.cfg"))
+                if (File.Exists(CFGPATH))
                 {
-                    m_host = objReader.ReadLine();
-                    m_ConnStr = objReader.ReadLine();
-                    m_Path = objReader.ReadLine();
-                    IPAddress addr;
-                    if (string.IsNullOrEmpty(m_host) || !IPAddress.TryParse(m_host, out addr))
+                    using (StreamReader objReader = new StreamReader(CFGPATH))
                     {
-                        m_host = Environment.MachineName;
+                        m_host = objReader.ReadLine();
+                        m_ConnStr = objReader.ReadLine();
+                        m_Path = objReader.ReadLine();
                     }
                 }
+                else if (File.Exists(INIPATH))
+                {
+                    StringBuilder sb = new StringBuilder(STRINGMAX);
+                    WinAPI.GetPrivateProfileString("HOST", "SERVER", m_host, sb, STRINGMAX, INIPATH);
+                    m_host = sb.ToString();
+                    WinAPI.GetPrivateProfileString("DATABASE", "CONNSTRING", m_ConnStr, sb, STRINGMAX, INIPATH);
+                    m_ConnStr = sb.ToString();
+                    WinAPI.GetPrivateProfileString("DATABASE", "ARCHIVE", m_Path, sb, STRINGMAX, INIPATH);
+                    m_Path = sb.ToString();
+                }
+                IPAddress addr;
+                if (string.IsNullOrEmpty(m_host) || !IPAddress.TryParse(m_host, out addr))
+                {
+                    m_host = Environment.MachineName;
+                }
             }
             catch (Exception e)
             {
@@ -729,4 +748,16 @@ namespace DatabaseLib
 
         #endregion ExecuteStoredProcedure
     }
+
+    public static class WinAPI
+    {
+
+        //参数说明：section：INI文件中的段落；key：INI文件中的关键字；val：INI文件中关键字的数值；filePath：INI文件的完整的路径和名称。
+        [DllImport("kernel32")]
+        public static extern long WritePrivateProfileString(string section, string key, string val, string filepath);
+
+        //参数说明：section：INI文件中的段落名称；key：INI文件中的关键字；def：无法读取时候时候的缺省数值；retVal：读取数值；size：数值的大小；filePath：INI文件的完整路径和名称。
+        [DllImport("kernel32")]
+        public static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retval, int size, string filePath);
+    }
 }

SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt

@@ -22,4 +22,3 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\D
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.pdb
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache

SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt

@@ -340,4 +340,3 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HM
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.GenerateResource.Cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache

SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt

@@ -443,3 +443,4 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csproj.GenerateResource.Cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.pdb
+C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csprojResolveAssemblyReference.cache

SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt

@@ -39,6 +39,5 @@ D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Debug\OPCLib.dll
 D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Debug\OPCLib.pdb
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Debug\OPCLib.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Debug\OPCLib.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.csprojResolveAssemblyReference.cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.pdb

SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt

@@ -39,6 +39,5 @@ D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Release\OPCLib.dll
 D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Release\OPCLib.pdb
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Release\OPCLib.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Release\OPCLib.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Release\OPCLib.csprojResolveAssemblyReference.cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Release\OPCLib.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Release\OPCLib.pdb