From b3d895093a365752610e98cd7ed5e4345b898b48 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 2 Jul 2024 09:59:03 +0200 Subject: [PATCH] =?UTF-8?q?Versions=C3=A4nderungen=20f=C3=BCr=201.2.2.3=20?= =?UTF-8?q?produktiv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- misc/BreCalApi.cs | 6 +++--- misc/BreCalApi.yaml | 2 +- src/BreCalClient/App.config | 6 +++--- src/BreCalClient/BreCalClient.csproj | 2 +- .../PublishProfiles/ClickOnceProfile.pubxml | 4 ++-- src/BreCalClient/Properties/Settings.Designer.cs | 4 ++-- src/BreCalClient/Properties/Settings.settings | 4 ++-- src/BreCalClient/ShipcallControl.xaml | 2 +- src/BreCalClient/ShipcallControl.xaml.cs | 12 ++++++------ src/Setup/Setup.vdproj | 4 ++-- src/server/BreCal/__init__.py | 2 +- src/server/BreCal/local_db.py | 2 +- src/server/flaskapp.wsgi | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index b56dcab..a15073d 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -4833,7 +4833,7 @@ namespace BreCalClient.misc.Client { Proxy = null; UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp"); - BasePath = "https://brecaltest.bsmd-emswe.eu"; + BasePath = "https://brecal.bsmd-emswe.eu"; DefaultHeaders = new ConcurrentDictionary(); ApiKey = new ConcurrentDictionary(); ApiKeyPrefix = new ConcurrentDictionary(); @@ -4841,7 +4841,7 @@ namespace BreCalClient.misc.Client { { new Dictionary { - {"url", "https://brecaltest.bsmd-emswe.eu"}, + {"url", "https://brecal.bsmd-emswe.eu"}, {"description", "Test server hosted on vcup"}, } } @@ -4860,7 +4860,7 @@ namespace BreCalClient.misc.Client IDictionary defaultHeaders, IDictionary apiKey, IDictionary apiKeyPrefix, - string basePath = "https://brecaltest.bsmd-emswe.eu") : this() + string basePath = "https://brecal.bsmd-emswe.eu") : this() { if (string.IsNullOrWhiteSpace(basePath)) throw new ArgumentException("The provided basePath is invalid.", "basePath"); diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml index ef32af8..06c6b96 100644 --- a/misc/BreCalApi.yaml +++ b/misc/BreCalApi.yaml @@ -14,7 +14,7 @@ info: name: Use at your own risk url: 'https://www.bsmd.de/license' servers: - - url: 'https://brecaltest.bsmd-emswe.eu' + - url: 'https://brecal.bsmd-emswe.eu' description: Test server hosted on vcup tags: - name: user diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index 5a4a479..3dd7a2e 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -29,16 +29,16 @@ - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ - https://brecaltest.bsmd-emswe.eu + https://brecal.bsmd-emswe.eu diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 3ba021c..6333a24 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -13,7 +13,7 @@ Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico - BreCalTestClient + BreCalClient diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml index 94aa26d..498178d 100644 --- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml +++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml @@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - 0 - 6.0 + 3 + 1.2.2.3 False Release True diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs index bd1cc90..669fa3a 100644 --- a/src/BreCalClient/Properties/Settings.Designer.cs +++ b/src/BreCalClient/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")] + [global::System.Configuration.DefaultSettingValueAttribute("#203864")] public string BG_COLOR { get { return ((string)(this["BG_COLOR"])); @@ -64,7 +64,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://brecaltest.bsmd-emswe.eu")] + [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")] public string API_URL { get { return ((string)(this["API_URL"])); diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings index 7cde5c8..eebecb4 100644 --- a/src/BreCalClient/Properties/Settings.settings +++ b/src/BreCalClient/Properties/Settings.settings @@ -3,7 +3,7 @@ - #751D1F + #203864 !!Bremen calling Testversion!! @@ -15,7 +15,7 @@ - https://brecaltest.tbsmd-emswe.eu + https://brecal.tbsmd-emswe.eu 800 diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 4255c15..1e9c10a 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:p = "clr-namespace:BreCalClient.Resources" xmlns:sets="clr-namespace:BreCalClient.Properties" - xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient" + xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient" mc:Ignorable="d" d:DesignHeight="135" d:DesignWidth="800"> diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index 0c05e27..3e18efd 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -214,13 +214,13 @@ namespace BreCalClient switch (this.ShipcallControlModel?.Shipcall?.Type) { case ShipcallType.Arrival: // incoming - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_down_red.png")); break; case ShipcallType.Departure: // outgoing - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_up_blue.png")); break; case ShipcallType.Shifting: // shifting - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_right_green.png")); break; default: break; @@ -229,13 +229,13 @@ namespace BreCalClient switch(this.ShipcallControlModel?.LightMode) { case EvaluationType.Green: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/check.png")); break; case EvaluationType.Yellow: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/sign_warning.png")); break; case EvaluationType.Red: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/delete2.png")); break; default: break; diff --git a/src/Setup/Setup.vdproj b/src/Setup/Setup.vdproj index 431681b..92d3602 100644 --- a/src/Setup/Setup.vdproj +++ b/src/Setup/Setup.vdproj @@ -198,9 +198,9 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Bremen calling" - "ProductCode" = "8:{6F89CBAA-2189-456F-A347-0C0158325B61}" + "ProductCode" = "8:{0ED342DD-DC00-4CE4-8348-96BB3AB726B1}" "PackageCode" = "8:{8E55F30F-A9C8-41E9-BCE8-431770A951ED}" - "UpgradeCode" = "8:{1C7FA3E4-BAB9-4911-9348-73094357FC7C}" + "UpgradeCode" = "8:{81A329F1-C663-48DA-9E15-DAF19F99B5AE}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py index 3db4e41..96fe61e 100644 --- a/src/server/BreCal/__init__.py +++ b/src/server/BreCal/__init__.py @@ -62,7 +62,7 @@ def create_app(test_config=None): app.register_blueprint(user.bp) app.register_blueprint(history.bp) - logging.basicConfig(filename='brecaltest.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s') + logging.basicConfig(filename='brecal.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s') local_db.initPool(os.path.dirname(app.instance_path)) logging.info('App started') diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py index baa0499..d41f250 100644 --- a/src/server/BreCal/local_db.py +++ b/src/server/BreCal/local_db.py @@ -11,7 +11,7 @@ def initPool(instancePath): try: global config_path if(config_path == None): - config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json'); + config_path = os.path.join(instancePath,'../../../secure/connection_data_prod.json'); print (config_path) diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi index 9dec941..6296d8f 100644 --- a/src/server/flaskapp.wsgi +++ b/src/server/flaskapp.wsgi @@ -2,7 +2,7 @@ import os import sys import logging -sys.path.insert(0, '/var/www/brecal_test/src/server') +sys.path.insert(0, '/var/www/brecal/src/server') sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/') import schedule