diff --git a/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj b/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj index d673fcc99228065100617681b7dd41ce41ff24a7..3522e3a6da03460355135bcf941d5eed43829f60 100644 --- a/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj +++ b/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj @@ -12,13 +12,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj b/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj index 0a79f7ce5fc97cd43a5ce284b767925bd54a92e3..94eac9c5121d18c6cc20ae3f52b11a3957de7c5b 100644 --- a/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj +++ b/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj @@ -8,14 +8,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + diff --git a/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj b/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj index 9e562795022d5854912191cda428ad07b4cb7ddd..a2061eaee39dea62607184378a2d3c411420cdf4 100644 --- a/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj +++ b/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj @@ -8,10 +8,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj b/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj index d1db9cf10360d2b80f7ee3b53f41978075dd2118..596443120dbcbfcb656a6cbcd66c5c753d434ad5 100644 --- a/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj +++ b/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj @@ -8,15 +8,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj b/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj index fdac58dc8bcc2d7e8eb4ed3d68d2065bba15821f..ff709b2791a1252e420f537ffa5e03430a3efc8e 100644 --- a/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj +++ b/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj b/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj index b4cf4ae8251c5e5055e61ea558d93378a8de03d8..66afdac0c681b3463ddcd10075874ee9270196ba 100644 --- a/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj +++ b/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj @@ -7,14 +7,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/IoTSharp.Data/IoTSharp.Data.csproj b/IoTSharp.Data/IoTSharp.Data.csproj index f67a7e471d156d56822931c8f1c7afd3691fb068..24aa3b957b9618b2dc7bd3fd2cd04159c56b3bae 100644 --- a/IoTSharp.Data/IoTSharp.Data.csproj +++ b/IoTSharp.Data/IoTSharp.Data.csproj @@ -6,10 +6,10 @@ - - + + - + diff --git a/IoTSharp.Interpreter/IoTSharp.Interpreter.csproj b/IoTSharp.Interpreter/IoTSharp.Interpreter.csproj index 1535d7b9bfe663926b82bf10f703046e6d09a4aa..2232ec6b4cd7280df92adce2b67a15cfdf0aaf14 100644 --- a/IoTSharp.Interpreter/IoTSharp.Interpreter.csproj +++ b/IoTSharp.Interpreter/IoTSharp.Interpreter.csproj @@ -5,13 +5,13 @@ - + - - - - + + + + diff --git a/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj b/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj index fb7408950d73111710e2830ff8e86318f281f032..373e0c59220d2e69acbcabadc02bfa2b24cc0d16 100644 --- a/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj +++ b/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj @@ -19,7 +19,7 @@ - + diff --git a/IoTSharp.Test/IoTSharp.Test.csproj b/IoTSharp.Test/IoTSharp.Test.csproj index b821389cb6a957465706edc70de4e21f78a73e84..6f1c0c7a6028eb836479b76b13fe08ff889c804e 100644 --- a/IoTSharp.Test/IoTSharp.Test.csproj +++ b/IoTSharp.Test/IoTSharp.Test.csproj @@ -11,12 +11,12 @@ - - - - + + + + - + diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj index 66ca728b277de1d36b066276f25d0df2f73d006d..8f86abb2584baa64df095d48f46761ceb8d79243 100644 --- a/IoTSharp/IoTSharp.csproj +++ b/IoTSharp/IoTSharp.csproj @@ -53,7 +53,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -94,27 +94,27 @@ - - + + - - - - - - - + + + + + + + - - - - + + + + - + @@ -128,32 +128,32 @@ - - + + - + - - - + + + - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/README.md b/README.md index 9bf7e8f941c94ad2b6bcb348f0ae7057f4dc22d1..a1c451e894b17d11d6851c770b3cf22f5d4b7191 100644 --- a/README.md +++ b/README.md @@ -84,14 +84,14 @@ IoTSharp is an open-source IoT platform for data collection, processing, visuali IoTSharp-C-client-Sdk is mqttt client, write by c; - https://github.com/IoTSharp/IoTSharp-C-Client-Sdk + [https://github.com/IoTSharp/IoTSharp.Sdks.MQTT-C](https://github.com/IoTSharp/IoTSharp.Sdks.MQTT-C) ## paho.mqtt.c's demo It' like IoTSharp-C-Client-Sdk, but is use paho.mqtt.c https://github.com/IoTSharp/IoTSharp.Edge.paho.mqtt.c -## IoTSharp.Edge.nanoFramework +## IoTSharp for nanoFramework IoTSharp.Edge.nanoFramework is a nanoFramework's mqtt client , it run on STM32 ！ @@ -100,19 +100,12 @@ IoTSharp.Edge.nanoFramework is a nanoFramework's mqtt client , it run on STM32 more info read https://www.cnblogs.com/MysticBoy/p/13159648.html or click https://www.nanoframework.net/ -## IoTSharp.Edge.RT-Thread +# IoTSharp for RTthread Package -IoTSharp.Edge.RT-Thread (STM32L4 + Wi-Fi, sensor, lcd, audio etc) +https://github.com/IoTSharp/iotsharp-rtthread-package -https://github.com/IoTSharp/IoTSharp.Edge.RT-Thread - 20190615010003.jpg - - InfluxDB2.PNG - - 20190615010115.jpg - IoTSharp's ecosystem - MaiKeBing.CAP.ZeroMQ [![MaiKeBing.CAP.ZeroMQ](https://img.shields.io/nuget/v/MaiKeBing.CAP.ZeroMQ.svg)](https://www.nuget.org/packages/MaiKeBing.CAP.ZeroMQ/) @@ -153,15 +146,13 @@ This project is an Apache 2.0 licensed open source project. In order to achieve We will put the detailed donation records on the below! - | | Name | Stars | Donations | Message | | ------------------------------------------------------------ | ------------------ | -------- | -------- | -------- | | [![@iioter](https://avatars.githubusercontent.com/u/29589505?s=80&v=4)](https://github.com/iioter) | whd | ![GitHub User's stars](https://img.shields.io/github/stars/iioter?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge) | ￥512 =120+100+292(码云共计三次) | | | [![@nnhy](https://avatars.githubusercontent.com/u/506367?s=80&v=4)](https://github.com/nnhy) | 大石头 | ![GitHub User's stars](https://img.shields.io/github/stars/nnhy?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge) | ￥672=666+5（码云+公众号） | | | | 无敌飞行家 | ![GitHub User's stars](https://img.shields.io/github/stars/hehaoyu_2014?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge) | ￥5=5(公众号) | | | | 匿名公司 | | ￥1000=1000(微信转账) | | -| | 农民也很疯狂 | | ￥200 微信转账 | | - +| [![@davidzhu001](https://avatars.githubusercontent.com/u/9436230?s=80&v=4)](https://github.com/davidzhu001) | 农民也很疯狂 | ![GitHub User's stars](https://img.shields.io/github/stars/davidzhu001?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge)| ￥200 微信转账 | | ## Community Support @@ -170,13 +161,9 @@ If you encounter any problems in the process, feel free to ask for help via foll - [![Discord Server](https://img.shields.io/discord/895689311612178442?color=%237289DA&label=IoTSharp&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/My6PaTmUvu) -| 公众号 | [QQ群63631741](https://jq.qq.com/?_wv=1027&k=HJ7h3gbO) | -| ------ | ---- | -| ![](docs/static/img/qrcode.jpg) | ![](docs/static/img/IoTSharpQQGruop.png) | - - - - +| 公众号 | [QQ群63631741](https://jq.qq.com/?_wv=1027&k=HJ7h3gbO) | 微信群 | +| ------ | ---- | ---- | +| ![](docs/static/img/qrcode.jpg) | ![](docs/static/img/IoTSharpQQGruop.png) | ![企业微信群](docs/static/img/qyqun.jpg) | ## dotNET China diff --git a/README.zh.md b/README.zh.md index 747c994038fdfc7a68ce7bd3478b1e6adf880f72..d2ef42ad965c790da2ba42e727d577a72803fb58 100644 --- a/README.zh.md +++ b/README.zh.md @@ -52,7 +52,8 @@ IoTSharp 是一个 基于.Net Core 开源的物联网基础平台， 支持 HTTP ## IoTSharp.SDKs -IoTSharp.SDKs 包括了 IoTSharp.Sdk.MQTT IoTSharp.Sdk.Http +- IoTSharp.Sdk.Http [![IoTSharp.Sdk.Http](https://img.shields.io/nuget/v/IoTSharp.Sdk.Http.svg)](https://www.nuget.org/packages/IoTSharp.Sdk.Http/) +- IoTSharp.Sdk.MQTT [![IoTSharp.Sdk.MQTT](https://img.shields.io/nuget/v/IoTSharp.Sdk.MQTT.svg)](https://www.nuget.org/packages/IoTSharp.Sdk.MQTT/) @@ -60,14 +61,14 @@ IoTSharp.SDKs 包括了 IoTSharp.Sdk.MQTT IoTSharp.Sdk.Http IoTSharp-C-client-Sdk 是mqtt客户端， c语言编写的例子。 - https://github.com/IoTSharp/IoTSharp-C-Client-Sdk + [https://github.com/IoTSharp/IoTSharp.Sdks.MQTT-C](https://github.com/IoTSharp/IoTSharp.Sdks.MQTT-C) ## paho.mqtt.c 的例子 这个跟 IoTSharp-C-Client-Sdk 一样， 但是使用了 paho.mqtt.c https://github.com/IoTSharp/IoTSharp.Edge.paho.mqtt.c -## IoTSharp.Edge.nanoFramework +## IoTSharp 的 nanoFramework 例子 IoTSharp.Edge.nanoFramework 是一个 nanoFramework's mqtt 客户端， 它允许在STM32 ！ @@ -76,26 +77,22 @@ IoTSharp.Edge.nanoFramework 是一个 nanoFramework's mqtt 客户端， 它允 更多信息请读这里 https://www.cnblogs.com/MysticBoy/p/13159648.html 官方网站为： https://www.nanoframework.net/ -## IoTSharp.Edge.RT-Thread - -IoTSharp.Edge.RT-Thread (STM32L4 + Wi-Fi, sensor, lcd, audio etc) 是一个国产实时操作系统RT-Thread的示例， 同时我们提供了两个图片， 供你参考。 项目链接如下 https://github.com/IoTSharp/IoTSharp.Edge.RT-Thread +## IoTSharp 的RT-Thread 开发包 -| | | -| ------------------------------------------------------------ | ------------------------------------------------------------ | -| 20190615010003.jpg | 20190615010115.jpg | +https://github.com/IoTSharp/iotsharp-rtthread-package +| IoTSharp 的软件生态 - MaiKeBing.CAP.ZeroMQ [![MaiKeBing.CAP.ZeroMQ](https://img.shields.io/nuget/v/MaiKeBing.CAP.ZeroMQ.svg)](https://www.nuget.org/packages/MaiKeBing.CAP.ZeroMQ/) - MaiKeBing.CAP.LiteDB [![MaiKeBing.CAP.LiteDB](https://img.shields.io/nuget/v/MaiKeBing.CAP.LiteDB.svg)](https://www.nuget.org/packages/MaiKeBing.CAP.LiteDB/) - MaiKeBing.HostedService.ZeroMQ [![MaiKeBing.HostedService.ZeroMQ](https://img.shields.io/nuget/v/MaiKeBing.HostedService.ZeroMQ.svg)](https://www.nuget.org/packages/MaiKeBing.HostedService.ZeroMQ/) - IoTSharp.X509Extensions [![IoTSharp.X509Extensions](https://img.shields.io/nuget/v/IoTSharp.X509Extensions.svg)](https://www.nuget.org/packages/IoTSharp.X509Extensions/) -- MQTTnet.AspNetCoreEx [![MQTTnet.AspNetCoreEx](https://img.shields.io/nuget/v/MQTTnet.AspNetCoreEx.svg)](https://www.nuget.org/packages/MQTTnet.AspNetCoreEx/) - Silkier [![Silkier](https://img.shields.io/nuget/v/Silkier.svg)](https://www.nuget.org/packages/Silkier/) - Silkier.EFCore [![Silkier.EFCore](https://img.shields.io/nuget/v/Silkier.EFCore.svg)](https://www.nuget.org/packages/Silkier.EFCore/) - Silkier.AspNetCore [![Silkier.AspNetCore](https://img.shields.io/nuget/v/Silkier.AspNetCore.svg)](https://www.nuget.org/packages/Silkier.AspNetCore/) - SilkierQuartz [![SilkierQuartz](https://img.shields.io/nuget/v/SilkierQuartz.svg)](https://www.nuget.org/packages/SilkierQuartz/) -- Maikebing.EntityFrameworkCore.Taos [![Maikebing.EntityFrameworkCore.Taos](https://img.shields.io/nuget/v/Maikebing.EntityFrameworkCore.Taos.svg)](https://www.nuget.org/packages/Maikebing.EntityFrameworkCore.Taos/) +- IoTSharp.EntityFrameworkCore.Taos [![IoTSharp.EntityFrameworkCore.Taos](https://img.shields.io/nuget/v/IoTSharp.EntityFrameworkCore.Taos.svg)](https://www.nuget.org/packages/IoTSharp.EntityFrameworkCore.Taos/) - IoTSharp.Sdk.Http [![IoTSharp.Sdk.Http](https://img.shields.io/nuget/v/IoTSharp.Sdk.Http.svg)](https://www.nuget.org/packages/IoTSharp.Sdk.Http/) - IoTSharp.Sdk.MQTT [![IoTSharp.Sdk.MQTT](https://img.shields.io/nuget/v/IoTSharp.Sdk.MQTT.svg)](https://www.nuget.org/packages/IoTSharp.Sdk.MQTT/) @@ -120,6 +117,7 @@ This project exists thanks to all the people who contribute. This project is an Apache 2.0 licensed open source project. In order to achieve better and sustainable development of the project, we expect to gain more backers. We will use the proceeds for community operations and promotion. You can support us in any of the following ways: - [OpenCollective](https://opencollective.com/IoTSharp) +- 微信![二维码](docs/static/img/maikebing_wxpay.png) We will put the detailed donation records on the below! @@ -130,6 +128,8 @@ We will put the detailed donation records on the below! | [![@iioter](https://avatars.githubusercontent.com/u/29589505?s=80&v=4)](https://github.com/iioter) | whd | ![GitHub User's stars](https://img.shields.io/github/stars/iioter?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge) | ￥512 =120+100+292(码云共计三次) | | | [![@nnhy](https://avatars.githubusercontent.com/u/506367?s=80&v=4)](https://github.com/nnhy) | 大石头 | ![GitHub User's stars](https://img.shields.io/github/stars/nnhy?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge) | ￥672=666+5（码云+公众号） | | | | 无敌飞行家 | ![GitHub User's stars](https://img.shields.io/github/stars/hehaoyu_2014?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge) | ￥5=5(公众号) | | +| | 匿名公司 | | ￥1000=1000(微信转账) | | +| [![@davidzhu001](https://avatars.githubusercontent.com/u/9436230?s=80&v=4)](https://github.com/davidzhu001) | 农民也很疯狂 | ![GitHub User's stars](https://img.shields.io/github/stars/davidzhu001?affiliations=OWNER%2CCOLLABORATOR%2CORGANIZATION_MEMBER&style=for-the-badge)| ￥200 微信转账 | | @@ -140,9 +140,9 @@ If you encounter any problems in the process, feel free to ask for help via foll - [![Discord Server](https://img.shields.io/discord/895689311612178442?color=%237289DA&label=IoTSharp&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/My6PaTmUvu) -| 公众号 | [QQ群63631741](https://jq.qq.com/?_wv=1027&k=HJ7h3gbO) | -| ------ | ---- | -| ![](docs/static/img/qrcode.jpg) | ![](docs/static/img/IoTSharpQQGruop.png) | +| 公众号 | [QQ群63631741](https://jq.qq.com/?_wv=1027&k=HJ7h3gbO) | 微信群 | +| ------ | ---- | ---- | +| ![](docs/static/img/qrcode.jpg) | ![](docs/static/img/IoTSharpQQGruop.png) | ![企业微信群](docs/static/img/qyqun.jpg) | diff --git a/docs/static/img/qyqun.jpg b/docs/static/img/qyqun.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6af14740fed73d15b10e7d2aaf80ce81327e5e1d Binary files /dev/null and b/docs/static/img/qyqun.jpg differ