Skip to content

Commit

Permalink
2.0 版本归档
Browse files Browse the repository at this point in the history
  • Loading branch information
iioter committed Apr 23, 2023
1 parent 5c78bb5 commit 0dff561
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 25 deletions.
Binary file removed Export_DeviceSettings_202304122238403461.xlsx
Binary file not shown.
Binary file added Export_DeviceSettings_本地.xlsx
Binary file not shown.
Binary file added Export_DeviceSettings_线上.xlsx
Binary file not shown.
7 changes: 3 additions & 4 deletions IoTGateway/Views/Login/Login.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<header class="login-header">
<img src="/images/logo.png" alt="" height="48">
<img src="/images/wxgroup.png" alt="" style="float:right" height="150">
<img src="/images/公众号.jpg" alt="" height="150">
</header>
<div class="login-content">
<div class="login-form">
Expand Down Expand Up @@ -71,9 +70,9 @@
<span class="login-error">@Model.MSD.GetFirstError()</span>
<button type="submit" class="login-button" style="cursor:pointer">@Model.Localizer["Login.Login"]</button>

<button class="login-button" style="cursor: pointer">
<a href="http://iotgateway.net/docs/enterprise/intro" target="_blank">教程文档</a>
</button>
<div class="login-button" style="cursor:pointer">
<a href="http://iotgateway.net/docs/enterprise/intro" target="_blank">企业版</a>
</div>

@*<wt:linkbutton window-title="@Model.Localizer["Login.Register"]" class="login-button" style="cursor:pointer" target="ButtonTargetEnum.Layer" window-width="500" window-height="500" url="/Login/Reg" text="@Model.Localizer["Login.Register"]" />*@
</li>
Expand Down
Binary file modified IoTGateway/iotgateway.db
Binary file not shown.
2 changes: 1 addition & 1 deletion Plugins/Drivers/CNC.Fanuc.H/CNC.Fanuc.H.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HslCommunication" Version="11.5.0" />
<PackageReference Include="HslCommunication" Version="11.5.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

