bring EDMIService up to date
This commit is contained in:
parent
37a3675d84
commit
d1817fedb5
@ -2,30 +2,28 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<system.diagnostics>
|
<system.diagnostics>
|
||||||
<sources>
|
<sources>
|
||||||
<source name="System.ServiceModel" switchValue="Information,ActivityTracing"
|
<source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
|
||||||
propagateActivity="true">
|
|
||||||
<listeners>
|
<listeners>
|
||||||
<add name="xml" />
|
<add name="xml"/>
|
||||||
</listeners>
|
</listeners>
|
||||||
</source>
|
</source>
|
||||||
<source name="System.ServiceModel.MessageLogging">
|
<source name="System.ServiceModel.MessageLogging">
|
||||||
<listeners>
|
<listeners>
|
||||||
<add name="xml" />
|
<add name="xml"/>
|
||||||
</listeners>
|
</listeners>
|
||||||
</source>
|
</source>
|
||||||
</sources>
|
</sources>
|
||||||
<sharedListeners>
|
<sharedListeners>
|
||||||
<add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener"
|
<add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml"/>
|
||||||
name="xml" />
|
|
||||||
</sharedListeners>
|
</sharedListeners>
|
||||||
<trace autoflush="true" />
|
<trace autoflush="true"/>
|
||||||
</system.diagnostics>
|
</system.diagnostics>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<!-- FIREBIRD SETTINGS -->
|
<!-- FIREBIRD SETTINGS -->
|
||||||
<add key="FIREBIRD_DATASOURCE" value="" />
|
<add key="FIREBIRD_DATASOURCE" value=""/>
|
||||||
<add key="FIREBIRD_DATABASE_NAME" value="" />
|
<add key="FIREBIRD_DATABASE_NAME" value=""/>
|
||||||
<add key="FIREBIRD_DATABASE_USER" value="" />
|
<add key="FIREBIRD_DATABASE_USER" value=""/>
|
||||||
<add key="FIREBIRD_DATABASE_PASS" value="" />
|
<add key="FIREBIRD_DATABASE_PASS" value=""/>
|
||||||
<!-- END FIREBIRD SETTINGS -->
|
<!-- END FIREBIRD SETTINGS -->
|
||||||
|
|
||||||
<!-- DATASTORE SETTINGS -->
|
<!-- DATASTORE SETTINGS -->
|
||||||
@ -33,42 +31,36 @@
|
|||||||
<!-- END DATASTORE SETTINGS -->
|
<!-- END DATASTORE SETTINGS -->
|
||||||
|
|
||||||
<!-- CONTAINER SETTINGS -->
|
<!-- CONTAINER SETTINGS -->
|
||||||
<add key="CONTAINER_PATH" value="" />
|
<add key="CONTAINER_PATH" value=""/>
|
||||||
<add key="CONTAINER_PASSWORD" value="" />
|
<add key="CONTAINER_PASSWORD" value=""/>
|
||||||
<!-- END CONTAINER SETTINGS -->
|
<!-- END CONTAINER SETTINGS -->
|
||||||
</appSettings>
|
</appSettings>
|
||||||
<system.serviceModel>
|
<system.serviceModel>
|
||||||
<diagnostics wmiProviderEnabled="true">
|
<diagnostics wmiProviderEnabled="true">
|
||||||
<messageLogging logEntireMessage="true" logMalformedMessages="true"
|
<messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
|
||||||
logMessagesAtTransportLevel="true" />
|
<endToEndTracing propagateActivity="true" activityTracing="true" messageFlowTracing="true"/>
|
||||||
<endToEndTracing propagateActivity="true" activityTracing="true"
|
|
||||||
messageFlowTracing="true" />
|
|
||||||
</diagnostics>
|
</diagnostics>
|
||||||
<bindings>
|
<bindings>
|
||||||
<netTcpBinding>
|
<netTcpBinding>
|
||||||
<binding name="tcpBinding" sendTimeout="00:10:00" transferMode="Buffered"
|
<binding name="tcpBinding" sendTimeout="00:10:00" transferMode="Buffered" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
|
||||||
maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
|
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="2147483647"
|
|
||||||
maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
|
|
||||||
<security mode="None">
|
<security mode="None">
|
||||||
<transport clientCredentialType="None" />
|
<transport clientCredentialType="None"/>
|
||||||
</security>
|
</security>
|
||||||
</binding>
|
</binding>
|
||||||
</netTcpBinding>
|
</netTcpBinding>
|
||||||
</bindings>
|
</bindings>
|
||||||
<services>
|
<services>
|
||||||
<service behaviorConfiguration="DefaultServiceBehavior" name="DigitalData.Services.EDMIService.EDMIService">
|
<service behaviorConfiguration="DefaultServiceBehavior" name="DigitalData.Services.EDMIService.EDMIService">
|
||||||
<endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding"
|
<endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding" name="tcpBinding" contract="DigitalData.Services.EDMIService.IEDMIService">
|
||||||
name="tcpBinding" contract="DigitalData.Services.EDMIService.IEDMIService">
|
|
||||||
<identity>
|
<identity>
|
||||||
<dns value="localhost" />
|
<dns value="localhost"/>
|
||||||
</identity>
|
</identity>
|
||||||
</endpoint>
|
</endpoint>
|
||||||
<endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding"
|
<endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding" contract="IMetadataExchange"/>
|
||||||
contract="IMetadataExchange" />
|
|
||||||
<host>
|
<host>
|
||||||
<baseAddresses>
|
<baseAddresses>
|
||||||
<add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main" />
|
<add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main"/>
|
||||||
</baseAddresses>
|
</baseAddresses>
|
||||||
</host>
|
</host>
|
||||||
</service>
|
</service>
|
||||||
@ -76,15 +68,18 @@
|
|||||||
<behaviors>
|
<behaviors>
|
||||||
<serviceBehaviors>
|
<serviceBehaviors>
|
||||||
<behavior name="DefaultServiceBehavior">
|
<behavior name="DefaultServiceBehavior">
|
||||||
<serviceMetadata httpGetEnabled="false" />
|
<serviceMetadata httpGetEnabled="false"/>
|
||||||
<serviceDebug includeExceptionDetailInFaults="true" />
|
<serviceDebug includeExceptionDetailInFaults="true"/>
|
||||||
</behavior>
|
</behavior>
|
||||||
</serviceBehaviors>
|
</serviceBehaviors>
|
||||||
</behaviors>
|
</behaviors>
|
||||||
</system.serviceModel>
|
</system.serviceModel>
|
||||||
<system.data>
|
<runtime>
|
||||||
<DbProviderFactories>
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<remove invariant="FirebirdSql.Data.FirebirdClient" />
|
<dependentAssembly>
|
||||||
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
|
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
|
||||||
</DbProviderFactories>
|
<bindingRedirect oldVersion="0.0.0.0-6.5.0.0" newVersion="6.5.0.0"/>
|
||||||
</system.data></configuration>
|
</dependentAssembly>
|
||||||
|
</assemblyBinding>
|
||||||
|
</runtime>
|
||||||
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
|
||||||
|
|||||||
@ -132,167 +132,167 @@ Public Class EDMIService
|
|||||||
|
|
||||||
#End Region
|
#End Region
|
||||||
#Region "Document (with FileContainer)"
|
#Region "Document (with FileContainer)"
|
||||||
'Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMIService.NewFile
|
Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMIService.NewFile
|
||||||
' Try
|
Try
|
||||||
' Dim oContainer As FileContainer
|
Dim oContainer As FileContainer
|
||||||
' Dim oContainerId As String
|
Dim oContainerId As String
|
||||||
|
|
||||||
' If Not TestUserAuth() Then
|
If Not TestUserAuth() Then
|
||||||
' Throw New Exception($"User {_username} not authorized.")
|
Throw New Exception($"User {_username} not authorized.")
|
||||||
' End If
|
End If
|
||||||
|
|
||||||
' oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword)
|
oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword)
|
||||||
' oContainerId = oContainer.ContainerId
|
oContainerId = oContainer.ContainerId
|
||||||
' _logger.Debug("Container created with id {0}", oContainerId)
|
_logger.Debug("Container created with id {0}", oContainerId)
|
||||||
|
|
||||||
' Dim oExtension As String = Path.GetExtension(FileName).Substring(1)
|
Dim oExtension As String = Path.GetExtension(FileName).Substring(1)
|
||||||
' _logger.Debug("File extension of file {0} is {1}", FileName, oExtension)
|
_logger.Debug("File extension of file {0} is {1}", FileName, oExtension)
|
||||||
|
|
||||||
' Dim oSQL = $"SELECT FNICM_NEW_DOC('010', '{oContainerId}', '{GetContainerName(oContainerId)}', '{FileName}', '{oExtension}', '{_username}') FROM RDB$DATABASE;"
|
Dim oSQL = $"SELECT FNICM_NEW_DOC('010', '{oContainerId}', '{GetContainerName(oContainerId)}', '{FileName}', '{oExtension}', '{_username}') FROM RDB$DATABASE;"
|
||||||
' Dim oDocId As Int64 = Database.GetScalarValue(oSQL)
|
Dim oDocId As Int64 = Database.GetScalarValue(oSQL)
|
||||||
|
|
||||||
' If oDocId = -1 Then
|
If oDocId = -1 Then
|
||||||
' _logger.Warn("Database returned -1 while creating Document Entry. File was not saved!")
|
_logger.Warn("Database returned -1 while creating Document Entry. File was not saved!")
|
||||||
' Return Nothing
|
Return Nothing
|
||||||
' End If
|
End If
|
||||||
|
|
||||||
' _logger.Debug("Database Entry created with DocId {0}", oDocId)
|
_logger.Debug("Database Entry created with DocId {0}", oDocId)
|
||||||
|
|
||||||
' oContainer.SetFile(Contents, FileName)
|
oContainer.SetFile(Contents, FileName)
|
||||||
' oContainer.SaveAs(GetContainerPath(oContainerId))
|
oContainer.SaveAs(GetContainerPath(oContainerId))
|
||||||
|
|
||||||
' _logger.Debug("File saved in Container!", FileName)
|
_logger.Debug("File saved in Container!", FileName)
|
||||||
|
|
||||||
' Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName)
|
Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName)
|
||||||
' Return New DocumentResult(oDocument)
|
Return New DocumentResult(oDocument)
|
||||||
' Catch ex As Exception
|
Catch ex As Exception
|
||||||
' _logger.Error(ex)
|
_logger.Error(ex)
|
||||||
' Return New DocumentResult(ex.Message)
|
Return New DocumentResult(ex.Message)
|
||||||
' End Try
|
End Try
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
|
Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
|
||||||
' Try
|
Try
|
||||||
' TestFileExists(DocObject.ContainerId)
|
TestFileExists(DocObject.ContainerId)
|
||||||
|
|
||||||
' ' TODO: update db
|
' TODO: update db
|
||||||
|
|
||||||
' Dim oFilePath = GetContainerPath(DocObject.ContainerId)
|
Dim oFilePath = GetContainerPath(DocObject.ContainerId)
|
||||||
' Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
|
Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
|
||||||
|
|
||||||
' oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
|
oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
|
||||||
' oFileContainer.Save()
|
oFileContainer.Save()
|
||||||
|
|
||||||
|
|
||||||
' Return New DocumentResult(DocObject)
|
Return New DocumentResult(DocObject)
|
||||||
' Catch ex As Exception
|
Catch ex As Exception
|
||||||
' _logger.Error(ex)
|
_logger.Error(ex)
|
||||||
' Return Nothing
|
Return Nothing
|
||||||
' End Try
|
End Try
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMIService.GetFile
|
Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMIService.GetFile
|
||||||
' Try
|
Try
|
||||||
' TestFileExists(DocObject.ContainerId)
|
TestFileExists(DocObject.ContainerId)
|
||||||
|
|
||||||
' Dim oContainerPath = GetContainerPath(DocObject.ContainerId)
|
Dim oContainerPath = GetContainerPath(DocObject.ContainerId)
|
||||||
' Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
|
Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
|
||||||
' Dim oContents As Byte() = oContainer.GetFile().Contents
|
Dim oContents As Byte() = oContainer.GetFile().Contents
|
||||||
|
|
||||||
' Return New DocumentResult(DocObject, oContents)
|
Return New DocumentResult(DocObject, oContents)
|
||||||
' Catch ex As Exception
|
Catch ex As Exception
|
||||||
' _logger.Error(ex)
|
_logger.Error(ex)
|
||||||
' Return New DocumentResult(ex.Message)
|
Return New DocumentResult(ex.Message)
|
||||||
' End Try
|
End Try
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
|
Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
|
||||||
' Try
|
Try
|
||||||
' TestFileExists(DocObject.ContainerId)
|
TestFileExists(DocObject.ContainerId)
|
||||||
|
|
||||||
' Dim oFilePath = GetContainerPath(DocObject.ContainerId)
|
Dim oFilePath = GetContainerPath(DocObject.ContainerId)
|
||||||
' IO.File.Delete(oFilePath)
|
IO.File.Delete(oFilePath)
|
||||||
|
|
||||||
' 'TODO: Delete doc from db
|
'TODO: Delete doc from db
|
||||||
|
|
||||||
' Return True
|
Return True
|
||||||
' Catch ex As Exception
|
Catch ex As Exception
|
||||||
' _logger.Error(ex)
|
_logger.Error(ex)
|
||||||
' Return False
|
Return False
|
||||||
' End Try
|
End Try
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Private Function GetContainerPath(ContainerId As String) As String
|
Private Function GetContainerPath(ContainerId As String) As String
|
||||||
' Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId))
|
Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId))
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Private Function GetContainerName(ContainerId As String) As String
|
Private Function GetContainerName(ContainerId As String) As String
|
||||||
' Return ContainerId & ".enc"
|
Return ContainerId & ".enc"
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Private Sub TestFileExists(ContainerId)
|
Private Sub TestFileExists(ContainerId)
|
||||||
' Dim oContainerPath = GetContainerPath(ContainerId)
|
Dim oContainerPath = GetContainerPath(ContainerId)
|
||||||
|
|
||||||
' If Not IO.File.Exists(oContainerPath) Then
|
If Not IO.File.Exists(oContainerPath) Then
|
||||||
' Throw New FileNotFoundException("Container existiert nicht", oContainerPath)
|
Throw New FileNotFoundException("Container existiert nicht", oContainerPath)
|
||||||
' End If
|
End If
|
||||||
'End Sub
|
End Sub
|
||||||
|
|
||||||
'Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMIService.GetDocumentByDocumentId
|
Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMIService.GetDocumentByDocumentId
|
||||||
' Try
|
Try
|
||||||
' Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}"
|
Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}"
|
||||||
' Dim oTable = Database.GetDatatable(oSQL)
|
Dim oTable = Database.GetDatatable(oSQL)
|
||||||
|
|
||||||
' If oTable.Rows.Count = 0 Then
|
If oTable.Rows.Count = 0 Then
|
||||||
' Return New DocumentResult("Document not found")
|
Return New DocumentResult("Document not found")
|
||||||
' End If
|
End If
|
||||||
|
|
||||||
' Dim oRow As DataRow = oTable.Rows.Item(0)
|
Dim oRow As DataRow = oTable.Rows.Item(0)
|
||||||
' Dim oDocument As New DocumentObject(
|
Dim oDocument As New DocumentObject(
|
||||||
' oRow.Item("CONTAINER_ID"),
|
oRow.Item("CONTAINER_ID"),
|
||||||
' oRow.Item("GUID"),
|
oRow.Item("GUID"),
|
||||||
' oRow.Item("ORIGINAL_FILENAME")
|
oRow.Item("ORIGINAL_FILENAME")
|
||||||
' )
|
)
|
||||||
|
|
||||||
' TestFileExists(oDocument.ContainerId)
|
TestFileExists(oDocument.ContainerId)
|
||||||
|
|
||||||
' Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
|
Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
|
||||||
' Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
|
Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
|
||||||
' Dim oContents As Byte() = oContainer.GetFile().Contents
|
Dim oContents As Byte() = oContainer.GetFile().Contents
|
||||||
|
|
||||||
' Return New DocumentResult(oDocument, oContents)
|
Return New DocumentResult(oDocument, oContents)
|
||||||
' Catch ex As Exception
|
Catch ex As Exception
|
||||||
' Return New DocumentResult(ex.Message)
|
Return New DocumentResult(ex.Message)
|
||||||
' End Try
|
End Try
|
||||||
'End Function
|
End Function
|
||||||
|
|
||||||
'Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMIService.GetDocumentByContainerId
|
Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMIService.GetDocumentByContainerId
|
||||||
' Try
|
Try
|
||||||
' Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'"
|
Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'"
|
||||||
' Dim oTable = Database.GetDatatable(oSQL)
|
Dim oTable = Database.GetDatatable(oSQL)
|
||||||
|
|
||||||
' If oTable.Rows.Count = 0 Then
|
If oTable.Rows.Count = 0 Then
|
||||||
' Return New DocumentResult("Document not found")
|
Return New DocumentResult("Document not found")
|
||||||
' End If
|
End If
|
||||||
|
|
||||||
' Dim oRow As DataRow = oTable.Rows.Item(0)
|
Dim oRow As DataRow = oTable.Rows.Item(0)
|
||||||
' Dim oDocument As New DocumentObject(
|
Dim oDocument As New DocumentObject(
|
||||||
' oRow.Item("CONTAINER_ID"),
|
oRow.Item("CONTAINER_ID"),
|
||||||
' oRow.Item("GUID"),
|
oRow.Item("GUID"),
|
||||||
' oRow.Item("ORIGINAL_FILENAME")
|
oRow.Item("ORIGINAL_FILENAME")
|
||||||
' )
|
)
|
||||||
|
|
||||||
' TestFileExists(oDocument.ContainerId)
|
TestFileExists(oDocument.ContainerId)
|
||||||
|
|
||||||
' Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
|
Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
|
||||||
' Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
|
Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
|
||||||
' Dim oContents As Byte() = oContainer.GetFile().Contents
|
Dim oContents As Byte() = oContainer.GetFile().Contents
|
||||||
|
|
||||||
' Return New DocumentResult(oDocument, oContents)
|
Return New DocumentResult(oDocument, oContents)
|
||||||
' Catch ex As Exception
|
Catch ex As Exception
|
||||||
' Return New DocumentResult(ex.Message)
|
Return New DocumentResult(ex.Message)
|
||||||
' End Try
|
End Try
|
||||||
'End Function
|
End Function
|
||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
#Region "Document"
|
#Region "Document"
|
||||||
|
|||||||
@ -11,8 +11,24 @@
|
|||||||
<AssemblyName>EDMIService</AssemblyName>
|
<AssemblyName>EDMIService</AssemblyName>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<MyType>Console</MyType>
|
<MyType>Console</MyType>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
|
<PublishUrl>publish\</PublishUrl>
|
||||||
|
<Install>true</Install>
|
||||||
|
<InstallFrom>Disk</InstallFrom>
|
||||||
|
<UpdateEnabled>false</UpdateEnabled>
|
||||||
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
|
<UpdateInterval>7</UpdateInterval>
|
||||||
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||||
|
<UpdatePeriodically>false</UpdatePeriodically>
|
||||||
|
<UpdateRequired>false</UpdateRequired>
|
||||||
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
|
<ApplicationRevision>0</ApplicationRevision>
|
||||||
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||||
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||||
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
@ -47,12 +63,12 @@
|
|||||||
<OptionInfer>On</OptionInfer>
|
<OptionInfer>On</OptionInfer>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
|
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
|
||||||
<HintPath>..\..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
|
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||||
<HintPath>..\..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
|
<HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Configuration" />
|
<Reference Include="System.Configuration" />
|
||||||
@ -64,6 +80,7 @@
|
|||||||
<Reference Include="System.ServiceModel" />
|
<Reference Include="System.ServiceModel" />
|
||||||
<Reference Include="System.ServiceProcess" />
|
<Reference Include="System.ServiceProcess" />
|
||||||
<Reference Include="System.Transactions" />
|
<Reference Include="System.Transactions" />
|
||||||
|
<Reference Include="System.Web.Extensions" />
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Reference Include="System.Windows.Forms" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
@ -162,5 +179,17 @@
|
|||||||
<Name>Logging</Name>
|
<Name>Logging</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
|
||||||
|
<Install>true</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||||
|
<Install>false</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
@ -28,23 +28,23 @@ Interface IEDMIService
|
|||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
#Region "Document (with FileContainer)"
|
#Region "Document (with FileContainer)"
|
||||||
'<OperationContract>
|
<OperationContract>
|
||||||
'Function NewFile(FileName As String, Contents As Byte()) As DocumentResult
|
Function NewFile(FileName As String, Contents As Byte()) As DocumentResult
|
||||||
|
|
||||||
'<OperationContract>
|
<OperationContract>
|
||||||
'Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult
|
Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult
|
||||||
|
|
||||||
'<OperationContract>
|
<OperationContract>
|
||||||
'Function GetFile(DocObject As DocumentObject) As DocumentResult
|
Function GetFile(DocObject As DocumentObject) As DocumentResult
|
||||||
|
|
||||||
'<OperationContract>
|
<OperationContract>
|
||||||
'Function DeleteFile(DocObject As DocumentObject) As Boolean
|
Function DeleteFile(DocObject As DocumentObject) As Boolean
|
||||||
|
|
||||||
'<OperationContract>
|
<OperationContract>
|
||||||
'Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult
|
Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult
|
||||||
|
|
||||||
'<OperationContract>
|
<OperationContract>
|
||||||
'Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
|
Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
|
||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
#Region "Document (New)"
|
#Region "Document (New)"
|
||||||
|
|||||||
@ -22,7 +22,7 @@ Namespace My.Resources
|
|||||||
'''<summary>
|
'''<summary>
|
||||||
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _
|
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"), _
|
||||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||||
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
|
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
|
||||||
@ -39,7 +39,7 @@ Namespace My.Resources
|
|||||||
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
|
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
|
||||||
Get
|
Get
|
||||||
If Object.ReferenceEquals(resourceMan, Nothing) Then
|
If Object.ReferenceEquals(resourceMan, Nothing) Then
|
||||||
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.IDBService.Resources", GetType(Resources).Assembly)
|
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.EDMIService.Resources", GetType(Resources).Assembly)
|
||||||
resourceMan = temp
|
resourceMan = temp
|
||||||
End If
|
End If
|
||||||
Return resourceMan
|
Return resourceMan
|
||||||
|
|||||||
@ -15,7 +15,7 @@ Option Explicit On
|
|||||||
Namespace My
|
Namespace My
|
||||||
|
|
||||||
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _
|
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"), _
|
||||||
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||||
Partial Friend NotInheritable Class MySettings
|
Partial Friend NotInheritable Class MySettings
|
||||||
Inherits Global.System.Configuration.ApplicationSettingsBase
|
Inherits Global.System.Configuration.ApplicationSettingsBase
|
||||||
@ -62,8 +62,8 @@ Namespace My
|
|||||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
|
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
|
||||||
Friend Module MySettingsProperty
|
Friend Module MySettingsProperty
|
||||||
|
|
||||||
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
|
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
|
||||||
Friend ReadOnly Property Settings() As Global.DigitalData.Services.EDMIService.My.MySettings
|
Friend ReadOnly Property Settings() As Global.DigitalData.Services.EDMIService.My.MySettings
|
||||||
Get
|
Get
|
||||||
Return Global.DigitalData.Services.EDMIService.My.MySettings.Default
|
Return Global.DigitalData.Services.EDMIService.My.MySettings.Default
|
||||||
|
|||||||
@ -64,7 +64,7 @@ Public Class WindowsService
|
|||||||
|
|
||||||
_logger.Debug("Starting WCF ServiceHost...")
|
_logger.Debug("Starting WCF ServiceHost...")
|
||||||
|
|
||||||
_serviceHost = New ServiceHost(GetType(IEDMIService))
|
_serviceHost = New ServiceHost(GetType(EDMIService))
|
||||||
_serviceHost.Open()
|
_serviceHost.Open()
|
||||||
|
|
||||||
_logger.Debug("WCF ServiceHost started.")
|
_logger.Debug("WCF ServiceHost started.")
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
|
<package id="FirebirdSql.Data.FirebirdClient" version="6.5.0" targetFramework="net461" />
|
||||||
<package id="NLog" version="4.6.8" targetFramework="net461" />
|
<package id="NLog" version="4.7.0" targetFramework="net461" />
|
||||||
</packages>
|
</packages>
|
||||||
Loading…
x
Reference in New Issue
Block a user