kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5036 from sbwalker/dev

Browse Source 
use fingerprint term consistently
This commit is contained in:
Shaun Walker 2025-01-29 10:42:34 -05:00 committed by GitHub
commit 4456e57466
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Oqtane.Server/Components/App.razor
View File

@ -39,7 +39,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="/" />
<link rel="stylesheet" href="css/app.css?v=@_hash" />
<link rel="stylesheet" href="css/app.css?v=@_fingerprint" />
@if (_scripts.Contains("PWA Manifest"))
{
<link id="app-manifest" rel="manifest" />
@ -70,15 +70,15 @@
}
<script src="_framework/blazor.web.js"></script>
<script src="js/app.js?v=@_hash"></script>
<script src="js/loadjs.min.js?v=@_hash"></script>
<script src="js/interop.js?v=@_hash"></script>
<script src="js/app.js?v=@_fingerprint"></script>
<script src="js/loadjs.min.js?v=@_fingerprint"></script>
<script src="js/interop.js?v=@_fingerprint"></script>
@((MarkupString)_scripts)
@((MarkupString)_bodyResources)
@if (_renderMode == RenderModes.Static)
{
<page-script src="./js/reload.js?v=@_hash"></page-script>
<page-script src="./js/reload.js?v=@_fingerprint"></page-script>
}
}
else
@ -94,7 +94,7 @@
private string _renderMode = RenderModes.Interactive;
private string _runtime = Runtimes.Server;
private bool _prerender = true;
private string _hash = "";
private string _fingerprint = "";
private int _visitorId = -1;
private string _antiForgeryToken = "";
private string _remoteIPAddress = "";
@ -137,7 +137,7 @@
_renderMode = site.RenderMode;
_runtime = site.Runtime;
_prerender = site.Prerender;
_hash = site.Hash;
_fingerprint = site.Fingerprint;
var modules = new List<Module>();

2
Oqtane.Server/Services/SiteService.cs
View File

@ -147,7 +147,7 @@ namespace Oqtane.Services
site.Themes = _themes.FilterThemes(_themes.GetThemes().ToList());
// installation date used for fingerprinting static assets
site.Hash = Utilities.GenerateSimpleHash(_configManager.GetSetting("InstallationDate", DateTime.UtcNow.ToString("yyyyMMddHHmm")));
site.Fingerprint = Utilities.GenerateSimpleHash(_configManager.GetSetting("InstallationDate", DateTime.UtcNow.ToString("yyyyMMddHHmm")));
}
else
{

6
Oqtane.Shared/Models/Site.cs
View File

@ -188,10 +188,10 @@ namespace Oqtane.Models
public List<Theme> Themes { get; set; }
/// <summary>
/// hash code for static assets
/// fingerprint for framework static assets
/// </summary>
[NotMapped]
public string Hash { get; set; }
public string Fingerprint { get; set; }
public Site Clone()
{
@ -234,7 +234,7 @@ namespace Oqtane.Models
Pages = Pages.ConvertAll(page => page.Clone()),
Languages = Languages.ConvertAll(language => language.Clone()),
Themes = Themes,
Hash = Hash
Fingerprint = Fingerprint
};
}