Expand Down
65 changes: 54 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
>
> 南向连接到你的任何设备和系统(如PLC、扫码枪、CNC、数据库、串口设备、上位机、非标设备、OPC Server、OPC UA Server、Mqtt Server等)
>
> 北向连接Thingsboard、IoTSharp、华为云或您自己的物联网平台(MES、SCADA)等进行双向数据通讯
> 北向连接[IoTSharp](https://github.com/IoTSharp/IoTSharp)[ThingsCloud](https://www.thingscloud.xyz/)[ThingsBoard](https://thingsboard.io/)、华为云或您自己的物联网平台(MES、SCADA)等进行双向数据通讯
>
> 当然也可以进行边缘计算
> 当然也可以进行边缘计算
>
## [教程文档](http://iotgateway.net/)
Expand Down Expand Up @@ -44,7 +44,7 @@


## 北向
- thingsboard、iotsharp、华为云等第三方平台
- iotsharp、thingscloud、thingsboard、华为云等第三方平台
- 遥测、属性上传
- RPC反向控制
![rpc](./images/rpc.gif)
Expand Down Expand Up @@ -75,24 +75,67 @@
-*严格*遵循**MIT**协议
- [企业版介绍点我](http://iotgateway.net/docs/enterprise/intro)



## 获得奖项(部分)

- **.NET20周年云原生开发挑战赛一等奖**

- **Gitee 2022 GVP**

- **OSC 2022 最火热中国开源项目社区**

## 企业客户(部分)

国家电网(电力)、中国移动、歌尔股份(3C)、经纬纺机(央企上市)、BOSCH(汽车零部件)、凌坤智能(AGV)、容恒、卧晨、惠斯通、益信......

## 友情链接

### IoTClient
### ThingsCloud公有云

项目地址:
https://www.thingscloud.xyz/
概述:
ThingsCloud 在设备和用户之间建立开箱即用的云平台和云应用,实现数据采集、实时控制、数据可视化、开放 API,构建灵活强大的物联网应用。

### IoTClient通讯库

开源地址:
https://github.com/zhaopeiym/IoTClient
概述:
这是一个基于.NET Standard 2.0物联网设备通讯协议实现客户端,包括主流PLC、Bacnet等。

## 获得奖项(部分)

### .NET20周年云原生开发挑战赛一等奖
### Gitee 2022 GVP
### OSC 2022 最火热中国开源项目社区
## 致谢

Star、代码贡献、文档贡献和赞助是我持续更新的动力。

感谢贡献代码的各位:**麦壳饼、谷草、老翁钓大鱼、dapeng17951、ccliushou、BenjaminChenGH、sugerlcc、wqliceman**

打赏列表:

| 昵称 | 金额 | 时间 |
| ------------- | ----- | -------- |
| TerryHj | 8.88 | 不可考证 |
| Amengone | 50 | 不可考证 |
| xiaotuxing | 66 | 20220520 |
| 华仔 | 28.88 | 20220524 |
| Mr.Ethan | 5 | 20220611 |
| 刘金平 | 50 | 20220712 |
| 农民也疯狂 | 600 | 20220725 |
| . | 10 | 20220725 |
| Gary | 50 | 20220808 |
| . | 200 | 20220902 |
| 匿名 | 20 | 20220908 |
| 浪上飞郑 | 10 | 20220915 |
| SPA | 50 | 20221119 |
| iKuo | 100 | 20221212 |
| 陶白白 | 100 | 20230109 |
| Carrey | 100 | 20230113 |
| MC | 400 | 20230114 |
| LoveChina8888 | 6.66 | 20230121 |
| guoke | 200 | 20230207 |

## 企业客户(部分)

国家电网(电力)、歌尔股份(3C)、经纬纺机(央企上市)、BOSCH(汽车零部件)、凌坤智能(AGV)、容恒、卧晨、惠斯通、益信......

## 打赏请留微信或QQ

Expand Down
16 changes: 8 additions & 8 deletions drivers/net6.0/CNC.Fanuc.H.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
".NETCoreApp,Version=v6.0": {
"CNC.Fanuc.H/1.0.0": {
"dependencies": {
"HslCommunication": "11.5.0",
"HslCommunication": "11.5.2",
"Newtonsoft.Json": "13.0.1",
"PluginInterface": "1.0.0"
},
"runtime": {
"CNC.Fanuc.H.dll": {}
}
},
"HslCommunication/11.5.0": {
"HslCommunication/11.5.2": {
"dependencies": {
"Newtonsoft.Json": "13.0.1",
"System.IO.Ports": "6.0.0"
},
"runtime": {
"lib/netstandard2.1/HslCommunication.dll": {
"assemblyVersion": "11.5.0.0",
"fileVersion": "11.5.0.0"
"assemblyVersion": "11.5.2.0",
"fileVersion": "11.5.2.0"
}
}
},
Expand Down Expand Up @@ -140,12 +140,12 @@
"serviceable": false,
"sha512": ""
},
"HslCommunication/11.5.0": {
"HslCommunication/11.5.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-VD+nfNHPb9zNuk/eULWkhPvwYIBNz+mB2HHKmBac9BnY1MhaHPYr1xrMQYRv1AphuNjPFoZrwB3GUU3d1qALoA==",
"path": "hslcommunication/11.5.0",
"hashPath": "hslcommunication.11.5.0.nupkg.sha512"
"sha512": "sha512-8h6s/KzAlq4jndzURYFjmqGnZFRxuE0N39H+IQKk9ojJ0+YbTlv3afBytNaqMZf3mZauZmH1//FMaluef7+P7g==",
"path": "hslcommunication/11.5.2",
"hashPath": "hslcommunication.11.5.2.nupkg.sha512"
},
"Microsoft.Extensions.Logging.Abstractions/6.0.2": {
"type": "package",
Expand Down
Binary file modified drivers/net6.0/CNC.Fanuc.H.dll
Binary file not shown.
Binary file modified drivers/net6.0/CNC.Fanuc.H.pdb
Binary file not shown.
Binary file modified drivers/net6.0/HslCommunication.dll
Binary file not shown.
Binary file modified drivers/net6.0/System.IO.Ports.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion webscada-project.json

Large diffs are not rendered by default.

0 comments on commit 0dff561

Please sign in to comment.