Skip to content

IoTSharp
IoTSharp

IoTSharp / IoTSharp
12 个月 前同步成功

通知 15
Star 2
Fork 0
IoTSharp
IoTSharp

体验新版 GitCode，发现更多精彩内容 >>

提交 30d22674 编写于 作者: 麦壳饼's avatar 麦壳饼
浏览文件
操作

针对 RestSharp 和 Taso进行了依赖库版本升级。

上级 d69d73b3
隐藏空白更改
内联 并排
Showing with 114 addition and 21 deletion
IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
浏览文件 @ 30d22674
......@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.4" />
<PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.2" />
......
IoTSharp.TaskAction/DeviceActionExcutor.cs
浏览文件 @ 30d22674
......@@ -25,15 +25,15 @@ namespace IoTSharp.TaskAction
var config = JsonConvert.DeserializeObject<ModelExecutorConfig>(input.ExecutorConfig);
string contentType = "application/json";
var restclient = new RestClient(config.BaseUrl);
var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId), Method.POST);
restclient.AddDefaultHeader(KnownHeaders.Accept, "*/*");
var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId));
request.AddHeader("X-Access-Token",
config.Token);
request.RequestFormat = DataFormat.Json;
request.AddHeader("Content-Type", contentType);
request.AddHeader("cache-control", "no-cache");
request.AddJsonBody(JsonConvert.SerializeObject(new{ sosType="1", sosContent= input.Input, usingUserId= "" }));
var response = await restclient.ExecuteAsync(request);
var response = await restclient.ExecutePostAsync(request);
if (response.StatusCode == HttpStatusCode.OK)
{
var result = JsonConvert.DeserializeObject<DeviceActionResult>(response.Content);
......
IoTSharp.TaskAction/IoTSharp.TaskAction.csproj
浏览文件 @ 30d22674
......@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="RestSharp" Version="106.15.0" />
<PackageReference Include="RestSharp" Version="107.3.0" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.TaskAction/MessagePullExcutor.cs
浏览文件 @ 30d22674
......@@ -62,15 +62,16 @@ namespace IoTSharp.TaskAction
JObject o = JsonConvert.DeserializeObject(input.Input) as JObject;
var config = JsonConvert.DeserializeObject<ModelExecutorConfig>(input.ExecutorConfig);
var dd = o.Properties().Select(c => new ParamObject { keyName = c.Name, value = JPropertyToObject(c.Value.First as JProperty) }).ToList();
string contentType = "application/json";
var restclient = new RestClient(config.BaseUrl);
var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId), Method.POST);
restclient.AddDefaultHeader(KnownHeaders.Accept, "*/*");
var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId));
request.AddHeader("X-Access-Token",
config.Token);
request.RequestFormat = DataFormat.Json;
request.AddHeader("cache-control", "no-cache");
request.AddHeader("Content-Type", "application/json");
request.AddJsonBody(JsonConvert.SerializeObject(dd));
var response = await restclient.ExecuteAsync(request);
var response = await restclient.ExecutePostAsync(request);
if (response.StatusCode == HttpStatusCode.OK)
{
var result = JsonConvert.DeserializeObject<MessagePullResult>(response.Content);
......@@ -96,15 +97,16 @@ namespace IoTSharp.TaskAction
JObject o = JsonConvert.DeserializeObject(input.Input) as JObject;
var config = JsonConvert.DeserializeObject<ModelExecutorConfig>(input.ExecutorConfig);
var dd = o.Properties().Select(c => new ParamObject { keyName = c.Name, value = JPropertyToObject(c) }).ToList();
string contentType = "application/json";
var restclient = new RestClient(config.BaseUrl);
var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId), Method.POST);
restclient.AddDefaultHeader(KnownHeaders.Accept, "*/*");
var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId));
request.AddHeader("X-Access-Token",
config.Token);
request.RequestFormat = DataFormat.Json;
request.AddHeader("cache-control", "no-cache");
request.AddHeader("Content-Type", "application/json");
request.AddJsonBody(JsonConvert.SerializeObject(dd));
var response = await restclient.ExecuteAsync(request);
var response = await restclient.ExecutePostAsync(request);
if (response.StatusCode == HttpStatusCode.OK)
{
var result = JsonConvert.DeserializeObject<MessagePullResult>(response.Content);
......
IoTSharp/Extensions/IoTSharpExtension.cs
浏览文件 @ 30d22674
using DotNetCore.CAP;
using HealthChecks.UI.Configuration;
using IoTSharp.Data;
using IoTSharp.Extensions;
using IoTSharp.HealthChecks.Taos;
using IoTSharp.Services;
using IoTSharp.X509Extensions;
using Microsoft.AspNetCore.Builder;
......@@ -182,7 +184,7 @@ namespace IoTSharp
internal static HealthChecks.UI.Configuration.Settings AddIoTSharpHealthCheckEndpoint(this HealthChecks.UI.Configuration.Settings setup)
internal static Settings AddIoTSharpHealthCheckEndpoint(this Settings setup)
{
var urls = Environment.GetEnvironmentVariable("ASPNETCORE_URLS")?.Split(';');
var uris = urls?.Select(url => Regex.Replace(url, @"^(?<scheme>https?):\/\/((\+)|(\*)|(0.0.0.0))(?=[\:\/]|$)", "${scheme}://localhost"))
......
IoTSharp/Extensions/RestSharpExtensions.cs 0 → 100644
浏览文件 @ 30d22674
using RestSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RestSharp
{
public static class RestSharpExtensions
{
public static async Task<T> GetDataBy<T>(this Uri uri, params object[] objparam)
{
return await GetDataBy<T>(uri, request =>
{
if (objparam != null)
{
objparam.GetType().GetProperties().ToList().ForEach(p =>
{
request.AddParameter(p.Name, p.GetValue(objparam), ParameterType.QueryString);
});
}
});
}
public static async Task<T> GetDataBy<T>(this Uri uri, Action<RestRequest> action)
{
return await GetDataBy<T>(uri, action, false);
}
public static async Task<T> GetDataBy<T>(this Uri uri, Action<RestRequest> action, bool checktype = false)
{
var result1 = default(T);
var client = Create(uri);
var request = new RestRequest();
action?.Invoke(request);
var response = await client.ExecuteGetAsync(request);
if (response.StatusCode == System.Net.HttpStatusCode.OK)
{
if (checktype)
{
var ret = Newtonsoft.Json.JsonConvert.DeserializeObject(response.Content);
if (ret?.GetType() == typeof(string))
{
result1 = Newtonsoft.Json.JsonConvert.DeserializeObject<T>((string)ret);
}
else
{
result1 = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(response.Content);
}
}
else
{
result1 = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(response.Content);
}
}
return result1;
}
public static async Task<R> PostDataBy<T, R>(this Uri uri, T body) where T : class
{
return await PostDataBy<R>(uri, request =>
{
request.AddHeader("Content-Type", "application/json");
if (body != null)
{
request.AddJsonBody(body);
}
});
}
public static async Task<R> PostDataBy<R>(this Uri uri, Action<RestRequest> action)
{
var client = Create(uri);
var request = new RestRequest();
action?.Invoke(request);
var response = await client.PostAsync(request);
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<R>(response.Content);
return result;
}
private static RestClient Create(Uri uri)
{
var client = new RestClient(new RestClientOptions(uri) { Timeout = -1, FollowRedirects = false });
client.AddDefaultHeader(KnownHeaders.Accept, "*/*");
return client;
}
}
}
IoTSharp/IoTSharp.csproj
浏览文件 @ 30d22674
......@@ -50,7 +50,7 @@
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="6.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="6.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.4" />
......@@ -69,7 +69,7 @@
<PackageReference Include="EasyCaching.LiteDB" Version="1.5.1" />
<PackageReference Include="EasyCaching.Redis" Version="1.5.1" />
<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
<PackageReference Include="InfluxDB.Client" Version="3.3.0" />
<PackageReference Include="InfluxDB.Client" Version="4.0.0" />
<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
<PackageReference Include="IoTSharp.X509Extensions" Version="1.4.27" />
<PackageReference Include="Jdenticon-net" Version="3.1.2" />
......@@ -78,8 +78,8 @@
<PackageReference Include="LiteDB" Version="5.0.11" />
<PackageReference Include="MaiKeBing.CAP.ZeroMQ" Version="1.0.35" />
<PackageReference Include="MaiKeBing.CAP.LiteDB" Version="1.0.35" />
<PackageReference Include="Maikebing.Data.Taos" Version="2.0.357" />
<PackageReference Include="Maikebing.HealthChecks.Taos" Version="2.0.357" />
<PackageReference Include="IoTSharp.Data.Taos" Version="2.0.442" />
<PackageReference Include="IoTSharp.HealthChecks.Taos" Version="2.0.442" />
<PackageReference Include="MaiKeBing.HostedService.ZeroMQ" Version="1.0.35" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.1.0" />
......@@ -88,7 +88,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.1.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
<PackageReference Include="MQTTnet" Version="4.0.0-preview5" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0-preview5" />
......@@ -101,7 +101,7 @@
<PackageReference Include="PinusDB" Version="1.0.10" />
<PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.3.3" />
<PackageReference Include="RestSharp" Version="106.15.0" />
<PackageReference Include="RestSharp" Version="107.3.0" />
<PackageReference Include="Rin" Version="2.6.0" />
<PackageReference Include="Rin.Mvc" Version="2.6.0" />
<PackageReference Include="RulesEngine" Version="3.5.0" />
......
IoTSharp/IoTSharp.xml
浏览文件 @ 30d22674
......@@ -905,7 +905,7 @@
更多内容可以参考<seealso cref="!:https://github.com/Coldairarrow/EFCore.Sharding/issues/52"/>
</summary>
</member>
<member name="M:IoTSharp.Storage.TaosStorage.SqlToTDD(Maikebing.Data.Taos.TaosConnection,System.String,System.String,System.String,System.String)">
<member name="M:IoTSharp.Storage.TaosStorage.SqlToTDD(IoTSharp.Data.Taos.TaosConnection,System.String,System.String,System.String,System.String)">
<summary>
转换获取到的值
</summary>
......
IoTSharp/Startup.cs
浏览文件 @ 30d22674
......@@ -14,7 +14,7 @@ using IoTSharp.Storage;
using IoTSharp.X509Extensions;
using Jdenticon.AspNetCore;
using Jdenticon.Rendering;
using Maikebing.Data.Taos;
using IoTSharp.Data.Taos;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
......
IoTSharp/Storage/TaosStorage.cs
浏览文件 @ 30d22674
......@@ -2,7 +2,7 @@
using IoTSharp.Data;
using IoTSharp.Dtos;
using IoTSharp.Extensions;
using Maikebing.Data.Taos;
using IoTSharp.Data.Taos;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.ObjectPool;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或