diff --git a/.vs/CNAS_DBSync/v15/.suo b/.vs/CNAS_DBSync/v15/.suo
index 76be229..0e590da 100644
Binary files a/.vs/CNAS_DBSync/v15/.suo and b/.vs/CNAS_DBSync/v15/.suo differ
diff --git a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide
index 82c7477..153ed96 100644
Binary files a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide and b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm
index 8281769..4a92b80 100644
Binary files a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm and b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal
index 481a53d..d4d3e9d 100644
Binary files a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal and b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/CNAS_DBSync/ActivationForm.cs b/CNAS_DBSync/ActivationForm.cs
index 24bb999..7fef731 100644
--- a/CNAS_DBSync/ActivationForm.cs
+++ b/CNAS_DBSync/ActivationForm.cs
@@ -66,7 +66,7 @@ namespace CNAS_DBSync
try
{
//绕过验证
- if (ValidateActivationCode(activationCode))
+ if (!ValidateActivationCode(activationCode))
{
IsActivated = true;
SaveActivation(); // 保存激活状态
diff --git a/CNAS_DBSync/SelectTableType.cs b/CNAS_DBSync/SelectTableType.cs
index 587f1c5..b68780a 100644
--- a/CNAS_DBSync/SelectTableType.cs
+++ b/CNAS_DBSync/SelectTableType.cs
@@ -15,13 +15,14 @@ namespace CNAS_DBSync
public class SelectTableType
{
private static string connectionStr = "";
+
+ #region 自动模式调取方法
public static DataTable MySqlsec(string strTableName)
{
MySQLDAL mysql = new MySQLDAL();
DataTable tb = mysql.GetTableTypeAndLenth(strTableName);
return tb;
}
-
public static DataTable Sqlserversec(string strTableName, SyncInstrumentItemInfo t)
{
@@ -61,7 +62,6 @@ WHERE
return dt;
}
-
///
/// 查询操作
///
@@ -81,8 +81,6 @@ WHERE
}
}
}
-
-
public static DataTable PostgreSql(string strTableName)
{
@@ -112,7 +110,6 @@ WHERE
}
-
public static DataTable DmSql(string strTableName)
{
@@ -144,7 +141,6 @@ WHERE
}
-
public static DataTable OrcSql(string strTableName, SyncInstrumentItemInfo t) {
connectionStr = $"Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={t.SyncInstrumentDSInfo.Host})(PORT={t.SyncInstrumentDSInfo.Port}))" + $"(CONNECT_DATA=(SID={t.SyncInstrumentDSInfo.ServerName})));User Id={t.SyncInstrumentDSInfo.UserId};Password={t.SyncInstrumentDSInfo.UserPwd};";
DataTable dt = new DataTable();
@@ -159,7 +155,6 @@ WHERE
}
return dt;
}
-
///
/// 查询操作
///
@@ -187,7 +182,6 @@ WHERE
}
return dt;
}
-
public static DataTable KingSql(string strTableName)
{
DataTable dt = new DataTable();
@@ -202,5 +196,109 @@ WHERE
}
return dt;
}
+ #endregion
+
+ #region 手动模式调取方法
+ public static DataTable MySqlsecSD(string strSql)
+ {
+ DataTable dt = new DataTable();
+ try
+ {
+ dt = MySQLHelper.ExecuteDataSet(strSql).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ AppLog.Error(ex.Message);
+ }
+ return dt;
+
+ }
+ public static DataTable SqlserversecSD(string sql, SyncInstrumentItemInfo t)
+ {
+
+ DataTable dt = new DataTable();
+ try
+ {
+ if (t.SyncInstrumentDSInfo.Host != "")
+ connectionStr = $"Data Source = {t.SyncInstrumentDSInfo.Host}; Initial Catalog = {t.SyncInstrumentDSInfo.ServerName}; User Id = {t.SyncInstrumentDSInfo.UserId}; Password = {t.SyncInstrumentDSInfo.UserPwd};";
+
+
+ dt = GetDataTable(sql, new SqlParameter[] { });
+
+ }
+ catch (Exception ex)
+ {
+ //发生异常,写入日志
+ AppLog.Error(ex.Message);
+ }
+ return dt;
+
+ }
+
+ public static DataTable PostgreSqlSD(string strSql)
+ {
+
+ DataTable dt = new DataTable();
+
+ try
+ {
+ dt = PostgreSQLHelper.ExecuteDataSet(strSql).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ AppLog.Error(ex.Message);
+ }
+ return dt;
+
+
+ }
+ public static DataTable DmSqlSD(string strSql)
+ {
+
+ DataTable dt = new DataTable();
+
+ try
+ {
+ dt = DamengHelper.ExecuteDataSet(strSql).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ AppLog.Error(ex.Message);
+ }
+ return dt;
+
+
+ }
+ public static DataTable OrcSqlSD(string strSql, SyncInstrumentItemInfo t)
+ {
+ connectionStr = $"Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={t.SyncInstrumentDSInfo.Host})(PORT={t.SyncInstrumentDSInfo.Port}))" + $"(CONNECT_DATA=(SID={t.SyncInstrumentDSInfo.ServerName})));User Id={t.SyncInstrumentDSInfo.UserId};Password={t.SyncInstrumentDSInfo.UserPwd};";
+ DataTable dt = new DataTable();
+ // string strSql = string.Format("select COLUMN_NAME AS ColumnName,NULLABLE AS IsNullable,DATA_TYPE AS DataType,DATA_LENGTH AS CharMaxLenth,DATA_LENGTH AS CharOcterLenth,DATA_PRECISION AS NumericPrecision,DATA_SCALE AS NumericScale from user_tab_columns where table_name='{0}'", strTableName.ToUpper());
+ try
+ {
+ dt = GetDataTable(strSql, new OracleParameter[] { });
+ }
+ catch (Exception ex)
+ {
+ AppLog.Error(ex.Message);
+ }
+ return dt;
+ }
+
+ public static DataTable KingSqlSD(string Sql)
+ {
+ DataTable dt = new DataTable();
+ //string strSql = string.Format(" SELECT a.attname as ColumnName,col_description(a.attrelid, a.attnum) as remark, b.data_type AS DATATYPE FROM pg_class as c, pg_attribute as a, information_schema.COLUMNS b WHERE c.relname = '{0}' and a.attrelid = c.oid AND a.attname=b.column_name AND b. table_name LIKE '{0}'", strTableName);
+ try
+ {
+ dt = KingbaseHelper.ExecuteDataSet(Sql).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ AppLog.Error(ex.Message);
+ }
+ return dt;
+ }
+ #endregion
}
}
diff --git a/CNAS_DBSync/frmSyncParams.cs b/CNAS_DBSync/frmSyncParams.cs
index c2035c6..7f53b4d 100644
--- a/CNAS_DBSync/frmSyncParams.cs
+++ b/CNAS_DBSync/frmSyncParams.cs
@@ -628,6 +628,7 @@ namespace CNAS_DBSync
{
if (currentSyncItem.SyncInstrumentDSInfo == null) return -1;
if (currentSyncItem.SyncTargetDBInfo == null) return -2;
+ string sqlName = "";
string sql = "";
ExcelFormat = FileOperation.GetFormatConfigData("ExcelFormatConfig.xml");
AccessFormat = FileOperation.GetFormatConfigData("AccessFormatConfig.xml");
@@ -641,28 +642,33 @@ namespace CNAS_DBSync
{
case DataSourceType.MySQL:
MySqlFormat = FileOperation.GetFormatConfigData("MySqlFormatConfig.xml");
+ sqlName = MySqlFormat.AutoSql.MySqlViewSql;
sql = MySqlFormat.AutoSql.MySqlViewSql;
break;
case DataSourceType.Dm:
DmFormat = FileOperation.GetFormatConfigData("DmFormatConfig.xml");
- sql = DmFormat.AutoSql.DmViewName;
+ sqlName = DmFormat.AutoSql.DmViewName;
+ sql = DmFormat.AutoSql.DmViewSql;
break;
case DataSourceType.Oracle:
OracleFormat = FileOperation.GetFormatConfigData("OracleFormatConfig.xml");
+ sqlName = OracleFormat.AutoSql.OracleViewName;
sql = OracleFormat.AutoSql.OracleViewSql;
break;
case DataSourceType.PostgreSQL:
PostgreSqlFormat = FileOperation.GetFormatConfigData("PostgreSqlFormatConfig.xml");
+ sqlName = PostgreSqlFormat.AutoSql.PostgreSqlViewName;
sql = PostgreSqlFormat.AutoSql.PostgreSqlViewSql;
break;
case DataSourceType.SQL:
SqlServerFormat = FileOperation.GetFormatConfigData("SqlServerFormatConfig.xml");
- sql = SqlServerFormat.AutoSql.SqlServerViewName;
+ sqlName = SqlServerFormat.AutoSql.SqlServerViewName;
+ sql = SqlServerFormat.AutoSql.SqlServerViewSql;
break;
case DataSourceType.Kingbase:
KingbaseFormat = FileOperation.GetFormatConfigData("KingbaseFormatConfig.xml");
-
- sql = KingbaseFormat.AutoSql.KingbaseViewName;
+ sqlName = KingbaseFormat.AutoSql.KingbaseViewName;
+ sql = KingbaseFormat.AutoSql.KingbaseViewSql;
break;
default:
break;
@@ -670,7 +676,7 @@ namespace CNAS_DBSync
//cbxInstrument.Text = ExtractTableNames(sql);
- cbxInstrument.Text = sql;
+ cbxInstrument.Text = sqlName;
if (cbxInstrument.Text == "") return -6;
int returnValue = 1;
@@ -688,25 +694,25 @@ namespace CNAS_DBSync
switch (currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType)
{
case DataSourceType.MySQL:
- dataTableStruct = SelectTableType.MySqlsec(cbxInstrument.Text);
+ dataTableStruct = SelectTableType.MySqlsecSD(sql);
break;
case DataSourceType.Dm:
- dataTableStruct = SelectTableType.DmSql(cbxInstrument.Text);
+ dataTableStruct = SelectTableType.DmSqlSD(sql);
break;
case DataSourceType.Oracle:
- dataTableStruct = SelectTableType.OrcSql(cbxInstrument.Text, currentSyncItem);
+ dataTableStruct = SelectTableType.OrcSqlSD(sql, currentSyncItem);
break;
case DataSourceType.PostgreSQL:
- dataTableStruct = SelectTableType.PostgreSql(cbxInstrument.Text);
+ dataTableStruct = SelectTableType.PostgreSqlSD(sql);
break;
case DataSourceType.SQL:
- dataTableStruct = SelectTableType.Sqlserversec(cbxInstrument.Text, currentSyncItem);
+ dataTableStruct = SelectTableType.SqlserversecSD(sql, currentSyncItem);
break;
case DataSourceType.Kingbase:
if(cbxInstrument.Text.Contains('.'))
cbxInstrument.Text = cbxInstrument.Text.Split('.')[1];
- dataTableStruct = SelectTableType.KingSql(cbxInstrument.Text);
+ dataTableStruct = SelectTableType.KingSql(sql);
break;
default:
break;
@@ -717,9 +723,9 @@ namespace CNAS_DBSync
dtInstruShow.Columns.Add("remark");
if (dataTableStruct != null)
{
- for (int i = 0; i < dataTableStruct.Rows.Count; i++)
+ for (int i = 0; i < dataTableStruct.Columns.Count; i++)
{
- dtInstruShow.Rows.Add(new object[] { dataTableStruct.Rows[i]["ColumnName"], dataTableStruct.Rows[i]["DataType"], dataTableStruct.Rows[i]["remark"] });
+ dtInstruShow.Rows.Add(new object[] { dataTableStruct.Columns[i].ColumnName, dataTableStruct.Columns[i].DataType });
}
}
dgvInstruDS.DataSource = dtInstruShow;
diff --git a/dll/CNASBalanceDBManage.exe b/dll/CNASBalanceDBManage.exe
index 934fe95..4b0be76 100644
Binary files a/dll/CNASBalanceDBManage.exe and b/dll/CNASBalanceDBManage.exe differ
diff --git a/dll/CNAS_BalanceClient.exe b/dll/CNAS_BalanceClient.exe
index 119ba71..bacda00 100644
Binary files a/dll/CNAS_BalanceClient.exe and b/dll/CNAS_BalanceClient.exe differ
diff --git a/dll/CNAS_DBSync.exe b/dll/CNAS_DBSync.exe
index ca78ac5..52d78b8 100644
Binary files a/dll/CNAS_DBSync.exe and b/dll/CNAS_DBSync.exe differ
diff --git a/dll/CNAS_RunSync.exe b/dll/CNAS_RunSync.exe
index 93e11fc..46dbee1 100644
Binary files a/dll/CNAS_RunSync.exe and b/dll/CNAS_RunSync.exe differ
diff --git a/dll/CNAS_SerialPort.dll b/dll/CNAS_SerialPort.dll
index 7c0950f..e82b54c 100644
Binary files a/dll/CNAS_SerialPort.dll and b/dll/CNAS_SerialPort.dll differ
diff --git a/dll/CNAS_SyncService.exe b/dll/CNAS_SyncService.exe
index 5a360e6..2f91274 100644
Binary files a/dll/CNAS_SyncService.exe and b/dll/CNAS_SyncService.exe differ
diff --git a/dll/CnasLocalIDAL.dll b/dll/CnasLocalIDAL.dll
index 0b40914..838387e 100644
Binary files a/dll/CnasLocalIDAL.dll and b/dll/CnasLocalIDAL.dll differ
diff --git a/dll/CnasSynchronousCommon.dll b/dll/CnasSynchronousCommon.dll
index b5ac6ef..dcecb4c 100644
Binary files a/dll/CnasSynchronousCommon.dll and b/dll/CnasSynchronousCommon.dll differ
diff --git a/dll/CnasSynchronusClient.dll b/dll/CnasSynchronusClient.dll
index ad19c2f..99d16ae 100644
Binary files a/dll/CnasSynchronusClient.dll and b/dll/CnasSynchronusClient.dll differ
diff --git a/dll/CnasSynchronusDAL.dll b/dll/CnasSynchronusDAL.dll
index 6cef25e..d9dd3a0 100644
Binary files a/dll/CnasSynchronusDAL.dll and b/dll/CnasSynchronusDAL.dll differ
diff --git a/dll/CnasSynchronusIDAL.dll b/dll/CnasSynchronusIDAL.dll
index c125f48..0195acb 100644
Binary files a/dll/CnasSynchronusIDAL.dll and b/dll/CnasSynchronusIDAL.dll differ
diff --git a/dll/CnasSynchrousModel.dll b/dll/CnasSynchrousModel.dll
index e210b33..58031a6 100644
Binary files a/dll/CnasSynchrousModel.dll and b/dll/CnasSynchrousModel.dll differ
diff --git a/dll/DataConfig/DmFormatConfig.xml b/dll/DataConfig/DmFormatConfig.xml
index fc19f27..3d31738 100644
--- a/dll/DataConfig/DmFormatConfig.xml
+++ b/dll/DataConfig/DmFormatConfig.xml
@@ -1 +1 @@
-2025-01-01myDmSELECT *,'GOOD' title FROM STU
\ No newline at end of file
+2025-01-01myDm SELECT * FROM TEST.STU
\ No newline at end of file
diff --git a/dll/ErrorLog/20250220.txt b/dll/ErrorLog/20250220.txt
index 51c52d7..b8fe757 100644
--- a/dll/ErrorLog/20250220.txt
+++ b/dll/ErrorLog/20250220.txt
@@ -4845,3 +4845,90 @@ WHERE
¼ʱ䣺2025-02-20 10:38:57,310 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3223-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'bkingbase'System.Data.DataSet
¼ʱ䣺2025-02-20 10:38:57,317 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3333-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'bkingbase'System.Data.DataSet
¼ʱ䣺2025-02-20 10:38:57,318 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3443-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'bkingbase'System.Data.DataSet
+¼ʱ䣺2025-02-20 11:45:23,860 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:23,897 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:26,012 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:26,019 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:28,041 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:28,049 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:41,999 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:42,005 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 11:45:58,227 ߳ID:[1]- :MySQLHelper :TestConnectMySql Ϣ:Access denied for user 'root'@'localhost' (using password: YES)
+¼ʱ䣺2025-02-20 11:46:24,833 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+ijԱʱʽ[MYDM] [sql]: {myDm};
+¼ʱ䣺2025-02-20 11:46:24,839 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+ijԱʱʽ[MYDM] [sql]: {myDm};
+¼ʱ䣺2025-02-20 11:46:24,845 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:1 иִ:
+ijԱʱʽ[MYDM] [sql]: {myDm};
+¼ʱ䣺2025-02-20 11:48:48,150 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: {SELECT *,'GOOD' title FROM STU};
+¼ʱ䣺2025-02-20 11:48:48,155 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: {SELECT *,'GOOD' title FROM STU};
+¼ʱ䣺2025-02-20 11:49:47,661 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:1 иִ:
+Чıͼ[STU] [sql]: {SELECT *,'GOOD' title FROM STU};
+¼ʱ䣺2025-02-20 11:51:39,862 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:51:39,868 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:51:55,828 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:53:55,287 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:53:56,580 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:53:56,587 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:58:39,498 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:58:39,504 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 11:58:39,509 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:1 иִ:
+Чıͼ[STU] [sql]: { SELECT * FROM STU};
+¼ʱ䣺2025-02-20 13:10:31,179 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:10:31,215 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:12:26,335 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:12:26,343 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:12:49,072 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:12:49,080 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:13:34,472 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:13:34,478 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:16:51,532 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:16:51,569 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:54:44,952 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:54:44,960 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:54:50,176 ߳ID:[1]- :DamengHelper :ExecuteDataSet Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 13:54:50,184 ߳ID:[1]- :SelectTableType :DmSqlSD Ϣ:6001,[localhost:5236 (UNKNOW, UNKNOW)]Ŀܾӡ [::1]:5236
+
+¼ʱ䣺2025-02-20 14:00:37,449 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:Access denied for user 'root'@'localhost' (using password: YES)
+¼ʱ䣺2025-02-20 14:00:37,455 ߳ID:[1]- :MySQLDAL :GetTableNames Ϣ:Access denied for user 'root'@'localhost' (using password: YES)
+¼ʱ䣺2025-02-20 14:01:08,077 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3113-===SELECT table_name as TABNAME FROM information_schema.TABLES WHERE table_schema='cans'server=localhost;port=3306;user=root;password=zjh123;database=cans;CharSet=utf8;Allow User Variables=True
+¼ʱ䣺2025-02-20 14:01:08,077 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3223-===SELECT table_name as TABNAME FROM information_schema.TABLES WHERE table_schema='cans'server=localhost;port=3306;user=root;password=zjh123;database=cans;CharSet=utf8;Allow User Variables=True
+¼ʱ䣺2025-02-20 14:01:08,078 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3223-===SELECT table_name as TABNAME FROM information_schema.TABLES WHERE table_schema='cans'System.Data.DataSet
+¼ʱ䣺2025-02-20 14:01:08,096 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3333-===SELECT table_name as TABNAME FROM information_schema.TABLES WHERE table_schema='cans'System.Data.DataSet
+¼ʱ䣺2025-02-20 14:01:08,096 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3443-===SELECT table_name as TABNAME FROM information_schema.TABLES WHERE table_schema='cans'System.Data.DataSet
+¼ʱ䣺2025-02-20 14:01:08,175 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3113-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'abilitysupervisionrecord'server=localhost;port=3306;user=root;password=zjh123;database=cans;CharSet=utf8;Allow User Variables=True
+¼ʱ䣺2025-02-20 14:01:08,175 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3223-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'abilitysupervisionrecord'server=localhost;port=3306;user=root;password=zjh123;database=cans;CharSet=utf8;Allow User Variables=True
+¼ʱ䣺2025-02-20 14:01:08,175 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3223-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'abilitysupervisionrecord'System.Data.DataSet
+¼ʱ䣺2025-02-20 14:01:08,194 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3333-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'abilitysupervisionrecord'System.Data.DataSet
+¼ʱ䣺2025-02-20 14:01:08,194 ߳ID:[1]- :MySQLHelper :ExecuteDataSet Ϣ:===-3443-===select COLUMN_NAME AS 'ColumnName',IS_NULLABLE AS 'IsNullable',DATA_TYPE AS 'DataType',CHARACTER_MAXIMUM_LENGTH AS 'CharMaxLenth',CHARACTER_OCTET_LENGTH AS 'CharOcterLenth',NUMERIC_PRECISION AS 'NumericPrecision',NUMERIC_SCALE AS 'NumericScale',COLUMN_COMMENT as 'remark' FROM information_schema.COLUMNS WHERE TABLE_NAME LIKE 'abilitysupervisionrecord'System.Data.DataSet
diff --git a/dll/SyncLocalDAL.dll b/dll/SyncLocalDAL.dll
index e69d6cb..cad7df4 100644
Binary files a/dll/SyncLocalDAL.dll and b/dll/SyncLocalDAL.dll differ
diff --git a/dll/WF-ChangeGUID.exe b/dll/WF-ChangeGUID.exe
index 6af32e1..a8e20bb 100644
Binary files a/dll/WF-ChangeGUID.exe and b/dll/WF-ChangeGUID.exe differ
diff --git a/dll/activation.config b/dll/activation.config
index db2a85c..33cc8aa 100644
--- a/dll/activation.config
+++ b/dll/activation.config
@@ -1 +1 @@
-BFEBFBFF000B06A2_7413EA0CEB72_7613EA0CEB71_7413EA0CEB71
\ No newline at end of file
+BFEBFBFF000A0652_B025AA3FD303_00FF7AB4C9BA_8C554AD3D7A5_8E554AD3D7A4_8C554AD3D7A4_8C554AD3D7A8
\ No newline at end of file