From 06a90d7810e0f709eb42bef7d5b881c3167a95e7 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 19 Dec 2017 11:44:34 +0100 Subject: [PATCH] system info --- Yavsc/Controllers/AdministrationController.cs | 7 ++++--- Yavsc/Startup/Startup.cs | 8 +++++++- Yavsc/Views/Administration/Index.cshtml | 12 ++++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Yavsc/Controllers/AdministrationController.cs b/Yavsc/Controllers/AdministrationController.cs index 1826c26f..6ecddbbb 100644 --- a/Yavsc/Controllers/AdministrationController.cs +++ b/Yavsc/Controllers/AdministrationController.cs @@ -108,9 +108,10 @@ namespace Yavsc.Controllers Name = x.Name, Users = x.Users.Select(u=>u.UserId).ToArray() }); - ViewBag.ThisAssembly = GetType().Assembly.FullName; - ViewBag.RunTimeVersion = GetType().Assembly.ImageRuntimeVersion; - + var assembly = GetType().Assembly; + ViewBag.ThisAssembly = assembly.FullName; + ViewBag.RunTimeVersion = assembly.ImageRuntimeVersion; + ViewBag.HostContextFullName = Startup.HostingFullName; return View(new AdminViewModel { Roles = roles.ToArray(), diff --git a/Yavsc/Startup/Startup.cs b/Yavsc/Startup/Startup.cs index 8881da41..37d9a1ad 100755 --- a/Yavsc/Startup/Startup.cs +++ b/Yavsc/Startup/Startup.cs @@ -43,13 +43,19 @@ namespace Yavsc public static string AvatarsDirName { private set; get; } public static string Authority { get; private set; } public static string Temp { get; set; } - public static string HomeViewName { get; set; } = "Home"; public static SiteSettings SiteSetup { get; private set; } + public static string HostingFullName { get; set; } + public static PayPalSettings PayPalSettings { get; private set; } private static ILogger logger; public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv) { + var devtag = env.IsDevelopment()?"D":""; + var prodtag = env.IsProduction()?"P":""; + var stagetag = env.IsStaging()?"S":""; + + HostingFullName = $"{appEnv.RuntimeFramework.FullName} [{env.EnvironmentName}:{prodtag}{devtag}{stagetag}]"; // Set up configuration sources. var builder = new ConfigurationBuilder() .AddJsonFile("appsettings.json") diff --git a/Yavsc/Views/Administration/Index.cshtml b/Yavsc/Views/Administration/Index.cshtml index c2a0aeb3..674f016e 100644 --- a/Yavsc/Views/Administration/Index.cshtml +++ b/Yavsc/Views/Administration/Index.cshtml @@ -22,9 +22,8 @@ Nombre
@Model.AdminCount

Utilisateurs

- - @Model.UserCount + @Model.UserCount utilisateurs enregistrés

Logiciel

@@ -32,9 +31,14 @@ Nombre
@Model.AdminCount
@ViewBag.ThisAssembly
-
Version du runtime +
Version du runtime
-
@ViewBag.RunTimeVersion +
@ViewBag.RunTimeVersion +
+ +
Hôte +
+
@ViewBag.HostContextFullName