|
@@ -1,6 +1,6 @@
|
|
|
using System.Net;
|
|
|
using System.Text;
|
|
|
-using Newtonsoft.Json;
|
|
|
+using InABox.Core;
|
|
|
|
|
|
namespace InABox.DatabaseProxy
|
|
|
{
|
|
@@ -123,8 +123,7 @@ namespace InABox.DatabaseProxy
|
|
|
request.Credentials.Password = Password;
|
|
|
request.SQL = SQL;
|
|
|
|
|
|
- var settings = new JsonSerializerSettings { Formatting = Formatting.Indented };
|
|
|
- var sRequest = JsonConvert.SerializeObject(request, settings);
|
|
|
+ var sRequest = Serialization.Serialize(request, indented: true);
|
|
|
var array = Encoding.ASCII.GetBytes(sRequest);
|
|
|
var remoterequest = WebRequest.Create(string.Format("http://{0}/query?format=json", URL));
|
|
|
remoterequest.ContentType = "application/json";
|
|
@@ -140,7 +139,7 @@ namespace InABox.DatabaseProxy
|
|
|
{
|
|
|
var reader = new StreamReader(stream, Encoding.UTF8);
|
|
|
var responseString = reader.ReadToEnd();
|
|
|
- var response = (Response)JsonConvert.DeserializeObject(responseString, typeof(Response));
|
|
|
+ var response = Serialization.Deserialize<Response>(responseString);
|
|
|
if (response.Status.Equals("OK"))
|
|
|
{
|
|
|
Data.Clear();
|