修正首页说明和中文说明

62f3c5da · 麦壳饼 · fdb2a05f · 62f3c5da · 62f3c5da · 62f3c5da
5 changed file
--- a/IoTSharp.SDKs/IoTSharp.Sdk.CSharp/IoTSharp.Sdk.Http.csproj
+++ b/IoTSharp.SDKs/IoTSharp.Sdk.CSharp/IoTSharp.Sdk.Http.csproj
@@ -8,8 +8,8 @@
    <Authors>Maikebing</Authors>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <Version>1.0.1</Version>
-    <PackageProjectUrl>https://github.com/IoTSharp/IoTSharp.SDKs</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/IoTSharp/IoTSharp.SDKs</RepositoryUrl>
+	  <PackageProjectUrl>https://github.com/IoTSharp/IoTSharp/tree/master/IoTSharp.SDKs</PackageProjectUrl>
+	  <RepositoryUrl>https://github.com/IoTSharp/IoTSharp</RepositoryUrl>
    <Description>IoTSharp's Sdk</Description>
    <Copyright>Copyright 2018-2020</Copyright>
    <PackageIcon>200x200.png</PackageIcon>

--- a/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj
+++ b/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj
@@ -7,8 +7,8 @@
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <Authors>Maikebing</Authors>
    <Product>IoTSharp</Product>
-    <PackageProjectUrl>https://github.com/IoTSharp/IoTSharp.SDKs</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/IoTSharp/IoTSharp.SDKs</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/IoTSharp/IoTSharp/tree/master/IoTSharp.SDKs</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/IoTSharp/IoTSharp</RepositoryUrl>
    <Copyright>Copyright 2018-2020</Copyright>
    <PackageIcon>200x200.png</PackageIcon>
 	  <IsPackable>true</IsPackable>

--- a/README.md
+++ b/README.md
@@ -9,29 +9,28 @@ IoTSharp is an open-source IoT platform for data collection, processing, visuali



-## How to install  ?
+## How to  install  IoTSharp using docker-compose  ?

-Go to https://github.com/IoTSharp/Deployments
+ * [ZPT](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments/zeromq_taos) Using ZeroMQ as EventBus, PostgreSQL as message storage, telemetry data stored through TDengine  

-or 
+ * [ZPS](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments/zeromq_sharding) The default deployment configuration, IoTSharp and PostgreSql, telemetry data is stored through a single table or shading. 

-```
- mkdir iotsharp
-cd iotsharp 
-wget https://raw.githubusercontent.com/IoTSharp/IoTSharp/master/docker-compose.yml
-docker-compose up -d  
-```
+ * [RMI](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments/rabbit_mongo_influx) Using Rabbitmq as EventBus, mongodb as message storage, telemetry data stored through influx  

+ more [Deployments](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments)

-Demo url : http://139.9.232.10:2927


-## How to install as docker ?
+## Demo 
+  http://139.9.232.10:2927
+
+
+## How to install IoTSharp using docker ?

  -  docker pull iotsharp/iotsharp


