From de62764b9c0a6a800ea70a72d787c2a43fe075a1 Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Wed, 17 Sep 2025 11:22:27 +0200 Subject: [PATCH] ServiceUrls: - temporary remapped --- .../ServiceUrlsBackUp_New.cs | 290 ++++++++---------- ...erRegisters.csproj.CoreCompileInputs.cache | 2 +- 2 files changed, 129 insertions(+), 163 deletions(-) diff --git a/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs b/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs index 991371ed..27f23ea0 100644 --- a/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs +++ b/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs @@ -9,217 +9,183 @@ namespace Xylem.Common.CommonCore.Configuration /// public static class ServiceUrls { + private const String ServerDns = "http://sla12iis01.emea.sensus.net"; + //public const String ServerDns = "https://delaz1web01.world.fluidtechnology.net"; - private const String DefaultInspectCordonelRequirementInfoUrl = - "http://sla12iis01.emea.sensus.net/LaaProductionWeb/"; + private static readonly String DefaultInspectCordonelRequirementInfoUrl = + $"{ServerDns}/LaaProductionWeb/"; // return code: 404 not found, 400 Error with text, 200 okay - private const String DefaultEolDataForSentinelServiceUrl = - "http://sla12iis01.emea.sensus.net/LaaProductionWeb/api/cordonel/eolprogress/"; + private static readonly String DefaultEolDataForSentinelServiceUrl = + $"{ServerDns}/LaaProductionWeb/api/cordonel/eolprogress/"; - private const String DefaultGetPcbIdsFromSafeServiceUrl = - "http://delaz1web01/MeterProcessState/GetPcbIdsFromSafe?ContainerDbId="; + private static readonly String DefaultGetPcbIdsFromSafeServiceUrl = + $"{ServerDns}/MeterProcessState/GetPcbIdsFromSafe?ContainerDbId="; - private const String DefaultAddPcbIdsToSafeServiceUrl = - "http://delaz1web01/MeterProcessState/AddPcbIdsToSafe?ContainerDbId="; + private static readonly String DefaultAddPcbIdsToSafeServiceUrl = + $"{ServerDns}/MeterProcessState/AddPcbIdsToSafe?ContainerDbId="; - private const String DefaultGetOrderOverviewServiceUrl = - "http://delaz1web01/MeterProcessState/api/FinalCheck/GetOrderOverview?ProductionOrderNumber="; + private static readonly String DefaultGetOrderOverviewServiceUrl = + $"{ServerDns}/MeterProcessState/api/FinalCheck/GetOrderOverview?ProductionOrderNumber="; - private const String DefaultDownloadFilesPartsServiceUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetFileParts?ParentFileId="; + private static readonly String DefaultDownloadFilesPartsServiceUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetFileParts?ParentFileId="; - private const String DefaultGetLutUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetLutFiles"; + private static readonly String DefaultGetLutUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetLutFiles"; - private const String DefaultListAllFwPackagesServiceUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=1"; + private static readonly String DefaultListAllFwPackagesServiceUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=1"; - private const String DefaultListAllSwPackagesServiceUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=5"; + private static readonly String DefaultListAllSwPackagesServiceUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=5"; - private const String DefaultListAllConfigFilePackagesServiceUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=6"; + private static readonly String DefaultListAllConfigFilePackagesServiceUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=6"; - private const String DefaultListAllFwUpdateSafesServiceUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=4"; + private static readonly String DefaultListAllFwUpdateSafesServiceUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetFwFiles?FileIsForDeveloperOnly=false&FileCategoryID=4"; - private const String DefaultSetCordonelAppVersionServiceUrl = - "http://delaz1web01/MeterProcessState/api/ProccesState/SetCordonelProgress?PcbId="; + private static readonly String DefaultSetCordonelAppVersionServiceUrl = + $"{ServerDns}/MeterProcessState/api/ProccesState/SetCordonelProgress?PcbId="; - private const String DefaultGetCordonelRequirementInfoUrl = - "http://sla12iis01.emea.sensus.net/LaaProductionWeb/api/cordonel/requirements/pcbid/"; + private static readonly String DefaultGetCordonelRequirementInfoUrl = + $"{ServerDns}/LaaProductionWeb/api/cordonel/requirements/pcbid/"; - private const String DefaultGetCordonelAppVersionServiceUrl = - "http://delaz1web01/MeterProcessState/api/ProccesState/GetCordonelAppVersion?PcbId="; + private static readonly String DefaultGetCordonelAppVersionServiceUrl = + $"{ServerDns}/MeterProcessState/api/ProccesState/GetCordonelAppVersion?PcbId="; - private const String DefaultListAllCordonelCustomersWithFilterServiceUrl = - "http://delaz1web01/MeterProcessState/api/Order/GetCordonelCustomers?FilterName="; + private static readonly String DefaultListAllCordonelCustomersWithFilterServiceUrl = + $"{ServerDns}/MeterProcessState/api/Order/GetCordonelCustomers?FilterName="; - private const String DefaultListAllCordonelCustomerOrdersServiceUrl = - "http://delaz1web01/MeterProcessState/api/Order/GetCustomersCordonelOrders?CustomerNumber="; + private static readonly String DefaultListAllCordonelCustomerOrdersServiceUrl = + $"{ServerDns}/MeterProcessState/api/Order/GetCustomersCordonelOrders?CustomerNumber="; - private const String DefaultListCordonelOrderDetailsServiceUrl = - "http://delaz1web01/MeterProcessState/api/Order/GetCordonelOrderDetails?OrderNr="; + private static readonly String DefaultListCordonelOrderDetailsServiceUrl = + $"{ServerDns}/MeterProcessState/api/Order/GetCordonelOrderDetails?OrderNr="; - private const String DefaultListAllOrderCordonelsServiceUrl = - "http://delaz1web01/MeterProcessState/api/Order/GetCordonelOrderList?CustomerOrderNumber="; + private static readonly String DefaultListAllOrderCordonelsServiceUrl = + $"{ServerDns}/MeterProcessState/api/Order/GetCordonelOrderList?CustomerOrderNumber="; - private const String DefaultDownloadFwUpdateSafeServiceUrl = - "http://delaz1web01/MeterProcessState/GetFWUpdateSafeContainerContent?SafeContainerId="; + private static readonly String DefaultDownloadFwUpdateSafeServiceUrl = + $"{ServerDns}/MeterProcessState/GetFWUpdateSafeContainerContent?SafeContainerId="; - private const String DefaultListAllFwUpdateSafesForUserServiceUrl = - "http://delaz1web01/MeterProcessState/GetFWUpdateSafeContainers?UserId="; + private static readonly String DefaultListAllFwUpdateSafesForUserServiceUrl = + $"{ServerDns}/MeterProcessState/GetFWUpdateSafeContainers?UserId="; - private const String DefaultFileContentDownloadServiceUrl = - "http://delaz1web01/MeterProcessState/GetFileContent?FileId="; + private static readonly String DefaultFileContentDownloadServiceUrl = + $"{ServerDns}/MeterProcessState/GetFileContent?FileId="; - private const String DefaultFwUpdateReportUploadServiceUrl = - "http://delaz1web01/MeterProcessState/PostFWUpdateReportFile"; + private static readonly String DefaultFwUpdateReportUploadServiceUrl = + $"{ServerDns}/MeterProcessState/PostFWUpdateReportFile"; - private const String DefaultFwUpdateReportDownloadServiceUrl = - "http://delaz1web01/MeterProcessState/GetFWUpdateReportFile?"; + private static readonly String DefaultFwUpdateReportDownloadServiceUrl = + $"{ServerDns}/MeterProcessState/GetFWUpdateReportFile?"; - private const String DefaultFwUpdateSafeContainerUploadServiceUrl = - "http://delaz1web01/MeterProcessState/PostFWUpdateSafeOdd"; + private static readonly String DefaultFwUpdateSafeContainerUploadServiceUrl = + $"{ServerDns}/MeterProcessState/PostFWUpdateSafeOdd"; - private const String DefaultEditFwUpdateUserValidityServiceUrl = - "http://delaz1web01/MeterProcessState/EditUserValidity?Id="; + private static readonly String DefaultEditFwUpdateUserValidityServiceUrl = + $"{ServerDns}/MeterProcessState/EditUserValidity?Id="; - private const String DefaultRefreshFwUpdateUsersHardwareIdServiceUrl = - "http://delaz1web01/MeterProcessState/RefreshUsersHardwareId?Id="; + private static readonly String DefaultRefreshFwUpdateUsersHardwareIdServiceUrl = + $"{ServerDns}/MeterProcessState/RefreshUsersHardwareId?Id="; - private const String DefaultRefreshFwUpdateUsersPasswordHashServiceUrl = - "http://delaz1web01/MeterProcessState/RefreshUsersPasswordHash?Id="; + private static readonly String DefaultRefreshFwUpdateUsersPasswordHashServiceUrl = + $"{ServerDns}/MeterProcessState/RefreshUsersPasswordHash?Id="; - private const String DefaultCreateNewFwUpdateUserServiceUrl = - "http://delaz1web01/MeterProcessState/AddNewUser?"; + private static readonly String DefaultCreateNewFwUpdateUserServiceUrl = + $"{ServerDns}/MeterProcessState/AddNewUser?"; - private const String DefaultListAllFwUpdateUsersServiceUrl = - "http://delaz1web01/MeterProcessState/GetUserList"; + private static readonly String DefaultListAllFwUpdateUsersServiceUrl = + $"{ServerDns}/MeterProcessState/GetUserList"; - private const String DefaultListAllFwUpdateBuilderOperatorsServiceUrl = - "http://delaz1web01/MeterProcessState/GetAllBuilderOperator"; + private static readonly String DefaultListAllFwUpdateBuilderOperatorsServiceUrl = + $"{ServerDns}/MeterProcessState/GetAllBuilderOperator"; - private const String DefaultGetFwUpdateUserByIdServiceUrl = - "http://delaz1web01/MeterProcessState/GetUserList?Id="; + private static readonly String DefaultGetFwUpdateUserByIdServiceUrl = + $"{ServerDns}/MeterProcessState/GetUserList?Id="; - private const String DefaultGetFwUpdateUserByLoginNameServiceUrl = - "http://delaz1web01/MeterProcessState/GetUserList?LogInName="; + private static readonly String DefaultGetFwUpdateUserByLoginNameServiceUrl = + $"{ServerDns}/MeterProcessState/GetUserList?LogInName="; - private const String DefaultRegisterWatchServiceUrl = - "http://delaz1web01/MeterProcessState/api/RegisterWatch/"; + private static readonly String DefaultRegisterWatchServiceUrl = + $"{ServerDns}/MeterProcessState/api/RegisterWatch/"; - private const String DefaultGenesisGetOrderNumberServiceUrl = - "http://delaz1web01/MeterProcessState/api/Password/ordernumber?PcbId="; + private static readonly String DefaultGenesisGetOrderNumberServiceUrl = + $"{ServerDns}/MeterProcessState/api/Password/ordernumber?PcbId="; - private const String DefaultGenesisGetRadioAddressServiceUrl = - "http://delaz1web01/MeterProcessState/api/Password/radioadress?PcbId="; + private static readonly String DefaultGenesisGetRadioAddressServiceUrl = + $"{ServerDns}/MeterProcessState/api/Password/radioadress?PcbId="; - private const String DefaultGenesisGetKeySetIdServiceUrl = - "http://delaz1web01/MeterProcessState/api/Password/getkeysetid?PcbId="; + private static readonly String DefaultGenesisGetKeySetIdServiceUrl = + $"{ServerDns}/MeterProcessState/api/Password/getkeysetid?PcbId="; - private const String DefaultGenesisGetPasswordServiceUrl = - "http://delaz1web01/MeterProcessState/api/Password/GetPassword?PcbId="; + private static readonly String DefaultGenesisGetPasswordServiceUrl = + $"{ServerDns}/MeterProcessState/api/Password/GetPassword?PcbId="; - private const String DefaultGenesisSetPasswordServiceUrl = - "http://delaz1web01/MeterProcessState/api/Password/setpassword?PcbId="; + private static readonly String DefaultGenesisSetPasswordServiceUrl = + $"{ServerDns}/MeterProcessState/api/Password/setpassword?PcbId="; - private const String DefaultGenesisPasswordContainerServiceUrl = - "http://delaz1web01/MeterProcessState/api/Password/GetPasswordHashFileContent?PcbId="; + private static readonly String DefaultGenesisPasswordContainerServiceUrl = + $"{ServerDns}/MeterProcessState/api/Password/GetPasswordHashFileContent?PcbId="; - private const String DefaultMarriageServiceUrl = - "http://delaz1web01/MeterProcessState/api/Marriage/"; + private static readonly String DefaultMarriageServiceUrl = + $"{ServerDns}/MeterProcessState/api/Marriage/"; - private const String DefaultMeterProcessStateUrl = - "http://delaz1web01/MeterProcessState/api/ProccesState/"; + private static readonly String DefaultMeterProcessStateUrl = + $"{ServerDns}/MeterProcessState/api/ProccesState/"; - private const String DefaultGenesisFinalCheckServiceUrl = - "http://delaz1web01/MeterProcessState/api/FinalCheck/"; + private static readonly String DefaultGenesisFinalCheckServiceUrl = + $"{ServerDns}/MeterProcessState/api/FinalCheck/"; - private const String DefaultGenesisRadioCheckServiceUrl = - "http://delaz1web01/MeterProcessState/api/RadioCheck/"; + private static readonly String DefaultGenesisRadioCheckServiceUrl = + $"{ServerDns}/MeterProcessState/api/RadioCheck/"; - private const String DefaultGetSoftwareStartUpAccessUrl = - "http://delaz1web01/MeterProcessState/api/SoftwareAccess/GetVersionIsValid"; + private static readonly String DefaultGetSoftwareStartUpAccessUrl = + $"{ServerDns}/MeterProcessState/api/SoftwareAccess/GetVersionIsValid"; - private const String DefaultSetSoftwareLicenseUrl = - "http://delaz1web01/MeterProcessState/api/SoftwareAccess/SetVersionIsValid?Program="; + private static readonly String DefaultSetSoftwareLicenseUrl = + $"{ServerDns}/MeterProcessState/api/SoftwareAccess/SetVersionIsValid?Program="; - private const String DefaultGetSoftwareLicenseUrl = - "http://delaz1web01/MeterProcessState/api/SoftwareAccess/GetCurrentVersion?Program="; + private static readonly String DefaultGetSoftwareLicenseUrl = + $"{ServerDns}/MeterProcessState/api/SoftwareAccess/GetCurrentVersion?Program="; - private const String DefaultGenesisCalibrationResult = - "http://delaz1web01/MeterProcessState/api/GenesisMeter/PostCalibrationResult"; + private static readonly String DefaultGenesisCalibrationResult = + $"{ServerDns}/MeterProcessState/api/GenesisMeter/PostCalibrationResult"; - private const String DefaultGetGenesisCalibrationResults = - "http://delaz1web01/MeterProcessState/api/FinalCheck/CalibrationResults/"; + private static readonly String DefaultGetGenesisCalibrationResults = + $"{ServerDns}/MeterProcessState/api/FinalCheck/CalibrationResults/"; - private const String DefaultGenesisMeter = - "http://delaz1web01/MeterProcessState/api/GenesisMeter/"; + private static readonly String DefaultGenesisMeter = + $"{ServerDns}/MeterProcessState/api/GenesisMeter/"; - private const String DefaultFileContentController = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/"; + private static readonly String DefaultFileContentController = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/"; - private const String DefaultKeyServerCustom = + private static readonly String DefaultKeyServerCustom = "https://nodes.sms-esaap.com/keygenproxy/api/v3/custom/"; - private const String DefaultMeterInfoForTestBench = - "http://delaz1web01/MeterProcessState/api/TestBench/GetMeterInfoForTestBench?PcbID="; + private static readonly String DefaultMeterInfoForTestBench = + $"{ServerDns}/MeterProcessState/api/TestBench/GetMeterInfoForTestBench?PcbID="; - private const String DefaultCordonelFwInfoUrl = - "http://delaz1web01/MeterProcessState/api/FileUpToDate/GetCordonelFw"; + private static readonly String DefaultCordonelFwInfoUrl = + $"{ServerDns}/MeterProcessState/api/FileUpToDate/GetCordonelFw"; - private const String DefaultDbDataAtEolServiceUrl = - "http://delaz1web01/MeterProcessState/api/fwupdate/databaseateol/"; + private static readonly String DefaultDbDataAtEolServiceUrl = + $"{ServerDns}/MeterProcessState/api/fwupdate/databaseateol/"; - //private const String DefaultGenesisGetOrderNumberServiceUrl = - // "http://localhost:56011/api/Password/ordernumber?PcbId="; + public static readonly String PressureSensorTestURL_GetTestSpec + = $"{ServerDns}/MeterProcessState/api/CordonelPressureSensorTest/GetTestSpec"; - //private const String DefaultGenesisGetRadioAdressServiceUrl = - // "http://localhost:56011/api/Password/radioadress?PcbId="; - - //private const String DefaultGenesisGetKeySetIdServiceUrl = - // "http://localhost:56011/api/Password/getkeysetid?PcbId="; - - //private const String DefaultGenesisGetPasswordServiceUrl = - // "http://localhost:56011/api/Password/GetPassword?PcbId="; - - //private const String DefaultGenesisSetPasswordServiceUrl = - // "http://localhost:56011/api/Password/setpassword?PcbId="; - - //private const String DefaultGenesisPasswordContainerServiceUrl = - // "http://localhost:56011/api/Password/GetPasswordHashFileContent?PcbId="; - - //private const String DefaultMarriageServiceUrl = - // "http://localhost:56011/api/Marriage/"; - - //private const String DefaultMeterProcessStateUrl = - // "http://localhost:56011/api/ProccesState/"; - - - //private const String DefaultGenesisFinalCheckServiceUrl = - // "http://localhost:56011/api/FinalCheck/"; - - - //private const String DefaultGenesisRadioCheckServiceUrl = - // "http://localhost:56011/api/RadioCheck/"; - - //private const String DefaultGetSoftwareStartUpAccessUrl = - // "http://localhost:56011/api/SoftwareAccess/GetVersionIsValid"; - - - private const String PressureSensorTestURL_GetTestSpec - = "http://delaz1web01/MeterProcessState/api/CordonelPressureSensorTest/GetTestSpec"; - - private const String PressureSensorTestURL_PostTestResults - = "http://delaz1web01/MeterProcessState/api/CordonelPressureSensorTest/PostTestResults"; + public static readonly String PressureSensorTestURL_PostTestResults + = $"{ServerDns}/MeterProcessState/api/CordonelPressureSensorTest/PostTestResults"; /// /// usage: string.Format(CordonelPressureSensorTestURL_GetTestResults, pcbId); /// - private const String PressureSensorTestURL_GetTestResults - = "http://delaz1web01/MeterProcessState/api/CordonelPressureSensorTest/GetTestResults/{0}"; + public static readonly String PressureSensorTestURL_GetTestResults + = $"{ServerDns}/MeterProcessState/api/CordonelPressureSensorTest/GetTestResults/{0}"; public const String LaaProductionAPI #if DEBUG == false // when false uses always the production url. @@ -232,7 +198,7 @@ namespace Xylem.Common.CommonCore.Configuration /// /// GET: test specification for water meter with pressure sensor. /// - public static string GetPressureSensorSpecificationURL + public static String GetPressureSensorSpecificationURL #if DEBUG => "http://localhost:56011/api/CordonelPressureSensorTest/GetTestSpec"; #else @@ -243,7 +209,7 @@ namespace Xylem.Common.CommonCore.Configuration /// /// POST: test result for water meter with pressure sensor. /// - public static string PostPressureSensorResultURL + public static String PostPressureSensorResultURL #if DEBUG => "http://localhost:56011/api/CordonelPressureSensorTest/PostTestResults"; @@ -256,7 +222,7 @@ namespace Xylem.Common.CommonCore.Configuration /// /// GET: a list of test results for the water meter with specified pcbId. /// - public static string PressureSensorResultsURL(this T pcbId) + public static String PressureSensorResultsURL(this T pcbId) { #if DEBUG var url = "http://localhost:56011/api/CordonelPressureSensorTest/GetTestResults/{0}"; @@ -439,8 +405,8 @@ namespace Xylem.Common.CommonCore.Configuration /// Get all production infos for skip process checks or limits for production like: /// - Battery drained percentage upper limit, /// - Production due date for a special register, - /// - Required life time for assembly line, - /// - Required life time for shipping line. + /// - Required lifetime for assembly line, + /// - Required lifetime for shipping line. /// /// public static String GetCordonelRequirementInfoServiceUrl() @@ -453,26 +419,26 @@ namespace Xylem.Common.CommonCore.Configuration /// Get all production infos for skip process checks or limits for production like: /// - Battery drained percentage upper limit, /// - Production due date for a special register, - /// - Required life time for assembly line, - /// - Required life time for shipping line. + /// - Required lifetime for assembly line, + /// - Required lifetime for shipping line. /// /// - public static String GetCordonelRequirementByFANrInfoServiceUrl(string ponr) + public static String GetCordonelRequirementByFANrInfoServiceUrl(String ponr) { - return $"http://sla12iis01.emea.sensus.net/LaaProductionWeb/api/cordonel/requirements/pono/{ponr}"; + return $"{ServerDns}/LaaProductionWeb/api/cordonel/requirements/pono/{ponr}"; } /// /// Get all production infos for skip process checks or limits for production like: /// - Battery drained percentage upper limit, /// - Production due date for a special register, - /// - Required life time for assembly line, - /// - Required life time for shipping line. + /// - Required lifetime for assembly line, + /// - Required lifetime for shipping line. /// /// - public static string GetCordonelRequirementByMeterSizeInfoServiceUrl(int size) + public static String GetCordonelRequirementByMeterSizeInfoServiceUrl(Int32 size) { - return $"http://sla12iis01.emea.sensus.net/LaaProductionWeb/api/cordonel/requirements/isize/{size}"; + return $"{ServerDns}/LaaProductionWeb/api/cordonel/requirements/isize/{size}"; } /// diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache index 39b3fdf8..4163759b 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b03dfbada453427a2bb1275645a5f1b525f29900 +8cb55c312de586b683d72cf58c13e2801d10e14b767777d98338d3e1473a1213