rogee/wx-win-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(agent): remove obsolete compatibility paths

Browse Source
This commit is contained in:
rogee
2026-09-27 14:20:57 +08:00
parent bfa0059d3a
commit 083aeef18a
12 changed files with 18 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-agent/WxAgent.Tray/Program.cs
-32
View File
@@ -172,11 +172,9 @@ internal sealed class TrayApplicationContext : ApplicationContext
DataDirectory = dataDirectory,
Remote = source.Remote,
Reporting = source.Reporting,
RemoteConfigurationFile = source.RemoteConfigurationFile,
EnableValidationOperations = source.EnableValidationOperations,
EnableListenerEvents = source.EnableListenerEvents,
PreventAutoLock = source.PreventAutoLock,
EnableDataSync = source.EnableDataSync,
DataSyncIntervalSeconds = source.DataSyncIntervalSeconds,
DataSyncBatchLimit = source.DataSyncBatchLimit,
DataSyncOverlapRows = source.DataSyncOverlapRows,
@@ -288,12 +286,6 @@ internal sealed class TrayApplicationContext : ApplicationContext
{
EnsureConfiguration();
var settings = options!;
if (!string.IsNullOrWhiteSpace(settings.RemoteConfigurationFile))
{
var remotePath = ResolvePath(settings.RemoteConfigurationFile, Path.GetDirectoryName(configPath)!, "remote.json");
var remoteConfiguration = RemoteNodeConfigurationStore.LoadAsync(remotePath).GetAwaiter().GetResult();
settings = WithRemoteForSettings(settings, remoteConfiguration.Remote, remoteConfiguration.Reporting);
}
if (ServiceSettingsEditor.Show(settings) is not { } edited) return;
WriteCredentials(edited.CredentialFile, edited.AccessToken!, edited.EnableValidationOperations);
WriteJson(configPath, edited);
@@ -306,29 +298,6 @@ internal sealed class TrayApplicationContext : ApplicationContext
}
}
private static ServiceOptions WithRemoteForSettings(ServiceOptions source, RemoteAgentOptions? remote, ReportingConfig reporting) => new()
{
ListenUrl = source.ListenUrl,
AllowExternal = source.AllowExternal,
AllowedHosts = source.AllowedHosts ?? [],
AllowedOrigins = source.AllowedOrigins ?? [],
AccessToken = source.AccessToken,
CredentialFile = source.CredentialFile,
DataDirectory = source.DataDirectory,
Remote = remote,
Reporting = reporting,
RemoteConfigurationFile = null,
EnableValidationOperations = source.EnableValidationOperations,
EnableListenerEvents = source.EnableListenerEvents,
PreventAutoLock = source.PreventAutoLock,
EnableDataSync = source.EnableDataSync,
DataSyncIntervalSeconds = source.DataSyncIntervalSeconds,
DataSyncBatchLimit = source.DataSyncBatchLimit,
DataSyncOverlapRows = source.DataSyncOverlapRows,
DataSyncQueueMaxItems = source.DataSyncQueueMaxItems,
DataSyncQueueMaxBytes = source.DataSyncQueueMaxBytes
};
private void SetStatus(string message)
{
StatusItem.Text = message.Length > 60 ? message[..60] : message;
@@ -618,7 +587,6 @@ internal static class ServiceSettingsEditor
DataDirectory = current.DataDirectory,
Remote = remoteOptions,
Reporting = reportingOptions,
RemoteConfigurationFile = null,
EnableValidationOperations = validation.Checked,
EnableListenerEvents = listenerEvents.Checked,
PreventAutoLock = preventAutoLock.Checked