diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index 46d2ec93..4dbfc299 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -91,6 +91,10 @@ + + + + diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj index 3005dbe9..a57ebbb2 100644 --- a/IOB-MAN/IOB-MAN.csproj +++ b/IOB-MAN/IOB-MAN.csproj @@ -78,6 +78,9 @@ ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll + + ..\packages\RestSharp.Serializers.NewtonsoftJson.106.15.0\lib\net452\RestSharp.Serializers.NewtonsoftJson.dll + ..\packages\SharpCompress.0.30.0\lib\net461\SharpCompress.dll diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index 1c44206b..92ae7209 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using RestSharp; +using RestSharp.Serializers.NewtonsoftJson; using Steamware.Scheduler; using SteamWare.IO; using SteamWare.Logger; @@ -1281,8 +1282,9 @@ namespace IOB_MAN private async void btnSendLog_Click(object sender, EventArgs e) { // svuoto area temp... + string fileName = "LogFiles.zip"; string tempDir = Path.Combine(Application.StartupPath, "temp", "logs"); - string zipPath = Path.Combine(Application.StartupPath, "temp", "files.zip"); + string zipPath = Path.Combine(Application.StartupPath, "temp", fileName); if (Directory.Exists(tempDir)) { Directory.Delete(tempDir, true); @@ -1326,6 +1328,7 @@ namespace IOB_MAN // client chiamate rest var client = new RestClient(ApiUrl); + client.UseNewtonsoftJson(); // genero il ticket var newSuppReq = new SupportRequest() @@ -1341,11 +1344,24 @@ namespace IOB_MAN Tipo = TipologiaTicket.FileUpload, idxSubLic = 0 }; - string jsonBody = JsonConvert.SerializeObject(newSuppReq); - var ticketReq = new RestRequest("/api/ticket/sendReq", DataFormat.Json).AddJsonBody(jsonBody); - var ticketResp = await client.PostAsync>(ticketReq); + var ticketReq = new RestRequest("/api/ticket/sendReq", DataFormat.Json).AddJsonBody(newSuppReq); + //string jsonTicketBody = JsonConvert.SerializeObject(newSuppReq); + //var ticketReq = new RestRequest("/api/ticket/sendReq", DataFormat.Json).AddJsonBody(jsonTicketBody); + var ticketResp = await client.PostAsync(ticketReq); + // preparo richeista x upload file + var fileUploadReq = new RestRequest("/api/filesave"); + fileUploadReq.AddParameter("ticketId", 1); + fileUploadReq.AddFile("files", zipPath); // ... infine INVIA file zip che li contiene... + try + { + var fileUploadResp = await client.PostAsync(fileUploadReq); + } + catch(Exception exc) + { + + } // elimino folder temporanea if (Directory.Exists(tempDir)) diff --git a/IOB-MAN/packages.config b/IOB-MAN/packages.config index 81dd901d..a762bb63 100644 --- a/IOB-MAN/packages.config +++ b/IOB-MAN/packages.config @@ -15,6 +15,7 @@ +