-## How to install as Linux service  ?
+## How to install  using Linux daemon ?

 -  mkdir  /var/lib/iotsharp/
 -	cp ./*  /var/lib/iotsharp/
@@ -44,17 +43,18 @@ Demo url : http://139.9.232.10:2927
 ## IoTSharp's Clients 
 - Cicada    A desktop application   

-# The referenced open source project
+

 ##  IoTSharp.SDKs

-IoTSharp.SDKs  included IoTSharp.Sdk.MQTT  IoTSharp.Sdk.Http  
-https://github.com/IoTSharp/IoTSharp.SDKs
+- 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/)
+
 

 ## IoTSharp-C-Client-Sdk

-IoTSharp-C-client-Sdk is mqttt client, it is by   c;
+IoTSharp-C-client-Sdk is mqttt client, write by   c;

 https://github.com/IoTSharp/IoTSharp-C-Client-Sdk

@@ -77,36 +77,29 @@ or click  https://www.nanoframework.net/
 IoTSharp.Edge.RT-Thread (STM32L4 + Wi-Fi, sensor, lcd, audio etc)

 https://github.com/IoTSharp/IoTSharp.Edge.RT-Thread
- 
+
 |                                                              |                                                              |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | <img src="docs/images/20190615010003.jpg" alt="20190615010003.jpg" style="zoom: 67%;" /> | <img src="docs/images/20190615010115.jpg" alt="20190615010115.jpg" style="zoom: 50%;" /> |

 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/)

+- 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.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.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/)

 ## Support

-| 公众号 |    QQ群  |
+| 公众号 |    [QQ群63631741](https://jq.qq.com/?_wv=1027&k=HJ7h3gbO)  |
 | ------ | ---- |
 | ![](docs/images/qrcode.jpg) | ![](docs/images/IoTSharpQQGruop.png) |


--- a/README.zh.md
+++ b/README.zh.md
+![IOTSharp LOGO](docs/images/350x100.png)  
+
+[![Build status](https://ci.appveyor.com/api/projects/status/5o23f5vss89ct2lw/branch/master?svg=true)](https://ci.appveyor.com/project/MaiKeBing/iotsharp/branch/master)
+![GitHub](https://img.shields.io/github/license/iotsharp/iotsharp.svg)
+![.NET Core](https://github.com/IoTSharp/IoTSharp/workflows/.NET%20Core/badge.svg?branch=master)
+
+IoTSharp 是一个 基于.Net Core 开源的物联网基础平台， 支持 HTTP、MQTT 、CoAp 协议， 属性数据和遥测数据协议简单类型丰富，是一个用于数据收集、处理、可视化与设备管理的 IoT 平台.
+
+
+
+
+## 如何使用docker-compose  安装IoTSharp ?
+
+ * [ZPT](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments/zeromq_taos) 使用ZeroMQ 作为 EventBus, PostgreSQL 作为消息存储， 遥测数据使用  TDengine  
+
+ * [ZPS](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments/zeromq_sharding)  默认开发配置，  IoTSharp 和 PostgreSql, 遥测数据可以通过单表或者分表。 
+
+ * [RMI](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments/rabbit_mongo_influx) 使用Rabbitmq 作为 EventBus, Mongodb 作为消息存储， 遥测数据使用Influx 2.0 ，这个方案中遥测数据也可以使用TDengine
+
+ 更多的 [部署方案请点这里访问](https://github.com/IoTSharp/IoTSharp/tree/master/Deployments)
+
+
+
+## 演示：
+  http://139.9.232.10:2927
+
+
+## 如何使用 docker 安装IoTSharp?
+
+  -  docker pull iotsharp/iotsharp
+
+
+## 如何使用Linux 安装?
+
+ -  mkdir  /var/lib/iotsharp/
+ -	cp ./*  /var/lib/iotsharp/
+ -	chmod 777 /var/lib/iotsharp/IoTSharp
+ -	cp  iotsharp.service   /etc/systemd/system/iotsharp.service
+ -	sudo systemctl enable  /etc/systemd/system/iotsharp.service 
+ -	sudo systemctl start  iotsharp.service 
+ -	sudo journalctl -fu  iotsharp.service 
+
+## IoTSharp的客户端
+ - Cicada     一个桌面程序
+ -    [IoTSharp.ClientApp](IoTSharp.ClientApp)  Blazor编写的客户端
+
+##  IoTSharp.SDKs
+
+IoTSharp.SDKs  包括了 IoTSharp.Sdk.MQTT  IoTSharp.Sdk.Http  
+
+ 
+
+## IoTSharp-C-Client-Sdk
+
+IoTSharp-C-client-Sdk 是mqtt客户端， c语言编写的例子。 
+
+ https://github.com/IoTSharp/IoTSharp-C-Client-Sdk
+
+## paho.mqtt.c 的例子
+
+这个跟 IoTSharp-C-Client-Sdk 一样， 但是使用了 paho.mqtt.c
+ https://github.com/IoTSharp/IoTSharp.Edge.paho.mqtt.c
+
+## IoTSharp.Edge.nanoFramework
+
+IoTSharp.Edge.nanoFramework 是一个 nanoFramework's mqtt 客户端， 它允许在STM32 ！
+
+  https://github.com/IoTSharp/IoTSharp.Edge.nanoFramework
+
+更多信息请读这里 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
+
+|                                                              |                                                              |
+| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| <img src="docs/images/20190615010003.jpg" alt="20190615010003.jpg" style="zoom: 67%;" /> | <img src="docs/images/20190615010115.jpg" alt="20190615010115.jpg" style="zoom: 50%;" /> |
+
+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.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/)
+
+## Support
+
+| 公众号 |    [QQ群63631741](https://jq.qq.com/?_wv=1027&k=HJ7h3gbO)  |
+| ------ | ---- |
+| ![](docs/images/qrcode.jpg) | ![](docs/images/IoTSharpQQGruop.png) |
+
+## Contributing
+ - If you'd like to contribute to IoTSharp, please take a look at our [Contributing Guide](contributing.md).
+ - If you have a question or have found a bug,[ file an issue.](https://github.com/IoTSharp/IoTSharp/issues)
+ - To learn about project priorities as well as status and ship dates see the [IoTShap roadmap](roadmap.md).
+
--- a/appveyor.yml
+++ b/appveyor.yml
 version: 1.5.{build}
 image: Visual Studio 2019
+configuration: Release
+platform: Any CPU
 init:
 - ps: Install-Product node $env:nodejs_version
 assembly_info:
@@ -25,9 +27,11 @@ install:

    git submodule update --init --recursive
 build_script:
- cmd: >-
-    dotnet publish  -c Release   ./IoTSharp/IoTSharp.csproj
-
+- cmd: msbuild  -r -v:m  -t:rebuild -p:Configuration=Release IoTSharp.sln
 artifacts:
- path: IoTSharp\bin\Release\net5.0\publish\
+- path: IoTSharp\bin\Release\*.nupkg
+- path: IoTSharp.SDKs\IoTSharp.Sdk.MQTT\bin\Release\*.nupkg
+- path: IoTSharp.SDKs\IoTSharp.Sdk.CSharp\bin\Release\*.nupkg
+- path: IoTSharp.ClientApp\bin\Release\net5.0\wwwroot
+  name: IoTSharp.ClientApp
 deploy: off
\ No newline at end of file