Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IoTSharp
IoTSharp
提交
30d22674
IoTSharp
项目概览
IoTSharp
/
IoTSharp
大约 1 年 前同步成功
通知
15
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
IoTSharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
30d22674
编写于
3月 19, 2022
作者:
麦壳饼
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
针对 RestSharp 和 Taso进行了依赖库版本升级。
上级
d69d73b3
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
114 addition
and
21 deletion
+114
-21
IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
+1
-1
IoTSharp.TaskAction/DeviceActionExcutor.cs
IoTSharp.TaskAction/DeviceActionExcutor.cs
+3
-3
IoTSharp.TaskAction/IoTSharp.TaskAction.csproj
IoTSharp.TaskAction/IoTSharp.TaskAction.csproj
+1
-1
IoTSharp.TaskAction/MessagePullExcutor.cs
IoTSharp.TaskAction/MessagePullExcutor.cs
+8
-6
IoTSharp/Extensions/IoTSharpExtension.cs
IoTSharp/Extensions/IoTSharpExtension.cs
+3
-1
IoTSharp/Extensions/RestSharpExtensions.cs
IoTSharp/Extensions/RestSharpExtensions.cs
+89
-0
IoTSharp/IoTSharp.csproj
IoTSharp/IoTSharp.csproj
+6
-6
IoTSharp/IoTSharp.xml
IoTSharp/IoTSharp.xml
+1
-1
IoTSharp/Startup.cs
IoTSharp/Startup.cs
+1
-1
IoTSharp/Storage/TaosStorage.cs
IoTSharp/Storage/TaosStorage.cs
+1
-1
未找到文件。
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
.
Execute
Post
Async
(
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="10
6.15
.0" />
<PackageReference Include="RestSharp" Version="10
7.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
.
Execute
Post
Async
(
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
.
Execute
Post
Async
(
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.1
4
.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.1
5
.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="10
6.15
.0" />
<PackageReference Include="RestSharp" Version="10
7.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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录