1, ServiceController 中dbHost和ftpHost写入注册并步骤前置到lic验证之后
2,Testplan隐藏行改为对高度设置来实现
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
Imports System.Net
|
||||
Imports System.Net.Sockets
|
||||
Imports System.Text
|
||||
Imports FluentFTP
|
||||
Imports UTS_Core.Database
|
||||
Imports UTS_Core.Security
|
||||
Imports UTS_Core.UTSModule
|
||||
@@ -370,14 +371,15 @@ Public Class FrmUpdateConfig
|
||||
''' 获取更新服务的最新信息
|
||||
''' </summary>
|
||||
Private Function GetUpdateServiceInfo(serviceName As String) As UpdatePackageInfo
|
||||
|
||||
MsgBox("DbConnector.CanConnectToRemote = " & DbConnector.CanConnectToRemote)
|
||||
If DbConnector.CanConnectToRemote = False Then '判断网络连接状态
|
||||
Throw New Exception($"无法连接到数据库!")
|
||||
End If
|
||||
|
||||
Using db As New DbExecutor(UtsDb.RemoteDbType, UtsDb.RemoteConnString)
|
||||
MsgBox("DBOpen = " & UtsDb.RemoteDbType & " , " & UtsDb.RemoteConnString)
|
||||
db.Open()
|
||||
|
||||
MsgBox("DBOpened")
|
||||
Dim tableName As String = $"{SwUpdateTable.TableName}"
|
||||
Dim colNames As New List(Of String) From {
|
||||
$"{SwUpdateTable.ColNamesEnum.LastVersion}",
|
||||
@@ -386,16 +388,18 @@ Public Class FrmUpdateConfig
|
||||
}
|
||||
Dim condition As String = $"`{SwUpdateTable.ColNamesEnum.SoftwareName}` = '{serviceName}'"
|
||||
|
||||
MsgBox("dtServiceInfo = " & condition)
|
||||
Dim dtServiceInfo As DataTable = db.ExecuteDataTable(db.CmdHelper.DbSearch(UtsDb.RemotePublicDb, colNames, tableName, condition))
|
||||
If dtServiceInfo.Rows.Count <= 0 Then
|
||||
Throw New Exception($"从数据库获取不到{serviceName}的信息!")
|
||||
End If
|
||||
|
||||
MsgBox("Step369")
|
||||
Dim packetInfo As New UpdatePackageInfo
|
||||
packetInfo.BinPackageMd5 = CStr(dtServiceInfo(0)($"{SwUpdateTable.ColNamesEnum.BinPackageMd5}"))
|
||||
packetInfo.LastVersion = CStr(dtServiceInfo(0)($"{SwUpdateTable.ColNamesEnum.LastVersion}"))
|
||||
packetInfo.PackageName = CStr(dtServiceInfo(0)($"{SwUpdateTable.ColNamesEnum.PackageName}"))
|
||||
|
||||
MsgBox("Step401")
|
||||
db.Close()
|
||||
Return packetInfo
|
||||
End Using
|
||||
@@ -517,7 +521,6 @@ Public Class FrmUpdateConfig
|
||||
'If GetUtsHost() = False Then Return '根据License信息,获取服务器地址
|
||||
|
||||
|
||||
|
||||
'校验License
|
||||
UpdateInstallTip(20, "Begin CheckLicense...")
|
||||
_license = New License(_destLicenseFilePath)
|
||||
@@ -526,12 +529,17 @@ Public Class FrmUpdateConfig
|
||||
|
||||
UpdateInstallTip(25, "CheckLicense Success!")
|
||||
|
||||
_ftpClient = New FtpService(UtsRegistry.FtpHost, CInt(_license.FtpPort), _license.FtpUser, _license.FtpPwd)
|
||||
UtsRegistry.FtpHost = _license.FtpHost '写入注册表
|
||||
UtsRegistry.DbHost = _license.MysqlServer '写入注册表
|
||||
|
||||
|
||||
_ftpClient = New FtpService(_license.FtpHost, CInt(_license.FtpPort), _license.FtpUser, _license.FtpPwd)
|
||||
|
||||
'获取远程数据库内容
|
||||
Dim packetInfo As UpdatePackageInfo = GetUpdateServiceInfo(UpdateServiceName)
|
||||
|
||||
'检测服务存在
|
||||
|
||||
If WinService.ServicesExists(UpdateServiceName) Then
|
||||
'Dim updateSerVer As String = UtsRegistry.UpdateServiceVersion
|
||||
'If NeedToUpdateService(updateSerVer, packetInfo.LastVersion) = False Then
|
||||
|
||||
Reference in New Issue
Block a user