diff --git a/Server/Common/Config.cs b/Server/Common/Config.cs index 040ee29..95f5a7c 100644 --- a/Server/Common/Config.cs +++ b/Server/Common/Config.cs @@ -21,10 +21,12 @@ public class DirFileConfig /// 本地文件信息,也是即将发布的文件信息,通常是最新的版本 /// public Dir? LocalDirInfo { get; set; } + /// /// 差异文件信息 /// public Dir? DiffDirInfo { get; set; } + /// /// 远程文件信息,通常是较旧的版本 /// @@ -41,7 +43,7 @@ public class MSSqlConfig /// /// db名称 /// - public required string DatebaseName { get; set; } + public required string DatabaseName { get; set; } /// /// 用户 diff --git a/Server/LocalServer/StateHelper.cs b/Server/LocalServer/StateHelper.cs index 3981388..e6049ce 100644 --- a/Server/LocalServer/StateHelper.cs +++ b/Server/LocalServer/StateHelper.cs @@ -323,7 +323,7 @@ public class DeployMSSqlHelper(LocalSyncServer context) // 不要log file 了 //+ $" /DiagnosticsFile:{LocalSyncServer.TempRootFile}/{Context.NotNullSyncConfig.Id.ToString()}/{Context.NotNullSyncConfig.Id.ToString()}.log" + $" /p:ExtractAllTableData=false /p:VerifyExtraction=true /SourceServerName:{Context.NotNullSyncConfig.SrcDb.ServerName}" - + $" /SourceDatabaseName:{Context.NotNullSyncConfig.SrcDb.DatebaseName} /SourceUser:{Context.NotNullSyncConfig.SrcDb.User}" + + $" /SourceDatabaseName:{Context.NotNullSyncConfig.SrcDb.DatabaseName} /SourceUser:{Context.NotNullSyncConfig.SrcDb.User}" + $" /SourcePassword:{Context.NotNullSyncConfig.SrcDb.Password} /SourceTrustServerCertificate:{Context.NotNullSyncConfig.SrcDb.TrustServerCertificate}" + $" /p:ExtractReferencedServerScopedElements=False /p:IgnoreUserLoginMappings=True /p:IgnorePermissions=True"; if (Context.NotNullSyncConfig.SrcDb.SyncTablesData != null) @@ -427,4 +427,4 @@ public class FinallyPublishHelper(LocalSyncServer context) { Context.LocalPipe.SendMsg(msg).Wait(); } -} \ No newline at end of file +} diff --git a/Server/RemoteServer/StateHelper.cs b/Server/RemoteServer/StateHelper.cs index 5730138..8129db1 100644 --- a/Server/RemoteServer/StateHelper.cs +++ b/Server/RemoteServer/StateHelper.cs @@ -151,7 +151,7 @@ public class FinallyPublishHelper(RemoteSyncServer context) { var arguments = $" /Action:Publish /SourceFile:{RemoteSyncServer.TempRootFile}/{Context.NotNullSyncConfig.Id.ToString()}/{Context.NotNullSyncConfig.Id}.dacpac" - + $" /TargetServerName:{Context.NotNullSyncConfig.DstDb.ServerName} /TargetDatabaseName:{Context.NotNullSyncConfig.DstDb.DatebaseName}" + + $" /TargetServerName:{Context.NotNullSyncConfig.DstDb.ServerName} /TargetDatabaseName:{Context.NotNullSyncConfig.DstDb.DatabaseName}" + $" /TargetUser:{Context.NotNullSyncConfig.DstDb.User} /TargetPassword:{Context.NotNullSyncConfig.DstDb.Password} /TargetTrustServerCertificate:True"; ProcessStartInfo startInfo = diff --git a/Server/ServerTest/PipeSeed.cs b/Server/ServerTest/PipeSeed.cs index fc8125d..b3ff435 100644 --- a/Server/ServerTest/PipeSeed.cs +++ b/Server/ServerTest/PipeSeed.cs @@ -22,7 +22,7 @@ public class PipeSeed : IDisposable SrcDb = new MSSqlConfig { ServerName = "172.16.12.2", - DatebaseName = "HMES_H7_HNFYMF", + DatabaseName = "HMES_H7_HNFYMF", User = "hmes-h7", Password = "Hmes-h7666", TrustServerCertificate = "True", @@ -37,7 +37,7 @@ public class PipeSeed : IDisposable DstDb = new MSSqlConfig { ServerName = "127.0.0.1", - DatebaseName = "HMES_H7_HNFYMF", + DatabaseName = "HMES_H7_HNFYMF", User = "sa", Password = "0", TrustServerCertificate = "True" diff --git a/Tool/JsScript/release.js b/Tool/JsScript/release.js index f2da249..f4b4c17 100644 --- a/Tool/JsScript/release.js +++ b/Tool/JsScript/release.js @@ -27,7 +27,7 @@ const example_config = { //Host ServerName: "172.16.12.2", //数据库名 - DatebaseName: "HMES_H7_HNFYMF", + DatabaseName: "HMES_H7_HNFYMF", User: "hmes-h7", Password: "Hmes-h7666", //是否信任服务器证书 @@ -43,7 +43,7 @@ const example_config = { //目标数据库配置 sqlserver DstDb: { ServerName: "127.0.0.1", - DatebaseName: "HMES_H7_HNFYMF", + DatabaseName: "HMES_H7_HNFYMF", User: "sa", Password: "0", TrustServerCertificate: "True", @@ -81,7 +81,7 @@ const config = { //Host ServerName: "172.16.12.2", //数据库名 - DatebaseName: "HMES_H7_HNFYMF", + DatabaseName: "HMES_H7_HNFYMF", User: "hmes-h7", Password: "Hmes-h7666", //是否信任服务器证书 @@ -97,7 +97,7 @@ const config = { //目标数据库配置 sqlserver DstDb: { ServerName: "127.0.0.1", - DatebaseName: "HMES_H7_HNFYMF", + DatabaseName: "HMES_H7_HNFYMF", User: "sa", Password: "0", TrustServerCertificate: "True", diff --git a/Tool/webtool/src/App.vue b/Tool/webtool/src/App.vue index 37188d0..34ba77a 100644 --- a/Tool/webtool/src/App.vue +++ b/Tool/webtool/src/App.vue @@ -28,7 +28,7 @@ config = { RemoteRootPath: "D:/FileSyncTest/dst", SrcDb: { ServerName: "172.16.12.2", - DatebaseName: "HMES_H7_HNFYMF", + DatabaseName: "HMES_H7_HNFYMF", User: "hmes-h7", Password: "Hmes-h7666", TrustServerCertificate: "True", @@ -41,7 +41,7 @@ config = { }, DstDb: { ServerName: "127.0.0.1", - DatebaseName: "HMES_H7_HNFYMF", + DatabaseName: "HMES_H7_HNFYMF", User: "sa", Password: "0", TrustServerCertificate: "True",