diff --git a/AUTS_DataService/AUTS_DataService.vbproj b/AUTS_DataService/AUTS_DataService.vbproj index e7c48ee..bc8ea57 100644 --- a/AUTS_DataService/AUTS_DataService.vbproj +++ b/AUTS_DataService/AUTS_DataService.vbproj @@ -157,5 +157,11 @@ + + + {33C6456C-F00D-41AC-A6FB-DB0601495C6A} + UTS_Core + + \ No newline at end of file diff --git a/AUTS_DataService/Service1.vb b/AUTS_DataService/Service1.vb index 42d6ae9..1f4049c 100644 --- a/AUTS_DataService/Service1.vb +++ b/AUTS_DataService/Service1.vb @@ -614,6 +614,7 @@ Public Class Service1 Select Case command Case UtsWebPacket.Commands.Heartbeat + 'todo:此处需要处理心跳包,获取公网IP与ftp地址 DealHeartbeatPacket(param) Case UtsWebPacket.Commands.SetLogType diff --git a/AUTS_ProductEntry/obj/Release/AUTS_ProductEntry.vbproj.AssemblyReference.cache b/AUTS_ProductEntry/obj/Release/AUTS_ProductEntry.vbproj.AssemblyReference.cache index 4285da8..ebff5b6 100644 Binary files a/AUTS_ProductEntry/obj/Release/AUTS_ProductEntry.vbproj.AssemblyReference.cache and b/AUTS_ProductEntry/obj/Release/AUTS_ProductEntry.vbproj.AssemblyReference.cache differ diff --git a/AUTS_ServiceControler/.vs/AUTS_ServiceControler.vbproj.dtbcache.json b/AUTS_ServiceControler/.vs/AUTS_ServiceControler.vbproj.dtbcache.json index cc7a6db..cfc68df 100644 --- a/AUTS_ServiceControler/.vs/AUTS_ServiceControler.vbproj.dtbcache.json +++ b/AUTS_ServiceControler/.vs/AUTS_ServiceControler.vbproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"D:\\ML\\Wen\\AUTS\\AUTS_ServiceControler","ProjectFileName":"AUTS_ServiceControler.vbproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ApplicationEvents.vb"},{"SourceFile":"CheckSum.vb"},{"SourceFile":"FrmAddTask.Designer.vb"},{"SourceFile":"FrmAddTask.vb"},{"SourceFile":"FrmListenTasks.Designer.vb"},{"SourceFile":"FrmListenTasks.vb"},{"SourceFile":"FrmMain.Designer.vb"},{"SourceFile":"FrmMain.vb"},{"SourceFile":"FrmSyncTasks.Designer.vb"},{"SourceFile":"FrmSyncTasks.vb"},{"SourceFile":"FrmTasksDbType.Designer.vb"},{"SourceFile":"FrmTasksDbType.vb"},{"SourceFile":"FrmUpdateConfig.Designer.vb"},{"SourceFile":"FrmUpdateConfig.vb"},{"SourceFile":"IDataPacket.vb"},{"SourceFile":"ITaskForm.vb"},{"SourceFile":"License.vb"},{"SourceFile":"My Project\\AssemblyInfo.vb"},{"SourceFile":"My Project\\Application.Designer.vb"},{"SourceFile":"My Project\\Resources.Designer.vb"},{"SourceFile":"My Project\\Settings.Designer.vb"},{"SourceFile":"ServiceRegister.vb"},{"SourceFile":"TaskForms.vb"},{"SourceFile":"UpdatePackageInfo.vb"},{"SourceFile":"UtsService.vb"},{"SourceFile":"UtsWebPacket.vb"},{"SourceFile":"WinService.vb"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.vb"}],"References":[{"Reference":"D:\\ML\\Wen\\AUTS\\AUTS_ServiceControler\\bin\\Debug\\FlexCell.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\ML\\Wen\\AUTS\\AUTS_UpdateService\\FluentFTP.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\ML\\Wen\\AUTS\\packages\\System.CodeDom.6.0.0\\lib\\net461\\System.CodeDom.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceProcess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\ML\\Wen\\AUTS\\UTS_Core\\bin\\Debug\\UTS_Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\ML\\Wen\\AUTS\\AUTS_ServiceControler\\bin\\Debug\\AUTS_SeviceControler.exe","OutputItemRelativePath":"AUTS_SeviceControler.exe"},{"OutputItemFullPath":"D:\\ML\\Wen\\AUTS\\AUTS_ServiceControler\\bin\\Debug\\AUTS_SeviceControler.pdb","OutputItemRelativePath":"AUTS_SeviceControler.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"G:\\Git\\AUTS\\AUTS_ServiceControler","ProjectFileName":"AUTS_ServiceControler.vbproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ApplicationEvents.vb"},{"SourceFile":"CheckSum.vb"},{"SourceFile":"FrmAddTask.Designer.vb"},{"SourceFile":"FrmAddTask.vb"},{"SourceFile":"FrmListenTasks.Designer.vb"},{"SourceFile":"FrmListenTasks.vb"},{"SourceFile":"FrmMain.Designer.vb"},{"SourceFile":"FrmMain.vb"},{"SourceFile":"FrmSyncTasks.Designer.vb"},{"SourceFile":"FrmSyncTasks.vb"},{"SourceFile":"FrmTasksDbType.Designer.vb"},{"SourceFile":"FrmTasksDbType.vb"},{"SourceFile":"FrmUpdateConfig.Designer.vb"},{"SourceFile":"FrmUpdateConfig.vb"},{"SourceFile":"IDataPacket.vb"},{"SourceFile":"ITaskForm.vb"},{"SourceFile":"License.vb"},{"SourceFile":"My Project\\AssemblyInfo.vb"},{"SourceFile":"My Project\\Application.Designer.vb"},{"SourceFile":"My Project\\Resources.Designer.vb"},{"SourceFile":"My Project\\Settings.Designer.vb"},{"SourceFile":"ServiceRegister.vb"},{"SourceFile":"TaskForms.vb"},{"SourceFile":"UpdatePackageInfo.vb"},{"SourceFile":"UtsService.vb"},{"SourceFile":"UtsWebPacket.vb"},{"SourceFile":"WinService.vb"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.vb"}],"References":[{"Reference":"C:\\Program Files (x86)\\FlexCell Technologies\\FlexCell.NET4\\bin\\FlexCell.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\Git\\AUTS\\AUTS_UpdateService\\FluentFTP.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\Git\\AUTS\\packages\\System.CodeDom.6.0.0\\lib\\net461\\System.CodeDom.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceProcess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"G:\\Git\\AUTS\\AUTS_ServiceControler\\bin\\Debug\\AUTS_SeviceControler.exe","OutputItemRelativePath":"AUTS_SeviceControler.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/AUTS_ServiceControler/AUTS_ServiceControler.vbproj b/AUTS_ServiceControler/AUTS_ServiceControler.vbproj index 76726ca..a658d95 100644 --- a/AUTS_ServiceControler/AUTS_ServiceControler.vbproj +++ b/AUTS_ServiceControler/AUTS_ServiceControler.vbproj @@ -237,5 +237,14 @@ + + + + + + {33C6456C-F00D-41AC-A6FB-DB0601495C6A} + UTS_Core + + \ No newline at end of file diff --git a/AUTS_ServiceControler/FrmUpdateConfig.vb b/AUTS_ServiceControler/FrmUpdateConfig.vb index 4537ea3..49f8446 100644 --- a/AUTS_ServiceControler/FrmUpdateConfig.vb +++ b/AUTS_ServiceControler/FrmUpdateConfig.vb @@ -513,7 +513,10 @@ Public Class FrmUpdateConfig ''' 一键更新 ''' Private Sub InstallUpdateService(Optional AlisaName As String = "") - If GetUtsHost() = False Then Return '根据License信息,获取服务器地址 + 'todo：云端获取服务器地址写入注册表 + 'If GetUtsHost() = False Then Return '根据License信息,获取服务器地址 + + '校验License UpdateInstallTip(20, "Begin CheckLicense...") diff --git a/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 715d185..9032a2f 100644 Binary files a/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_UpdateService/AUTS_UpdateService.vbproj b/AUTS_UpdateService/AUTS_UpdateService.vbproj index ff8fa57..593f283 100644 --- a/AUTS_UpdateService/AUTS_UpdateService.vbproj +++ b/AUTS_UpdateService/AUTS_UpdateService.vbproj @@ -185,5 +185,11 @@ false + + + {33C6456C-F00D-41AC-A6FB-DB0601495C6A} + UTS_Core + + \ No newline at end of file diff --git a/AUTS_UpdateService/My Project/AssemblyInfo.vb b/AUTS_UpdateService/My Project/AssemblyInfo.vb index 6fed7cc..91d729a 100644 --- a/AUTS_UpdateService/My Project/AssemblyInfo.vb +++ b/AUTS_UpdateService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*"，如下所示: ' - - + + diff --git a/AUTS_Win/My Project/AssemblyInfo.vb b/AUTS_Win/My Project/AssemblyInfo.vb index dd63d29..6346124 100644 --- a/AUTS_Win/My Project/AssemblyInfo.vb +++ b/AUTS_Win/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*"，如下所示: ' - - + + diff --git a/AUTS_Win/bin/Debug/AUTS_Win.exe b/AUTS_Win/bin/Debug/AUTS_Win.exe index 0e079c3..0339b81 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.exe and b/AUTS_Win/bin/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.pdb b/AUTS_Win/bin/Debug/AUTS_Win.pdb index 342c098..3f17e89 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.pdb and b/AUTS_Win/bin/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.dll b/AUTS_Win/bin/Debug/UTS_Core.dll index a90ae98..553607e 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.dll and b/AUTS_Win/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.pdb b/AUTS_Win/bin/Debug/UTS_Core.pdb index 4cf2942..f25a1ee 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.pdb and b/AUTS_Win/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index 0e079c3..0339b81 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.exe and b/AUTS_Win/obj/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.pdb b/AUTS_Win/obj/Debug/AUTS_Win.pdb index 342c098..3f17e89 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.pdb and b/AUTS_Win/obj/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache index 111ef39..148ea3e 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache index 4f11396..7fa10d5 100644 --- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache +++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -ca48ce1c02fb0262258d0d8953c37f0ec8538e6954f3dfb45d4c80f6c5c96622 +f016d1be56f6fedc61741e9fdbb1f0d49638d13457a53b051aea0362c5491bcc diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt index 8abbc1e..6d526c4 100644 --- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt +++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt @@ -183,4 +183,17 @@ G:\Git\AUTS\AUTS_Win\bin\Debug\System.Buffers.xml G:\Git\AUTS\AUTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml G:\Git\AUTS\AUTS_Win\bin\Debug\System.Numerics.Vectors.xml G:\Git\AUTS\AUTS_Win\bin\Debug\System.Threading.Tasks.Extensions.xml +G:\Git\AUTS\AUTS_Win\bin\Debug\Google.Protobuf.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\Zstandard.Net.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\BouncyCastle.Crypto.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\Ubiety.Dns.Core.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Compression.LZ4.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Hash.xxHash.dll +G:\Git\AUTS\AUTS_Win\bin\Debug\MySql.Data.xml +G:\Git\AUTS\AUTS_Win\bin\Debug\Google.Protobuf.pdb +G:\Git\AUTS\AUTS_Win\bin\Debug\Google.Protobuf.xml +G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.xml +G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Compression.LZ4.xml +G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Hash.xxHash.xml G:\Git\AUTS\AUTS_Win\obj\Debug\AUTS_Win.exe.config diff --git a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 62a6425..f3c0fdc 100644 Binary files a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Document/Hash.exe b/Document/Hash.exe new file mode 100644 index 0000000..1d088f2 Binary files /dev/null and b/Document/Hash.exe differ diff --git a/UTS_Core/UTSModule/FtpService.vb b/UTS_Core/UTSModule/FtpService.vb index 11ea8c8..4193e8e 100644 --- a/UTS_Core/UTSModule/FtpService.vb +++ b/UTS_Core/UTSModule/FtpService.vb @@ -1,4 +1,5 @@ -Imports FluentFTP +Imports System.Text +Imports FluentFTP Namespace UTSModule Public Class FtpService @@ -41,7 +42,10 @@ Namespace UTSModule Dim result As Boolean Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 + ftpClient.Connect() ftpClient.Disconnect() End Using @@ -59,7 +63,10 @@ Namespace UTSModule Dim result As Boolean Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 + ftpClient.Connect() result = ftpClient.FileExists(path) @@ -78,7 +85,10 @@ Namespace UTSModule Public Sub FtpUpload(remotePath As String, loadPath As String) Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 + ftpClient.Connect() ftpClient.UploadFile(loadPath, remotePath, FtpRemoteExists.Overwrite, True) ftpClient.Disconnect() @@ -93,7 +103,10 @@ Namespace UTSModule Public Sub FtpDownload(remotePath As String, loadPath As String) Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 + ftpClient.Connect() ftpClient.DownloadFile(loadPath, remotePath) ftpClient.Disconnect() diff --git a/UTS_Core/UTSModule/UtsFtp.vb b/UTS_Core/UTSModule/UtsFtp.vb index 647616a..a72dfc9 100644 --- a/UTS_Core/UTSModule/UtsFtp.vb +++ b/UTS_Core/UTSModule/UtsFtp.vb @@ -1,4 +1,5 @@ -Imports System.Threading +Imports System.Text +Imports System.Threading Imports FluentFTP Namespace UTSModule @@ -76,7 +77,9 @@ Namespace UTSModule Dim result As Boolean Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 ftpClient.Connect() result = ftpClient.FileExists(path) @@ -95,7 +98,9 @@ Namespace UTSModule Public Sub CreateDir(remoteDir As String, Optional force As Boolean = False) Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 ftpClient.Connect() ftpClient.CreateDirectory(remoteDir, force) ftpClient.Disconnect() @@ -110,7 +115,9 @@ Namespace UTSModule Public Sub FtpUpload(remotePath As String, loadPath As String) Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 ftpClient.Connect() ftpClient.UploadFile(loadPath, remotePath, FtpRemoteExists.Overwrite, True) ftpClient.Disconnect() @@ -125,7 +132,10 @@ Namespace UTSModule Public Sub FtpDownload(remotePath As String, loadPath As String) Using ftpClient As FtpClient = New FtpClient(_ftpHost, _ftpPort, _ftpUser, _ftpPwd) AddHandler ftpClient.ValidateCertificate, AddressOf OnValidateCertificate - ftpClient.EncryptionMode = FtpEncryptionMode.Auto + ftpClient.EncryptionMode = FtpEncryptionMode.None + ftpClient.DataConnectionType = FtpDataConnectionType.PASV + ftpClient.Encoding = Encoding.UTF8 + ftpClient.Connect() ftpClient.DownloadFile(loadPath, remotePath) ftpClient.Disconnect() diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index a90ae98..553607e 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.dll and b/UTS_Core/bin/Debug/UTS_Core.dll differ diff --git a/UTS_Core/bin/Debug/UTS_Core.pdb b/UTS_Core/bin/Debug/UTS_Core.pdb index 4cf2942..f25a1ee 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.pdb and b/UTS_Core/bin/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.dll b/UTS_Core/obj/Debug/UTS_Core.dll index a90ae98..553607e 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.dll and b/UTS_Core/obj/Debug/UTS_Core.dll differ diff --git a/UTS_Core/obj/Debug/UTS_Core.pdb b/UTS_Core/obj/Debug/UTS_Core.pdb index 4cf2942..f25a1ee 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.pdb and b/UTS_Core/obj/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache index a93bdea..da694cd 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache and b/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache differ