Ver Fonte

ServerNode的连接符由‘-’改为‘@’,因'-'可在域名中使用。修复更新包存在,但下载地址为空的问题。

felix há 1 ano atrás
pai
commit
f8793740ee

+ 3 - 3
Vinno.FIS.Sonopost/Assets/wwwroot/pages/server/login.html

@@ -182,7 +182,7 @@
             let res = await $api("server", "GetLoginInfo");
             if (!res.IsSuccess) return;
             let data = res.Data;
-            let serverNode = data.Address + ":" + data.Port + "-" + data.VCloudServerName;
+            let serverNode = data.Address + ":" + data.Port + "@" + data.VCloudServerName;
             form.val(formFilter, {
                 ServerNode: serverNode,
                 ServerAddress: data.Address,
@@ -228,7 +228,7 @@
             if (!res.IsSuccess) return;
             let options = [];
             res.Data.forEach((x) => {
-                options.push(`<option value="${x.Host}:${x.Port}-${x.DisplayName}">${$t(x.DisplayName)}</option>`);
+                options.push(`<option value="${x.Host}:${x.Port}@${x.DisplayName}">${$t(x.DisplayName)}</option>`);
 
             });
             options.push(
@@ -251,7 +251,7 @@
                     ip = "";
                 } else {
                     $("#pageLogin .custom-server-item").hide();
-                    let splitRst = ip.split('-');
+                    let splitRst = ip.split('@');
                     ip = splitRst[0];
                     if (splitRst.length > 1) {
                         serverName = splitRst[1];

+ 2 - 1
Vinno.vCloud.Common.FIS/Upgraders/UpgradersV2.cs

@@ -127,11 +127,12 @@ namespace Vinno.vCloud.Common.FIS.Upgraders
                 Version.TryParse(version, out currentVersion);
                 var latestVersion = new Version("1.0.0.0");
                 Version.TryParse(upgradeInfoResult.NewVersion, out latestVersion);
+                Logger.WriteLineWarn($"The Latest Version is {latestVersion} in server");
                 if (upgradeInfoResult.UpgradeType != UpgradeTypeEnum.NoUpgrade && latestVersion > currentVersion)
                 {
                     return new UpgradeInfo
                     {
-                        UpgradeUrl = upgradeInfoResult.UpgradeCDNUrl,
+                        UpgradeUrl = upgradeInfoResult.UpgradeCDNUrl ?? upgradeInfoResult.UpgradeSourceUrl,
                         UpgradeType = upgradeType,
                         UpgradePlatform = platform,
                     };