From ec7e642cd8ce7af5255aa9099eee7467b79c6a35 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 20 Feb 2020 17:58:26 +0100 Subject: [PATCH] Completato update con NUOVE libs steamware spacchettate --- .../SteamWare_demo/example-NLog.config | 31 ----------- .../SteamWare_demo/example-app.config | 17 ------ .../SteamWare_demo/example-config-table.txt | 30 ----------- .../Controllers/PrintQueueConfController.cs | 9 +--- MP-MAG/Controllers/PrintQueueController.cs | 7 +-- MP-MAG/Controllers/ReportController.cs | 7 +-- MP-MAG/MP-MAG.csproj | 50 ++++-------------- MP-MAG/Web.config | 12 +---- MP-MAG/packages.config | 12 ++--- MagData/App_Readme/README_SteamWare.txt | 12 +++++ .../SteamWare_demo/example-favicon.ico | Bin 0 -> 31702 bytes 11 files changed, 36 insertions(+), 151 deletions(-) delete mode 100644 MP-MAG/App_Readme/SteamWare_demo/example-NLog.config delete mode 100644 MP-MAG/App_Readme/SteamWare_demo/example-app.config delete mode 100644 MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt create mode 100644 MagData/App_Readme/README_SteamWare.txt create mode 100644 MagData/App_Readme/SteamWare_demo/example-favicon.ico diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config b/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config deleted file mode 100644 index a11a39e..0000000 --- a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-app.config b/MP-MAG/App_Readme/SteamWare_demo/example-app.config deleted file mode 100644 index fb42165..0000000 --- a/MP-MAG/App_Readme/SteamWare_demo/example-app.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt b/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt deleted file mode 100644 index dd0ab8e..0000000 --- a/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt +++ /dev/null @@ -1,30 +0,0 @@ -# chiave valore valoreStd note -_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net -_allowForceUser true true abilita login forzato -_commonPages menu menu pagina comune -_emailPwd drmfsls16 drmfsls16 drmfsls16 -_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com -_enableSSL true true true -_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg -_righeDataGrid 30 30 Num righe datagrid std -_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche -_righeDataGridLong 30 30 Num righe datagrid long -_righeDataGridMed 15 15 Num righe datagrid med -_righeDataGridShort 10 10 Num righe datagrid short -_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com -_useAIMSmtp false false impiego client posta elettronica alternativo -_useAuthSmtp true true true -AuthCookieName admodellingAuth admodellingAuth Cookie applicativo -autoConfCmd true true Conferma automatica comandi barcode -baseUrl http://site_name http://iis02/site_name URL base del sito -cacheValSec 60 60 Validità cache dati in gestore Barcode -cookieDayExp 365 365 Periodo validità cookie -cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati -enableCookie true true Abilitazione uso cookie -enableLogOut true false Abilita button logout COMPLETO in alto a sx -enablePlain true true Abilitazione decode plain -maxAuth 1000 1000 num auth minimo per NON consumare tokens -serializeSession true true Serializzazione valori in sessione (REDIS) -SiteName iis02/site_name iis02/site_name Nome sito -enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default -doShrinkFolder true true Imposta compressione area LOGS \ No newline at end of file diff --git a/MP-MAG/Controllers/PrintQueueConfController.cs b/MP-MAG/Controllers/PrintQueueConfController.cs index bf059a9..40f924c 100644 --- a/MP-MAG/Controllers/PrintQueueConfController.cs +++ b/MP-MAG/Controllers/PrintQueueConfController.cs @@ -1,12 +1,5 @@ -using Newtonsoft.Json; -using SteamWare; -using System; +using SteamWare.Reports; using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Web; using System.Web.Http; namespace MP_API.Controllers diff --git a/MP-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs index ed025f4..3db9f5c 100644 --- a/MP-MAG/Controllers/PrintQueueController.cs +++ b/MP-MAG/Controllers/PrintQueueController.cs @@ -1,6 +1,7 @@ using MagData; using Newtonsoft.Json; -using SteamWare; +using SteamWare.IO; +using SteamWare.Reports; using System; using System.Collections.Generic; using System.Data; @@ -47,11 +48,11 @@ namespace MP_API.Controllers switch (tipoReport) { case reportRichiesto.CartellinoPedane: - tab = (DataTable)MagDataLayer.man.taCPed.GetData(keyParam); + tab = MagDataLayer.man.taCPed.GetData(keyParam); answ.Add("stp_prt_PartLabel", tab); break; case reportRichiesto.CartellinoFinitiOdette: - tab = (DataTable)MagDataLayer.man.taCFOdette.GetData(keyParam); + tab = MagDataLayer.man.taCFOdette.GetData(keyParam); answ.Add("stp_prt_StackLabel", tab); break; default: diff --git a/MP-MAG/Controllers/ReportController.cs b/MP-MAG/Controllers/ReportController.cs index 81066fb..f42af29 100644 --- a/MP-MAG/Controllers/ReportController.cs +++ b/MP-MAG/Controllers/ReportController.cs @@ -1,4 +1,5 @@ -using SteamWare; +using SteamWare.IO; +using SteamWare.Logger; using System; using System.IO; using System.Web; @@ -42,7 +43,7 @@ namespace MP_API.Controllers } catch (Exception exc) { - logger.lg.scriviLog($"Errore in get elenco reports{Environment.NewLine}{exc}"); + Logging.Instance.Error($"Errore in get elenco reports{Environment.NewLine}{exc}"); } return answ; } @@ -82,7 +83,7 @@ namespace MP_API.Controllers } catch (Exception exc) { - logger.lg.scriviLog($"Errore in get singolo report{Environment.NewLine}{exc}"); + Logging.Instance.Error($"Errore in get singolo report{Environment.NewLine}{exc}"); } return answ; } diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 05a7438..31a71fd 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -1,12 +1,7 @@  - - - - - Debug @@ -52,12 +47,6 @@ 4 - - ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll - - - ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll - ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll @@ -86,12 +75,6 @@ ..\packages\NLog.4.6.8\lib\net45\NLog.dll - - ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll - - - ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll @@ -104,8 +87,17 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll + + ..\packages\SteamWare.IO.4.0.2002.731\lib\net462\SteamWare.IO.dll + True + + + ..\packages\SteamWare.Logger.4.0.2002.731\lib\net462\SteamWare.Logger.dll + True + + + ..\packages\SteamWare.Reports.4.0.2002.731\lib\net462\SteamWare.Reports.dll + True @@ -208,11 +200,6 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - VersGen.cs @@ -260,7 +247,6 @@ - @@ -314,8 +300,6 @@ - - @@ -451,15 +435,8 @@ - - - - - - - 10.0 @@ -494,14 +471,9 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - - - - - diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index 63c5525..241bad2 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -14,11 +14,7 @@ - - - - - + @@ -307,10 +303,4 @@ - - - - - - diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config index 441ace8..13d1a25 100644 --- a/MP-MAG/packages.config +++ b/MP-MAG/packages.config @@ -1,7 +1,5 @@  - - @@ -23,13 +21,8 @@ - - - - - @@ -39,14 +32,15 @@ - - + + + diff --git a/MagData/App_Readme/README_SteamWare.txt b/MagData/App_Readme/README_SteamWare.txt new file mode 100644 index 0000000..bf60ed1 --- /dev/null +++ b/MagData/App_Readme/README_SteamWare.txt @@ -0,0 +1,12 @@ +--------------------------------------------------------------- +------- SteamWareLib SDK ------- +--------------------------------------------------------------- + +Libreria di utility base di SteamWare. + +Le dipendenze inserite sono necessarie al funzionamento dell'SDK. + +Sono inclusi a titolo di esempio vari files di conf: + * example-NLog.config + +Attenzione a configurare correttamente il file NLog.xml includendo il rule per la classe, vedere ad esempio il file example-NLog.config allegato. \ No newline at end of file diff --git a/MagData/App_Readme/SteamWare_demo/example-favicon.ico b/MagData/App_Readme/SteamWare_demo/example-favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4f0e0ad0a8300d86881040676f2c05f93ec4c1a3 GIT binary patch literal 31702 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 BZR`L5 literal 0 HcmV?d00001