From e48a90fab931f7b4bffb28224028dcb0a0b571b4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 2 Jul 2020 17:57:35 +0000 Subject: [PATCH] --- server/AyaNova/util/AyaNovaVersion.cs | 2 +- server/AyaNova/util/License.cs | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs index d501a288..d32fbb41 100644 --- a/server/AyaNova/util/AyaNovaVersion.cs +++ b/server/AyaNova/util/AyaNovaVersion.cs @@ -5,7 +5,7 @@ namespace AyaNova.Util /// internal static class AyaNovaVersion { - public const string VersionString = "8.0.0-alpha.6"; + public const string VersionString = "8.0.0-alpha.7"; public const string FullNameAndVersion = "AyaNova server " + VersionString; }//eoc }//eons \ No newline at end of file diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index f3ef0cae..2d2f0cf1 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -29,12 +29,14 @@ namespace AyaNova.Core { //License server address -#if (DEBUG) - // private const string LICENSE_SERVER_URL = "https://nothing.exqqwweerccbjhjtgfample.com/"; - private const string LICENSE_SERVER_URL = "http://localhost:3001/"; -#else private const string LICENSE_SERVER_URL = "https://rockfish.ayanova.com/"; -#endif + +// #if (DEBUG) +// // private const string LICENSE_SERVER_URL = "https://nothing.exqqwweerccbjhjtgfample.com/"; +// private const string LICENSE_SERVER_URL = "http://localhost:3001/"; +// #else +// private const string LICENSE_SERVER_URL = "https://rockfish.ayanova.com/"; +// #endif //Unlicensed token private const string UNLICENSED_TOKEN = "UNLICENSED"; @@ -497,15 +499,15 @@ namespace AyaNova.Core else log.LogInformation($"Fetching license for DBID {LicenseDbId}"); - var FetchRequest=new dtoFetchRequest(){DbId=LicenseDbId}; + var FetchRequest = new dtoFetchRequest() { DbId = LicenseDbId }; string sUrl = $"{LICENSE_SERVER_URL}rvf"; try { // string ResponseText = await ServiceProviderProvider.HttpClientFactory.CreateClient().GetStringAsync(sUrl); - + var content = new StringContent(JsonConvert.SerializeObject(FetchRequest), Encoding.UTF8, "application/json"); var client = ServiceProviderProvider.HttpClientFactory.CreateClient(); - var res = await client.PostAsync(sUrl, content); + var res = await client.PostAsync(sUrl, content); if (res.IsSuccessStatusCode) { var responseText = await res.Content.ReadAsStringAsync();