diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0905e64..5872520 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,29 +21,30 @@ variables:
throw "7 zip file '$7zipPath' not found"
}
Set-Alias 7zip $7zipPath
- $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
- cd "$env:APP_NAME\bin\publish\net6.0"
- $Source = "*"
+ $Target = "$env:APP_NAME\Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
+ $Source = "$env:APP_NAME\bin\publish\net6.0\*"
7zip a -tzip $Target $Source -xr!DATA
echo "called ZIP $Source --> $Target"
-# helper creazione hash files x EXE
-.hashBuildExe: &hashBuildExe
- - |
- $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
- $MD5 = Get-FileHash $Target -Algorithm MD5
- $SHA1 = Get-FileHash $Target -Algorithm SHA1
- New-Item $Target".md5"
- New-Item $Target".sha1"
- $MD5.Hash | Set-Content -Path $Target".md5"
- $SHA1.Hash | Set-Content -Path $Target".sha1"
+#cd "$env:APP_NAME\bin\publish\net6.0"
- echo "Created HASH files for $Target"
+# # helper creazione hash files x EXE
+# .hashBuildExe: &hashBuildExe
+# - |
+# $Target = "$env:APP_NAME\Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
+# $MD5 = Get-FileHash $Target -Algorithm MD5
+# $SHA1 = Get-FileHash $Target -Algorithm SHA1
+# New-Item $Target".md5"
+# New-Item $Target".sha1"
+# $MD5.Hash | Set-Content -Path $Target".md5"
+# $SHA1.Hash | Set-Content -Path $Target".sha1"
+
+# echo "Created HASH files for $Target"
# helper creazione hash files x IIS
.hashBuild: &hashBuild
- |
- $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip"
+ $Target = "$env:APP_NAME\Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
$MD5 = Get-FileHash $Target -Algorithm MD5
$SHA1 = Get-FileHash $Target -Algorithm SHA1
New-Item $Target".md5"
@@ -70,11 +71,12 @@ variables:
{
$version = "unstable"
}
- $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*")
+ $File2Send = Get-ChildItem("$env:APP_NAME\Releases\" + $CI_COMMIT_BRANCH + "\*")
ForEach ($File in $File2Send) {
$FileName = Split-Path $File -leaf
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName
+ echo "mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName"
}
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
@@ -141,8 +143,6 @@ Transfer:test:
stage: test
tags:
- win
- only:
- - develop
needs: ["Transfer:build"]
script:
- dotnet test LiMan.Transfer/LiMan.Transfer.csproj
@@ -193,11 +193,13 @@ Transfer:deploy:
stage: deploy
tags:
- win
- needs: ["Transfer:build"]
+ variables:
+ APP_NAME: LiMan.Transfer
+ needs: ["Transfer:test"]
script:
- - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true LiMan.Transfer/LiMan.Transfer.csproj
+ - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release LiMan.Transfer/LiMan.Transfer.csproj
- *zipper
- - *hashBuildExe
+ - *hashBuild
- *nexusUpload
diff --git a/Core/Core.csproj b/Core/Core.csproj
index f208d30..47c5a70 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -4,4 +4,8 @@
net5.0
+
+
+
+
diff --git a/Core/SupportRequest.cs b/Core/SupportRequest.cs
index 5cdf111..746fc57 100644
--- a/Core/SupportRequest.cs
+++ b/Core/SupportRequest.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -28,6 +30,60 @@ namespace Core
public string MasterKey { get; set; } = "";
public string ReqBody { get; set; } = "";
+ ///
+ /// Init classe in modalità "empty"
+ ///
+ public SupportRequest()
+ { }
+
+ ///
+ /// Istanzia un nuovo ogetto richeista supporto
+ ///
+ /// Codice Applicazione (es EBW-UP)
+ /// Codice Impegno (es codice chiave HW)
+ /// Codice Cliente/Installazione
+ /// Email x contatto
+ /// Nome del richiedente/clietne
+ /// Tel richiedente/cliente
+ /// Chiave master di comunicazione da LiMan
+ /// Testo delal richiesta
+ /// Idx univoco di sublic (es x gestione utenti)
+ /// Tipo ticket da gestire (default fileUpload)
+ public SupportRequest(string codApp, string codImp, string codInst, string contactEmail, string contactName, string contactPhone, string masterKey, string ReqBody, int idxSubLic = 0, TipologiaTicket tipo = TipologiaTicket.FileUpload)
+ {
+ this.CodApp = CodApp;
+ this.CodImp = CodImp;
+ this.CodInst = CodInst;
+ this.ContactEmail = contactEmail;
+ this.ContactName = contactName;
+ this.ContactPhone = contactPhone;
+ this.MasterKey = masterKey;
+ this.ReqBody = ReqBody;
+ this.idxSubLic = idxSubLic;
+ this.Tipo = tipo;
+ }
+
+ ///
+ /// Effettua salvataggio su file di un oggetto richiesta file upload
+ ///
+ /// Oggetto richiesta (già istanziato)
+ /// Path dove salvare il file
+ public static bool SaveRequest(SupportRequest currReq, string filePath)
+ {
+ bool fatto = false;
+ try
+ {
+ string rawData = JsonConvert.SerializeObject(currReq, Formatting.Indented);
+ File.WriteAllText(filePath, rawData);
+ fatto = true;
+ }
+ catch (Exception ex)
+ {
+ Console.Write(ex.ToString());
+ }
+ return fatto;
+ }
+
#endregion Public Properties
}
}
\ No newline at end of file
diff --git a/InsomniaRest/TestCall.json b/InsomniaRest/TestCall.json
new file mode 100644
index 0000000..01e27d2
--- /dev/null
+++ b/InsomniaRest/TestCall.json
@@ -0,0 +1 @@
+{"_type":"export","__export_format":4,"__export_date":"2022-02-09T06:46:02.973Z","__export_source":"insomnia.desktop.app:v2021.7.2","resources":[{"_id":"req_94c94c42242a4b86bb683ddb6e725c1b","parentId":"fld_c1433425ebce4a75b3ba11ed9f08f8b7","modified":1636368193729,"created":1634829469020,"url":"{{ _.BASE_URL }}/api/installazioni/steamware","name":"Installazioni SteamWare","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1627351578955,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_c1433425ebce4a75b3ba11ed9f08f8b7","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1636368188402,"created":1636368176337,"name":"Installazioni","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1636368176337,"_type":"request_group"},{"_id":"wrk_3a09551ac721482a8d6d6c3f49779247","parentId":null,"modified":1634829468996,"created":1634829468996,"name":"LicMan.Api","description":"","scope":"collection","_type":"workspace"},{"_id":"req_2899c4fabc9f48c6a30bce59954c3cfa","parentId":"fld_c1433425ebce4a75b3ba11ed9f08f8b7","modified":1636368196015,"created":1634829560846,"url":"{{ _.BASE_URL }}/api/installazioni/ets","name":"Installazioni ETS","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1627351578905,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_b14c304cb28c4e5f9f007cb25a622ae1","parentId":"fld_482ee06fd04a455f9bdfd63e6d42beae","modified":1636368237149,"created":1634829469026,"url":"{{ _.BASE_URL }}/api/applicazione/steamware?CodApp=GPW","name":"Applicazione SteamWare/GPW","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1626751501333,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_482ee06fd04a455f9bdfd63e6d42beae","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1636368234020,"created":1636368225320,"name":"Applicazioni","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1636368171824.5,"_type":"request_group"},{"_id":"req_4d5c0d20ba14481786b8371405435e21","parentId":"fld_482ee06fd04a455f9bdfd63e6d42beae","modified":1636368246723,"created":1634829655164,"url":"{{ _.BASE_URL }}/api/applicazione/steamware?CodApp=MAPO","name":"Applicazione SteamWare/MAPO","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1626751501283,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_c9a692486b514617aaf8d2c1f892be6f","parentId":"fld_3d57099a4b81439b8c5e92b150bfa539","modified":1643896207335,"created":1634829684473,"url":"{{ _.BASE_URL }}/api/licenza/steamware?CodApp=GPW&Chiave=wAjUzZ4ZS10tEWul58J9lbPLhgdmC1W8BCru3vFJrcOoIFDQKh7aKpLs/Cuo1MaZ","name":"Licenza SteamWare/GPW","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1626301443116.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_3d57099a4b81439b8c5e92b150bfa539","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1636368167312,"created":1636368167312,"name":"Licenze","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1636368167312,"_type":"request_group"},{"_id":"req_17c90dc4dbce45638ba74ac8c3e49403","parentId":"fld_f402c65d1a884ee9bcc50d26f72634f3","modified":1640104623780,"created":1636371347886,"url":"{{ _.BASE_URL }}/api/attivazioni","name":"TryAdd","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"masterKey\": \"wAjUzZ4ZS10tEWul58J9lbPLhgdmC1W8BCru3vFJrcMGFsaExT+LBZLs/Cuo1MaZ\",\n \"paramDict\": {\n \"67cd028c209e240708c91b633db592b9\": \"9Y7rfqRTKB4xVVxk\",\n \"50458f523270eb9d2979cf3e3057abe2\": \"Et7kL0ed8WY=\",\n \"53ef5b634acf2de971572a90f2e351e9\": \"AZf4YaYHYZDcuUsh\"\n }\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_ed76bfea595e4917be2ce6797185529e"}],"authentication":{},"metaSortKey":-1636368676549,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_f402c65d1a884ee9bcc50d26f72634f3","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1636368159634,"created":1636368159634,"name":"Attivazioni","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1636368159634,"_type":"request_group"},{"_id":"req_7d066009687247ef89f198fafcf30cb5","parentId":"fld_f402c65d1a884ee9bcc50d26f72634f3","modified":1636371488666,"created":1636368676499,"url":"{{ _.BASE_URL }}/api/attivazioni","name":"Delete SubLic","description":"","method":"DELETE","body":{"mimeType":"application/json","text":"{\n \"masterKey\": \"wAjUzZ4ZS10tEWul58J9lbPLhgdmC1W8BCru3vFJrcMGFsaExT+LBZLs/Cuo1MaZ\",\n \"paramDict\": {\n \"67cd028c209e240708c91b633db592b9\": \"9Y7rfqRTKB4xVVxk\",\n \"50458f523270eb9d2979cf3e3057abe2\": \"Et7kL0ed8WY=\",\n \"53ef5b634acf2de971572a90f2e351e9\": \"AZf4YaYHYZDcuUsh\"\n }\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_af7596fa3a174c6f9e4fec738fa7fb07"}],"authentication":{},"metaSortKey":-1636368676499,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_bc76628fb2214b0f87ac41f876c0b7ae","parentId":"fld_23d6ab2fed7c4c4e9845ac5a04dbf811","modified":1644388903321,"created":1643962591421,"url":"{{ _.BASE_URL }}/api/filesave/list/12","name":"list","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"codApp\": \"MAPO-IOB-WIN-NEXT\",\n \"codImp\": \"\",\n \"codInst\": \"SteamWare\",\n \"contactEmail\": \"samuele@steamware.net\",\n \"contactName\": \"Samuele\",\n \"contactPhone\": \"035-460560\",\n \"idxSubLic\": 0,\n \"masterKey\": \"a3BRQz/1B34uvvcDoE/D38ssH/c/KSsjpn39wZsxOVsck9rGnBkF3xfUnj3edYIl\",\n \"reqBody\": \"Insomnia (file upload)\",\n\t\"tipo\": 2\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_ed76bfea595e4917be2ce6797185529e"},{"id":"pair_1725d037122840abb3c3fccbafbc4275","name":"","value":"","description":""}],"authentication":{},"metaSortKey":-1636368676561.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_23d6ab2fed7c4c4e9845ac5a04dbf811","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1643962542199,"created":1640021680129,"name":"Files","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1626151423686,"_type":"request_group"},{"_id":"req_681a6a5336664d6e9120026f50667183","parentId":"fld_23d6ab2fed7c4c4e9845ac5a04dbf811","modified":1644388785640,"created":1644388125523,"url":"{{ _.BASE_URL }}/api/filesave/T000000012/4lohp04u.b4i/LogFiles.zip","name":"download","description":"","method":"GET","body":{},"parameters":[],"headers":[{"id":"pair_1725d037122840abb3c3fccbafbc4275","name":"","value":"","description":""}],"authentication":{},"metaSortKey":-1636368676555.25,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_0d09cffd954d47f385279e990386b0d8","parentId":"fld_23d6ab2fed7c4c4e9845ac5a04dbf811","modified":1643986763390,"created":1640168946681,"url":"{{ _.BASE_URL }}/api/filesave/single","name":"FileSaveSingle","description":"","method":"POST","body":{"mimeType":"multipart/form-data","params":[{"id":"pair_eb8cb2a89c3a4a90af9ec163cc00b654","name":"TicketId","value":"10","description":"","type":"text","multiline":false},{"id":"pair_ee247b7b1abe4a2eb835a43a8fbd871a","name":"file","value":"","description":"","type":"file","fileName":"C:\\Users\\samuele.steamw\\Downloads\\SCAMBIO DATI MES _ v2021.pdf"}]},"parameters":[],"headers":[{"name":"Content-Type","value":"multipart/form-data","id":"pair_ed76bfea595e4917be2ce6797185529e"},{"id":"pair_1725d037122840abb3c3fccbafbc4275","name":"","value":"","description":""}],"authentication":{},"metaSortKey":-1636368676511.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_2ab30a505449413a9b412d25fea43c32","parentId":"fld_23d6ab2fed7c4c4e9845ac5a04dbf811","modified":1643986766826,"created":1640021703467,"url":"{{ _.BASE_URL }}/api/filesave","name":"FileSaveMulti","description":"","method":"POST","body":{"mimeType":"multipart/form-data","params":[{"id":"pair_eb8cb2a89c3a4a90af9ec163cc00b654","name":"TicketId","value":"11","description":"","type":"text","multiline":false},{"id":"pair_ee247b7b1abe4a2eb835a43a8fbd871a","name":"files","value":"","description":"","type":"file","fileName":"C:\\Users\\samuele.steamw\\Downloads\\SCAMBIO DATI MES _ v2021.pdf"},{"id":"pair_bac89d30d9a448c18713efbc243697e8","name":"files","value":"","description":"","type":"file","fileName":"C:\\Users\\samuele.steamw\\Downloads\\Ewon_teleservice_T2MFree+_PRO_IT.pdf"}]},"parameters":[],"headers":[{"name":"Content-Type","value":"multipart/form-data","id":"pair_ed76bfea595e4917be2ce6797185529e"},{"id":"pair_1725d037122840abb3c3fccbafbc4275","name":"","value":"","description":""}],"authentication":{},"metaSortKey":-1636368676461.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_5c84e0cacc794daf8ee86af985a40f83","parentId":"fld_c43de7cc200f4af7821a220d46323898","modified":1643962587103,"created":1640082304061,"url":"{{ _.BASE_URL }}/api/ticket/sendReq","name":"sendReq","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"codApp\": \"MAPO-IOB-WIN-NEXT\",\n \"codImp\": \"\",\n \"codInst\": \"SteamWare\",\n \"contactEmail\": \"samuele@steamware.net\",\n \"contactName\": \"Samuele\",\n \"contactPhone\": \"035-460560\",\n \"idxSubLic\": 0,\n \"masterKey\": \"a3BRQz/1B34uvvcDoE/D38ssH/c/KSsjpn39wZsxOVsck9rGnBkF3xfUnj3edYIl\",\n \"reqBody\": \"Insomnia (file upload)\",\n\t\"tipo\": 2\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_ed76bfea595e4917be2ce6797185529e"},{"id":"pair_1725d037122840abb3c3fccbafbc4275","name":"","value":"","description":""}],"authentication":{},"metaSortKey":-1626151423736,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_c43de7cc200f4af7821a220d46323898","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1637220072429,"created":1637220066948,"name":"Ticket","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1626151423661,"_type":"request_group"},{"_id":"req_b0f61658a8f14ab7bd24c21d9c2e0f8f","parentId":"fld_c43de7cc200f4af7821a220d46323898","modified":1637220362640,"created":1637220082741,"url":"{{ _.BASE_URL }}/api/ticket/SteamWare?CodApp=GPW&Chiave=wAjUzZ4ZS10tEWul58J9lbPLhgdmC1W8BCru3vFJrcMGFsaExT%2BLBZLs%2FCuo1MaZ","name":"Ticket SteamWare/GPW","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1626151423686,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e8868f080ba1430eb8d4cf9541ab89c1","parentId":"fld_c43de7cc200f4af7821a220d46323898","modified":1643899705502,"created":1643899685335,"url":"{{ _.BASE_URL }}/api/ticket/SteamWare?CodApp=MAPO-IOB-WIN-NEXT&Chiave=a3BRQz/1B34uvvcDoE/D38ssH/c/KSsjpn39wZsxOVsck9rGnBkF3xfUnj3edYIl","name":"Ticket SteamWare/MAPO-IOB-WIN","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1625551346076.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"env_2657f17ecf8c4490a11d21e7f4f1a77a","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1643986739871,"created":1634829468999,"name":"Base Environment","data":{},"dataPropertyOrder":{},"color":null,"isPrivate":false,"metaSortKey":1634552379782,"_type":"environment"},{"_id":"jar_f8077d7b5f8342d597a63cc01ce049e1","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1634829469014,"created":1634829469014,"name":"Default Jar","cookies":[],"_type":"cookie_jar"},{"_id":"spc_263d564c1fcd4e1f9e48fee3edc41fbb","parentId":"wrk_3a09551ac721482a8d6d6c3f49779247","modified":1634829469048,"created":1634829469017,"fileName":"LicMan.Api","contents":"","contentType":"yaml","_type":"api_spec"},{"_id":"env_8eaa28856e844ec8939391448724bccb","parentId":"env_2657f17ecf8c4490a11d21e7f4f1a77a","modified":1643977488194,"created":1634829469002,"name":"DEV","data":{"BASE_URL":"https://localhost:44351"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":null,"isPrivate":false,"metaSortKey":1634552420009,"_type":"environment"},{"_id":"env_75f794443c404d1abbf9193e3a9b46b9","parentId":"env_2657f17ecf8c4490a11d21e7f4f1a77a","modified":1637220300521,"created":1634829469007,"name":"IIS01","data":{"BASE_URL":"https://iis01.egalware.com/ELM.API"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":null,"isPrivate":false,"metaSortKey":1634552444561,"_type":"environment"},{"_id":"env_081ef8a80a154c6e81a160dc9df50590","parentId":"env_2657f17ecf8c4490a11d21e7f4f1a77a","modified":1643965878926,"created":1634829469009,"name":"IIS02","data":{"BASE_URL":"https://iis02.egalware.com/ELM.API"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":null,"isPrivate":false,"metaSortKey":1634552456998,"_type":"environment"},{"_id":"env_bd838edc3ce34c71a60425bd8312db37","parentId":"env_2657f17ecf8c4490a11d21e7f4f1a77a","modified":1643986741311,"created":1643965894623,"name":"liman.egalware.com","data":{"BASE_URL":"https://liman.egalware.com/ELM.API"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":null,"isPrivate":false,"metaSortKey":1641093809517.25,"_type":"environment"}]}
\ No newline at end of file
diff --git a/LiMan.Api/Controllers/AttivazioniController.cs b/LiMan.Api/Controllers/AttivazioniController.cs
index a349357..8793d60 100644
--- a/LiMan.Api/Controllers/AttivazioniController.cs
+++ b/LiMan.Api/Controllers/AttivazioniController.cs
@@ -54,8 +54,8 @@ namespace LiMan.APi.Controllers
///
/// Eliminazione di un set di attivazioni (SE SCADUTE)
///
- // DELETE api/attivazioni
- [HttpDelete()]
+ // POST api/attivazioni/removeKey
+ [HttpPost("removeKey")]
public async Task Delete([FromBody] UserLicenseRequest CurrRequest)
{
bool done = await dataService.AttivazioniDelete(CurrRequest.MasterKey, CurrRequest.ParamDict);
@@ -63,7 +63,7 @@ namespace LiMan.APi.Controllers
foreach (var item in CurrRequest.ParamDict)
{
// registro 1 riga x ogni record...
- await dataService.recordCall(CurrRequest.MasterKey, $"DELETE:api/attivazioni:{item.Key}|{item.Value}");
+ await dataService.recordCall(CurrRequest.MasterKey, $"POST:api/attivazioni/removeKey:{item.Key}|{item.Value}");
}
return done;
}
diff --git a/LiMan.Api/Controllers/FilesaveController.cs b/LiMan.Api/Controllers/FilesaveController.cs
index bcc0a32..a086c96 100644
--- a/LiMan.Api/Controllers/FilesaveController.cs
+++ b/LiMan.Api/Controllers/FilesaveController.cs
@@ -4,8 +4,8 @@ using LiMan.DB.DBModels;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
using NLog;
using System;
using System.Collections.Generic;
@@ -43,7 +43,6 @@ namespace LiMan.APi.Controllers
///
///
///
- ///
public FilesaveController(IConfiguration configuration, ApiDataService DataService, IWebHostEnvironment env)
{
dataService = DataService;
@@ -63,15 +62,61 @@ namespace LiMan.APi.Controllers
#endregion Protected Properties
- #region Public Methods
+ #region Protected Methods
///
- /// Richiesta di registrazione ticket supporto
+ /// Calcolo correetto mimetype da nome file
+ ///
+ ///
+ ///
+ protected string GetMimeType(string fileName)
+ {
+ var provider = new FileExtensionContentTypeProvider();
+ string contentType;
+ if (!provider.TryGetContentType(fileName, out contentType))
+ {
+ contentType = "application/octet-stream";
+ }
+ return contentType;
+ }
+
+ #endregion Protected Methods
+
+ #region Public Methods
+
+ /// GET api/filesave/id/filename
+ ///
+ /// Recupera un singolo file dato ticket code + nome file (safe)
+ ///
+ /// Ticket code formato T00000000
+ /// Nome file (safe)
+ /// Nome file da scaricare
+ ///
+ [HttpGet("{id}/{secureName}/{fileName}")]
+ public async Task DownloadFile(string id, string secureName, string fileName)
+ {
+ string relDir = _configuration["FileShare"];
+ string ticketDir = Path.Combine(relDir, id);
+ var filePath = Path.Combine(ticketDir, secureName);
+ // verifico esistenza..
+ if (System.IO.File.Exists(filePath))
+ {
+ var bytes = await System.IO.File.ReadAllBytesAsync(filePath);
+ return File(bytes, GetMimeType(fileName), fileName);
+ }
+ else
+ {
+ return File(new byte[0], "text/plain", "Empty.txt");
+ }
+ }
+
+ ///
+ /// Elenco files assaociati a ticket supporto
///
///
///
///
- // POST api/files/list/1
+ // POST api/filesave/list/1
[HttpPost("list/{id}")]
public async Task> list(int id, [FromBody] SupportRequest CurrRequest)
{
diff --git a/LiMan.Api/LiMan.APi.csproj b/LiMan.Api/LiMan.APi.csproj
index ce21f0b..88ff53f 100644
--- a/LiMan.Api/LiMan.APi.csproj
+++ b/LiMan.Api/LiMan.APi.csproj
@@ -20,6 +20,7 @@
+
diff --git a/LiMan.Api/LiMan.APi.xml b/LiMan.Api/LiMan.APi.xml
index e5c862c..5ef5031 100644
--- a/LiMan.Api/LiMan.APi.xml
+++ b/LiMan.Api/LiMan.APi.xml
@@ -110,16 +110,32 @@
-
Dataservice x accesso DB
+
+
+ Calcolo correetto mimetype da nome file
+
+
+
+
+
+ GET api/filesave/id/filename
+
+ Recupera un singolo file dato ticket code + nome file (safe)
+
+ Ticket code formato T00000000
+ Nome file (safe)
+ Nome file da scaricare
+
+
- Richiesta di registrazione ticket supporto
+ Elenco files assaociati a ticket supporto
diff --git a/LiMan.Transfer/LiMan.Transfer.csproj b/LiMan.Transfer/LiMan.Transfer.csproj
index ed4b282..669fdf7 100644
--- a/LiMan.Transfer/LiMan.Transfer.csproj
+++ b/LiMan.Transfer/LiMan.Transfer.csproj
@@ -26,5 +26,7 @@
Always
-
+
+
+
diff --git a/LiMan.Transfer/Resources/ChangeLog-original.html b/LiMan.Transfer/Resources/ChangeLog-original.html
new file mode 100644
index 0000000..0a14842
--- /dev/null
+++ b/LiMan.Transfer/Resources/ChangeLog-original.html
@@ -0,0 +1,27 @@
+
+ License Manager
+ Versione: {{CURRENT-REL}}
+
+ Note di rilascio:
+
+ -
+ Ultime modifiche:
+
+
+ -
+ v.1.* →
+
+ - Prima release dotnet5
+ - Integrazione EFCore
+
+
+
+
+
+
+
+
+
Versione: 1.1.2202.0907
+
+ Note di rilascio:
+
+ -
+ Ultime modifiche:
+
+
+ -
+ v.1.* →
+
+ - Prima release dotnet5
+ - Integrazione EFCore
+
+
+
+
+
+
+
+
+
-
+ 1.0.0.0
+ https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip
+ https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html
+ false
+
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
new file mode 100644
index 0000000..93a9fc0
--- /dev/null
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -0,0 +1,7 @@
+
+-
+ 1.1.2202.0907
+ https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip
+ https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html
+ false
+
diff --git a/LiMan.Transfer/post-build.ps1 b/LiMan.Transfer/post-build.ps1
new file mode 100644
index 0000000..b510ccd
--- /dev/null
+++ b/LiMan.Transfer/post-build.ps1
@@ -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 = "(.|\n)*?";
+$currRelNum = $MajMin + $currentDate +"." + $currentTime
+$replace = "" + $MajMin + $currentDate +"." + $currentTime + "";
+$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.Transfer"
+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
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index 98affc9..a06f002 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
net5.0
- 1.1.2202.0910
+ 1.1.2202.0907
LiMan.UI
LiMan.UI
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index 5c7c3f4..1cc67b7 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
License Manager
- Versione: 1.1.2202.0910
+ Versione: 1.1.2202.0907
Note di rilascio:
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index f27f229..08203ff 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.0910
+1.1.2202.0907
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index bb0d05f..7b99f80 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.1.2202.0910
+ 1.1.2202.0907
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html
false