Egalware/limanapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok display prima apgina elenco applicazioni

Browse Source
This commit is contained in:
Samuele Locatelli
2021-10-08 08:17:29 +02:00
parent 216dde85b4
commit bc3aa86d8f
14 changed files with 178 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiMan.DL/DatabaseModels/LicManContext.cs
+10 -20
View File
@@ -20,6 +20,7 @@ namespace LiMan.DL.DatabaseModels
#region Public Constructors
[Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")]
public LicManContext()
{
}
@@ -70,28 +71,17 @@ namespace LiMan.DL.DatabaseModels
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
// default
string connString = "Server=SQLSTEAM;Database=SteamWare_Auth;Trusted_Connection=True;";
// tento setup da config
try
{
string srv = _configuration["DbConfig:srv"];
string db = _configuration["DbConfig:db"];
string usr = _configuration["DbConfig:usr"];
string pwd = _configuration["DbConfig:pwd"];
//DbConfig.InitDb(server, nKey, sKey);
//DbConfig.CheckUser(nKey, sKey);
// uso conn string calcolata
connString = $"Server={srv};Database={db};User ID={usr}Password={pwd};";
}
catch
{ }
if (!optionsBuilder.IsConfigured)
{
optionsBuilder.UseSqlServer(connString);
string connString = _configuration.GetConnectionString("LiMan.DB");
if (!string.IsNullOrEmpty(connString))
{
optionsBuilder.UseSqlServer(connString);
}
else
{
optionsBuilder.UseSqlServer("Server=SQLSTEAM;Database=SteamWare_Auth;Trusted_Connection=True;");
}
}
}
LiMan.UI/Data/LiManDataService.cs
+2 -1
View File
@@ -59,7 +59,7 @@ namespace LiMan.UI.Data
this.memoryCache = memoryCache;
this.distributedCache = distributedCache;
// conf DB
string connStr = _configuration.GetConnectionString("GWMS.Data");
string connStr = _configuration.GetConnectionString("LiMan.DB");
if (string.IsNullOrEmpty(connStr))
{
_logger.LogError("ConnString empty!");
@@ -67,6 +67,7 @@ namespace LiMan.UI.Data
else
{
dbController = new LiMan.DL.Controllers.LicManController(configuration);
_logger.LogInformation("DbController OK");
}
}
LiMan.UI/NLog.config
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
<!-- optional, add some variables
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue" />
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
<target xsi:type="File" name="fileTarget" fileName="${basedir}/logs/${shortdate}.log" layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=false} | ${message}" />
<target xsi:type="ColoredConsole" name="consoleTarget" layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=true}| ${message}" />
</targets>
<rules>
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
<logger name="*" minlevel="Trace" writeTo="consoleTarget" />
<!--<logger name="Microsoft.*" maxlevel="Info" final="true" />-->
<logger name="*" minlevel="Info" writeTo="fileTarget" />
</rules>
</nlog>
LiMan.UI/Pages/Applicazioni.razor
+2 -2
View File
@@ -107,7 +107,7 @@
</div>*@
</div>
</div>
<div class="card-body p-1">
<div class="card-body py-1">
@if (currRecord != null)
{
@*<FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" TagList="@TagList" MacList="@MacList"></FileEditor>*@
@@ -164,7 +164,7 @@
</div>
}
</div>
<div class="card-footer p-1">
<div class="card-footer py-1">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
</div>
</div>
LiMan.UI/Pages/_Host.cshtml
+3 -3
View File
@@ -17,7 +17,7 @@
<title>LiMan.UI</title>
<base href="~/" />
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="font-awesome/css/fontawesome.min.css" />
<link rel="stylesheet" href="lib/font-awesome/css/fontawesome.min.css" />
<link href="css/site.min.css" rel="stylesheet" />
<link href="LiMan.UI.styles.css" rel="stylesheet" />
</head>
@@ -37,8 +37,8 @@
<!-- inside of body section and after the div/app tag -->
<script src="jquery/jquery.min.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script>
<script src="font-awesome/js/all.min.js"></script>
<script src="lib/bootstrap/js/bootstrap.min.js"></script>
<script src="lib/font-awesome/js/all.min.js"></script>
<script src="_framework/blazor.server.js"></script>
</body>
</html>
LiMan.UI/Resources/ChangeLog-original.html
+27
View File
@@ -0,0 +1,27 @@
<body>
<i>License Manager</i>
<h4>Versione: {{CURRENT-REL}}</h4>
<br />
Note di rilascio:
<ul>
<li>
<b>Ultime modifiche:</b>
<ul>{{LAST-CHANGES}}</ul>
</li>
<li>
<b>v.1.* &rarr;</b>
<ul>
<li>Prima release dotnet5</li>
<li>Integrazione EFCore</li>
</ul>
</li>
</ul>
<div>
<div style="float: left;">
<img src="logoSteamware.png" />
</div>
<div style="float: right;">
<a href="https://www.steamware.net/" target="_blank">&copy; Steamware 2006-2021</a>
</div>
</div>
</body>
LiMan.UI/Resources/ChangeLog.html
+27
View File
@@ -0,0 +1,27 @@
<body>
<i>Modulo License Manager</i>
<h4>Versione: 6.14.2109.3016</h4>
<br />
Note di rilascio:
<ul>
<li>
<b>Ultime modifiche:</b>
<ul>{{LAST-CHANGES}}</ul>
</li>
<li>
<b>v.1.* &rarr;</b>
<ul>
<li>Prima release dotnet5</li>
<li>Integrazione EFCore</li>
</ul>
</li>
</ul>
<div>
<div style="float: left;">
<img src="logoSteamware.png" />
</div>
<div style="float: right;">
<a href="https://www.steamware.net/" target="_blank">&copy; Steamware 2006-2021</a>
</div>
</div>
</body>
LiMan.UI/Resources/VersNum.txt
+1
View File
@@ -0,0 +1 @@
6.14.2109.3016
LiMan.UI/Resources/logoSteamware.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

