ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temp commit

Browse Source
This commit is contained in:
rene
2022-12-28 17:19:48 +01:00
parent 4fbfdbaf2c
commit 0b1459df9d
9 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWo/app.config
View File

@@ -8,12 +8,12 @@
<basicHttpBinding>
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
<security mode="None"/>
<security mode="Transport"/>
<!-- mode="Transport" für echten Server und "None" sonst-->
</binding>
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" transferMode="StreamedRequest" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
<security mode="None"/>
<security mode="Transport"/>
<!-- mode="Transport" für echten Server -->
</binding>
<binding name="QueryServiceEndpoint" closeTimeout="00:10:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">

9
BeWoLauncher/App.config
View File

@@ -16,11 +16,16 @@
<security mode="None" />
<!-- mode="Transport" für echten Server und "None" sonst-->
</binding>
<binding name="BeWoBasicEndpointTransport" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="Transport" />
<!-- mode="Transport" für echten Server und "None" sonst-->
</binding>
</basicHttpBinding>
</bindings>
<client>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.ILauncherService" name="LauncherServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.IEnumTranslationService" name="EnumTranslationEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpointTransport" contract="BeWoLauncher.ServiceProxy.ILauncherService" name="LauncherServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpointTransport" contract="BeWoLauncher.ServiceProxy.IEnumTranslationService" name="EnumTranslationEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.IDownloadBeWoService" name="DownloadBeWoEndpoint" />
</client>
<behaviors>

2
BeWoLauncher/Logic/Controller/ProcessController.cs
View File

@@ -58,7 +58,7 @@ namespace BeWoLauncher.Logic.Controller
//ConnectionInformation.DownloadServerAddress = ConnectionInformation.DownloadServerAddressExact.ToString();
//ConnectionInformation.CoreServerAddress = ConnectionInformation.CoreServerAddress.ToString();
LauncherServiceFacade.UpdateServerAddresses(SessionInformation.Connection.DownloadServerAddressExact, SessionInformation.Connection.CoreServerAddressExact);
LauncherServiceFacade.UpdateServerAddresses();
}
internal static void StartLauncherShutdown()

22
BeWoLauncher/Logic/ServiceProxy/LauncherServiceFacade.cs
View File

@@ -1,5 +1,6 @@
using BeWoLauncher.Multitenancy;
using BeWoLauncher.Security;
using BS.SharedLauncher.Information;
using System;
using System.Collections.Generic;
using System.ServiceModel;
@@ -17,20 +18,21 @@ namespace BeWoLauncher.ServiceProxy
private static readonly int _RunningAsyncs;
public static void UpdateServerAddresses(string launcher, string main)
public static void UpdateServerAddresses()
{
var serverName = launcher;
var serverName2 = main;
if (serverName.Substring(serverName.Length - 1, 1) != "/")
serverName += "/";
if (serverName2.Substring(serverName2.Length - 1, 1) != "/")
serverName2 += "/";
var download = SessionInformation.Connection.DownloadServerAddressExact;
var core = SessionInformation.Connection.CoreServerAddressExact;
if (download.Substring(download.Length - 1, 1) != "/")
download += "/";
if (core.Substring(core.Length - 1, 1) != "/")
core += "/";
_EndpointAddresses = new Dictionary<Type, EndpointAddress>
{
{ typeof(ILauncherService), new EndpointAddress(serverName2 + "LauncherService.svc") },
{ typeof(IEnumTranslationService), new EndpointAddress(serverName2 + "EnumTranslationService.svc") },
{ typeof(IDownloadBeWoService), new EndpointAddress(serverName + "DownloadBeWoService.svc") }
{ typeof(ILauncherService), new EndpointAddress(core + "LauncherService.svc") },
{ typeof(IEnumTranslationService), new EndpointAddress(core + "EnumTranslationService.svc") },
{ typeof(IDownloadBeWoService), new EndpointAddress(download + "DownloadBeWoService.svc") }
};
}

1
BeWoLauncher/View/LoginView.xaml.cs
View File

@@ -171,6 +171,7 @@ namespace BeWoLauncher.View
SessionInformation.Login.Password = PasswordBox_Password.Password;
SessionInformation.Login.Pin = PINTextBox.Text;
LauncherServiceFacade.UpdateServerAddresses();
if (!String.IsNullOrEmpty(SessionInformation.Login.Pin))
{

2
DownloadServer/Web.config
View File

@@ -59,7 +59,7 @@
</binding>
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="None" />
<security mode="Transport" />
<!-- mode="Transport" für echten Server und "None" sonst-->
</binding>
</basicHttpBinding>

2
Host/Host.csproj.user
View File

@@ -31,7 +31,7 @@
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<EnableENC>False</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>

3
Service/ServiceImplementations/DownloadBeWoServiceImp.cs
View File

@@ -34,8 +34,7 @@ namespace BeWo.Service.ServiceImplementations
{
return null;
}
public UpdatePlanResponse GetUpdatePlan(UpdatePlanRequest request)
{
try

4
SharedLauncher/Information/SessionInformation.cs
View File

@@ -26,9 +26,9 @@ namespace BS.SharedLauncher.Information
{
// Core Server
return "http://localhost:3777/Host/";
//return "http://localhost:3777/Host/";
//return "https://localhost:44308/Host/";
//return "https://app5.bewoplaner.de";
return "https://app5.bewoplaner.de";
}
throw new Exception();
}