diff --git a/CnasSynchronusClient/InsturmentData/ExcelInstrumentData.cs b/CnasSynchronusClient/InsturmentData/ExcelInstrumentData.cs index cd58c56..7ab1243 100644 --- a/CnasSynchronusClient/InsturmentData/ExcelInstrumentData.cs +++ b/CnasSynchronusClient/InsturmentData/ExcelInstrumentData.cs @@ -63,7 +63,7 @@ namespace CnasSynchronusClient { StrPath = StrLocalPath, ExcelFileVersion = ExcelFormat.ExcelFileVersion, - autoSql = ExcelFormat.autoSql + autoSql = ExcelFormat.AutoSql }); } @@ -74,7 +74,7 @@ namespace CnasSynchronusClient { StrPath = StrLocalPath, ExcelFileVersion = ExcelFormat.ExcelFileVersion, - autoSql = ExcelFormat.autoSql + autoSql = ExcelFormat.AutoSql }, new ConditionParams { @@ -91,7 +91,7 @@ namespace CnasSynchronusClient { StrPath = StrLocalPath, ExcelFileVersion = ExcelFormat.ExcelFileVersion, - autoSql = ExcelFormat.autoSql + autoSql = ExcelFormat.AutoSql }, new ConditionParams { diff --git a/CnasSynchrousModel/CnasSynchrousModel.csproj b/CnasSynchrousModel/CnasSynchrousModel.csproj index f40671d..59ec7be 100644 --- a/CnasSynchrousModel/CnasSynchrousModel.csproj +++ b/CnasSynchrousModel/CnasSynchrousModel.csproj @@ -43,7 +43,6 @@ - diff --git a/CnasSynchrousModel/SourceConfigFile/AutoFileConfig.cs b/CnasSynchrousModel/SourceConfigFile/AutoFileConfig.cs deleted file mode 100644 index 8952fed..0000000 --- a/CnasSynchrousModel/SourceConfigFile/AutoFileConfig.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace CnasSynchrousModel -{ - [Serializable] - public class AutoFileConfig - { - public string NameFormat { get; set; } - } -} diff --git a/CnasSynchrousModel/SourceConfigFile/ExcelFormatConfig.cs b/CnasSynchrousModel/SourceConfigFile/ExcelFormatConfig.cs index 4503db4..b605fef 100644 --- a/CnasSynchrousModel/SourceConfigFile/ExcelFormatConfig.cs +++ b/CnasSynchrousModel/SourceConfigFile/ExcelFormatConfig.cs @@ -30,7 +30,7 @@ namespace CnasSynchrousModel /// /// 读取Excel自定义语句 /// - public ExcelAutoSql autoSql { get; set; } + public ExcelAutoSql AutoSql { get; set; } } public class ExcelAutoSql diff --git a/CnasSynchrousModel/SourceConfigFile/SystemFormatConfig.cs b/CnasSynchrousModel/SourceConfigFile/SystemFormatConfig.cs index 6f960a4..d2ff284 100644 --- a/CnasSynchrousModel/SourceConfigFile/SystemFormatConfig.cs +++ b/CnasSynchrousModel/SourceConfigFile/SystemFormatConfig.cs @@ -13,12 +13,6 @@ namespace CnasSynchrousModel /// public string ShowDelayDays { get; set; } - /// - /// 启动服务后,执行同步时,若原目标数据库中不存在该仪器的数据,则获取该时间之后的数据;比如设置为2019-01-01,则只获取该时间以后的数据进行传输,之前的数据不会获取; - /// 若原目标数据库中已经存在该仪器的数据,则以其它规则获取数据,不以该时间为依据 - /// - public string IntitalStartTime { get; set; } - /// /// 获取表信息的方式,1表示手动输入表信息,0表示自动获取表信息。 /// diff --git a/dll/CnasSynchronusClient.dll b/dll/CnasSynchronusClient.dll index b066aba..07f32de 100644 Binary files a/dll/CnasSynchronusClient.dll and b/dll/CnasSynchronusClient.dll differ diff --git a/dll/CnasSynchrousModel.dll b/dll/CnasSynchrousModel.dll index 01a318c..03e8bc1 100644 Binary files a/dll/CnasSynchrousModel.dll and b/dll/CnasSynchrousModel.dll differ diff --git a/dll/DataConfig/AccessFormatConfig.xml b/dll/DataConfig/AccessFormatConfig.xml new file mode 100644 index 0000000..d5beabd --- /dev/null +++ b/dll/DataConfig/AccessFormatConfig.xml @@ -0,0 +1,9 @@ + + + 0 + + + + + + \ No newline at end of file diff --git a/dll/DataConfig/AutoFileConfig.xml b/dll/DataConfig/AutoFileConfig.xml deleted file mode 100644 index 82ba26b..0000000 --- a/dll/DataConfig/AutoFileConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - yyyyMMdd - - \ No newline at end of file diff --git a/dll/DataConfig/AutoInstrumentDSViewConfig.xml b/dll/DataConfig/AutoInstrumentDSViewConfig.xml deleted file mode 100644 index 6ff587b..0000000 --- a/dll/DataConfig/AutoInstrumentDSViewConfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - FOXPRO - - T_TCNASVIEW - - select xuhao,chehao,sudu,Maozhs,Pizhs,Jingzhs,Lusun,Yingkui,concat(Nian,Yue,Ri,Shi,Fen) from - \ No newline at end of file diff --git a/dll/DataConfig/ExcelFormatConfig.xml b/dll/DataConfig/ExcelFormatConfig.xml new file mode 100644 index 0000000..8261ba7 --- /dev/null +++ b/dll/DataConfig/ExcelFormatConfig.xml @@ -0,0 +1,11 @@ + + + 0 + + + + + + + + \ No newline at end of file diff --git a/dll/DataConfig/MySqlFormatConfig.xml b/dll/DataConfig/MySqlFormatConfig.xml new file mode 100644 index 0000000..8377f20 --- /dev/null +++ b/dll/DataConfig/MySqlFormatConfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/dll/DataConfig/NormalFileFormatConfig.xml b/dll/DataConfig/NormalFileFormatConfig.xml new file mode 100644 index 0000000..41c1534 --- /dev/null +++ b/dll/DataConfig/NormalFileFormatConfig.xml @@ -0,0 +1,8 @@ + + + txt + yyyyMMdd + yyyyMMdd + 1 + 1 + \ No newline at end of file diff --git a/dll/DataConfig/OracleFormatConfig.xml b/dll/DataConfig/OracleFormatConfig.xml new file mode 100644 index 0000000..057ce63 --- /dev/null +++ b/dll/DataConfig/OracleFormatConfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/dll/DataConfig/SqlServerFormatConfig.xml b/dll/DataConfig/SqlServerFormatConfig.xml new file mode 100644 index 0000000..ee753c1 --- /dev/null +++ b/dll/DataConfig/SqlServerFormatConfig.xml @@ -0,0 +1,12 @@ + + + yyyyMMddHHmm + + + + + + + + + \ No newline at end of file diff --git a/dll/DataConfig/SqliteFormatConfig.xml b/dll/DataConfig/SqliteFormatConfig.xml new file mode 100644 index 0000000..9e73631 --- /dev/null +++ b/dll/DataConfig/SqliteFormatConfig.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dll/DataConfig/SystemFormatConfig.xml b/dll/DataConfig/SystemFormatConfig.xml index dfac98b..1ff6860 100644 --- a/dll/DataConfig/SystemFormatConfig.xml +++ b/dll/DataConfig/SystemFormatConfig.xml @@ -2,25 +2,6 @@ -40 - - 0 - 0 0 - - 1 - - 1 - - .txt - - 1 - - 0 - - yyyyMMddHHmm - - yyyyMMdd - - \ No newline at end of file diff --git a/dll/ErrorLog/20191204.txt b/dll/ErrorLog/20191204.txt new file mode 100644 index 0000000..42eccd3 --- /dev/null +++ b/dll/ErrorLog/20191204.txt @@ -0,0 +1,6 @@ +¼ʱ䣺2019-12-04 17:35:34,661 ߳ID:[1]- :FileHelper :GetLocalFile Ϣ:ûҵSyncOperationPwd.mes +¼ʱ䣺2019-12-04 17:35:34,786 ߳ID:[1]- :EncryptionOperation :Decrypt Ϣ:ȷݡ + +¼ʱ䣺2019-12-04 17:35:38,133 ߳ID:[1]- :FileHelper :GetLocalFile Ϣ:ûҵSyncOperationPwd.mes +¼ʱ䣺2019-12-04 17:35:38,158 ߳ID:[1]- :EncryptionOperation :Decrypt Ϣ:ȷݡ +