LiMan.UI/Resources/manifest-original.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.0.0</version>
<url>https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>
LiMan.UI/Resources/manifest.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.14.2109.3016</version>
<url>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>
LiMan.UI/appsettings.json
+13 -8
View File
@@ -1,10 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnection": "Server=SQL2016DEV;Database=SteamWare_Auth;User ID=sa;Password=keyhammer;integrated security=False;MultipleActiveResultSets=True;App=LiMan.UI;",
"LiMan.DB": "Server=SQLSTEAM;Database=SteamWare_Auth;User ID=sa;Password=keyhammer;integrated security=False;MultipleActiveResultSets=True;App=LiMan.UI;",
"Redis": "localhost:6379"
}
},
"AllowedHosts": "*"
}
}
LiMan.UI/post-build.ps1
+32
View File
@@ -0,0 +1,32 @@
param([string]$ProjectDir, [string]$ProjectPath);
$FileMajMin = "..\MajMin.vers"
$FileVers = "Resources\VersNum.txt"
$FileManIn = "Resources\manifest-original.xml"
$FileManOut = "Resources\manifest.xml"
$FileCLogIn = "Resources\ChangeLog-original.html"
$FileCLogOut = "Resources\ChangeLog.html"
$MajMin = Get-Content $FileMajMin # "6.14."
$currentDate = get-date -format yyMM;
$currentTime = get-date -format ddHH;
$find = "<Version>(.|\n)*?</Version>";
$currRelNum = $MajMin + $currentDate +"." + $currentTime
$replace = "<Version>" + $MajMin + $currentDate +"." + $currentTime + "</Version>";
$csproj = Get-Content $ProjectPath
$csprojUpdated = $csproj -replace $find, $replace
Set-Content -Path $ProjectPath -Value $csprojUpdated
Set-Content -Path $FileVers -Value $currRelNum
# replace x manifest
$manData = Get-Content $FileManIn
$manData = $manData -replace "1.0.0.0", $currRelNum
$manData = $manData -replace "{{DIRNAME}}", "LiMan"
$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST"
$manData = $manData -replace "{{PACKNAME}}", "LiMan.UI"
Set-Content -Path $FileManOut -Value $manData
# replace x ChangeLog
$clogData = Get-Content $FileCLogIn
$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum
Set-Content -Path $FileCLogOut -Value $clogData
MajMin.vers
+1
View File
@@ -0,0 +1 @@
6.14.