发行1.10版本

2、弃用IntelligentConcurrentQueue(touchsocket集成类)

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -360,4 +360,10 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+/src/ThingsGateway.Web.Server/Default.db
+/src/PluginPro*/
+/src/*Pro*
+/src/TestResults*/
+/src/ThingsGateway.Web.Server/ThingsGateway.db

LICENSE.txt

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -87,7 +86,7 @@
       granted to You under this License for that Work shall terminate
       as of the date such litigation is filed.
 
-   4. Cachetribution. You may reproduce and distribute copies of the
+   4. Redistribution. You may reproduce and distribute copies of the
       Work or Derivative Works thereof in any medium, with or without
       modifications, and in Source or Object form, provided that You
       meet the following conditions:
@@ -187,16 +186,16 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023-present Diego
+   Copyright [yyyy] [name of copyright owner]
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,95 +1,99 @@
-# ThingsGateway
+<div align="center"><h1 align="center">ThingsGateway</a></h1></div>
+<div align="center"><h3 align="center">边缘采集网关</h3></div>
 
-
+#### 介绍
 
-## Introduction
-
-
-A cross-platform, high-performance edge data collection gateway based on net8, capable of handling millions of data points per.
-
-
-## Documentation
-
-
-[Documentation](https://thingsgateway.cn/).
-
-[NuGet](https://www.nuget.org/packages?q=Tags%3A%22ThingsGateway%22)
-
-
-### Plugin List
-
-
-
-#### Data Collection Plugins
+基于[ThingsBlazor](https://gitee.com/diego2098/ThingsBlazor)权限管理框架开发的跨平台边缘采集网关，支持南北端插件式开发，
+动态更新插件，并拥有较完善的北端Rpc权限管理。
 
 
-| Plugin Name | Remarks                                                       |
-| ----------- | ------------------------------------------------------------- |
-| Modbus      | Supports Rtu/Tcp message formats, with Serial/Tcp/Udp links   |
-| SiemensS7   | Siemens PLC S7 series                                         |
-| Dlt6452007  | Supports Serial/Tcp/Udp links                                 |
-| OpcDaMaster | Compiled for 64-bit                                           |
-| OpcUaMaster | Supports certificate login, object extension, Json read/write |
+####  功能亮点
 
-#### Business Plugins
+- Blazor Server架构，开发部署更简单
+- 采集/上传配置完全支持Excel导入导出
+- 插件式驱动，方便驱动二次开发，并支持动态更新
+- 支持时序数据库存储
+- 实时/历史报警(Sql转储)，支持布尔/高低限值
+
+#### 社区版采集插件
+> 支持分包解析/订阅
+- Modbus(Rtu/Tcp/Udp)
+- OPCDAClient（支持导入节点）
+- OPCUAClient（支持导入节点）
+- 西门子S7协议
+
+#### 社区版上传插件
+> 支持Rpc写入
+- Modbus Server
+- Mqtt Server
+- Mqtt Client
+
+> 不支持Rpc
+- RabbitMQ
 
 
-| Plugin Name      | Remarks                                                                                           |
-| ---------------- | ------------------------------------------------------------------------------------------------- |
-| ModbusSlave      | Supports Rtu/Tcp message formats, with Serial/Tcp/Udp links, supports Rpc reverse writing         |
-| OpcUaServer      | OpcUa server, supports Rpc reverse writing                                                        |
-| MqttClient       | Mqtt client, supports Rpc reverse writing, script-customizable upload content                     |
-| MqttServer       | Mqtt server, supports WebSocket, supports Rpc reverse writing, script-customizable upload content |
-| KafkaProducer    | Script-customizable upload content                                                                |
-| RabbitMQProducer | Script-customizable upload content                                                                |
-| SqlDB            | Relational database storage, supports historical storage and real-time data updates               |
-| SqlHistoryAlarm      | Alarm historical data relational database storage                                                 |
-| TDengineDB       | Time-series database storage                                                                      |
-| QuestDB          | Time-series database storage                                                                      |
+#### nuget
 
-
-
-## License
-
-
-[Apache-2.0](https://gitee.com/diego2098/ThingsGateway/blob/master/LICENSE)
-
-
-## Demo
-
-
-[Demo](http://47.119.161.158:5000/)
-
-Account: **SuperAdmin**
-
-Password: **111111**
-
-**In the upper-right corner, switch to the IoT Gateway module in the personal popup box**
-
-## Docker
-
-```shell
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
+- Modbus库，支持ModbusTcp、ModbusRtu、ModbusRtuOverTcp、ModbusUdp、ModbusServer等
+``` powershell
+ dotnet add package ThingsGateway.Foundation.Adapter.Modbus
+```
+- OPCDA客户端库，支持X64，支持NetCore，支持检测重连
+``` powershell
+ dotnet add package ThingsGateway.Foundation.Adapter.OPCDA
+```
+- OPCUA客户端库
+``` powershell
+ dotnet add package ThingsGateway.Foundation.Adapter.OPCUA
 ```
 
-
+- S7库
+``` powershell
+ dotnet add package ThingsGateway.Foundation.Adapter.Siemens
+```
 
-## Sponsorship
+####  效果图
+ <table>
+    <tr>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/1.png"/></td>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/2.png"/></td>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/3.png"/></td>
+    </tr>
+    <tr>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/4.png"/></td>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/5.png"/></td>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/6.png"/></td>
+    </tr>
+        <tr>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/7.png"/></td>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/8.png"/></td>
+        <td><img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/9.png"/></td>
+    </tr>
+ </table>
 
-
-[Sponsorship Approach](https://thingsgateway.cn/docs/1000)
-
 
-## Community
+ ####  文档
 
-
-QQ Group: 605534569 [Jump](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=NnBjPO-8kcNFzo_RzSbdICflb97u2O1i&authKey=V1MI3iJtpDMHc08myszP262kDykbx2Yev6ebE4Me0elTe0P0IFAmtU5l7Sy5w0jx&noverify=0&group_code=605534569)
-
+ 使用前请查看Gitee Pages [文档站点](https://diego2098.gitee.io/thingsgateway/)
 
-## Pro Plugins
+ 
+#### 补充说明
+* 使用OPC相关插件时请遵循OPC基金会的授权规则
+* 使用OPCDA插件时，需安装OPC核心库，[文件地址](https://gitee.com/diego2098/ThingsGateway/attach_files)
+
+#### 开源协议
+
+请仔细阅读 [授权协议](https://diego2098.gitee.io/thingsgateway/docs/)
+
+
+
+####  支持作者
+ 如果对您有帮助，请点击右上角⭐Star关注，感谢支持开源！
+
+ 若希望捐赠项目，请[点击](https://diego2098.gitee.io/thingsgateway/docs/03%E3%80%81%E6%94%AF%E6%8C%81%E9%A1%B9%E7%9B%AE%E4%B8%8EPro%E7%89%88%E8%AF%B4%E6%98%8E/%E6%94%AF%E6%8C%81%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE/)查看捐赠码或使用Gitee捐赠功能
+
+
+####  联系作者
+ * QQ群：605534569
+ * 邮箱：2248356998@qq.com
 
-
-[Plugin List](https://thingsgateway.cn/docs/1001)

README.zh-CN.md

@@ -1,75 +0,0 @@
-# ThingsGateway
-
-## 介绍
-
-基于net8的跨平台高性能边缘采集网关，单机采集数据点位可达百万
-
-## 文档
-
-[文档](https://thingsgateway.cn/)
-
-[NuGet](https://www.nuget.org/packages?q=Tags%3A%22ThingsGateway%22)
-
-### 插件列表
-
-#### 采集插件
-
-
-| 插件名称    | 备注                                  |
-| ----------- | ------------------------------------- |
-| Modbus      | Rtu/Tcp报文格式，支持串口/Tcp/Udp链路 |
-| SiemensS7   | 西门子PLC S7系列                      |
-| Dlt6452007  | 支持串口/Tcp/Udp链路                  |
-| OpcDaMaster | 64位编译                              |
-| OpcUaMaster | 支持证书登录，扩展对象，Json读写      |
-
-#### 业务插件
-
-
-| 插件名称         | 备注                                                       |
-| ---------------- | ---------------------------------------------------------- |
-| ModbusSlave      | Rtu/Tcp报文格式，支持串口/Tcp/Udp链路，支持Rpc反写         |
-| OpcUaServer      | OpcUa服务端，支持Rpc反写                                   |
-| MqttClient       | Mqtt客户端，支持Rpc反写，脚本自定义上传内容                |
-| MqttServer       | Mqtt服务端，支持WebSocket，支持Rpc反写，脚本自定义上传内容 |
-| KafkaProducer    | 脚本自定义上传内容                                         |
-| RabbitMQProducer | 脚本自定义上传内容                                         |
-| SqlDB            | 关系数据库存储，支持历史存储和实时数据更新                 |
-| SqlHistoryAlarm      | 报警历史数据关系数据库存储                                 |
-| TDengineDB       | 时序数据库存储                                             |
-| QuestDB          | 时序数据库存储                                             |
-
-## 协议
-
-[Apache-2.0](https://gitee.com/diego2098/ThingsGateway/blob/master/LICENSE)
-
-## 演示
-
-[ThingsGateway演示地址](http://47.119.161.158:5000/)
-
-账户	:  **SuperAdmin**
-
-密码 : **111111**
-
-**右上角个人弹出框中，切换到物联网关模块**
-
-## Docker
-
-```shell
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
-```
-
-## 赞助
-
-[赞助途径](https://thingsgateway.cn/docs/1000)
-
-## 社区
-
-QQ群：605534569 [跳转](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=NnBjPO-8kcNFzo_RzSbdICflb97u2O1i&authKey=V1MI3iJtpDMHc08myszP262kDykbx2Yev6ebE4Me0elTe0P0IFAmtU5l7Sy5w0jx&noverify=0&group_code=605534569)
-
-## Pro插件
-
-[插件列表](https://thingsgateway.cn/docs/1001)

handbook/.gitignore

@@ -0,0 +1,20 @@
+# Dependencies
+node_modules
+
+# Production
+# build
+
+# Generated files
+.docusaurus
+.cache-loader
+
+# Misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

handbook/README.md

@@ -0,0 +1,15 @@
+文档基于 [https://www.docusaurus.io/](https://www.docusaurus.io/) 构建。
+
+### 本地运行
+
+```bash
+npm install
+
+npm run start
+```
+
+### 发布部署
+
+```bash
+npm run build
+```

handbook/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: [require.resolve('@docusaurus/core/lib/babel/preset')],
+};

handbook/build/assets/js/1a4e3797.83cee253.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkthingsgateway=self.webpackChunkthingsgateway||[]).push([[920],{2027:(e,t,n)=>{n.r(t),n.d(t,{default:()=>_});var a=n(7294),r=n(2263),l=n(8765),s=n(5742),c=n(9960),o=n(5999);const u=["zero","one","two","few","many","other"];function m(e){return u.filter((t=>e.includes(t)))}const h={locale:"en",pluralForms:m(["one","other"]),select:e=>1===e?"one":"other"};function i(){const{i18n:{currentLocale:e}}=(0,r.Z)();return(0,a.useMemo)((()=>{try{return function(e){const t=new Intl.PluralRules(e);return{locale:e,pluralForms:m(t.resolvedOptions().pluralCategories),select:e=>t.select(e)}}(e)}catch(t){return console.error(`Failed to use Intl.PluralRules for locale "${e}".\nDocusaurus will fallback to the default (English) implementation.\nError: ${t.message}\n`),h}}),[e])}function g(){const e=i();return{selectMessage:(t,n)=>function(e,t,n){const a=e.split("|");if(1===a.length)return a[0];a.length>n.pluralForms.length&&console.error(`For locale=${n.locale}, a maximum of ${n.pluralForms.length} plural forms are expected (${n.pluralForms.join(",")}), but the message contains ${a.length}: ${e}`);const r=n.select(t),l=n.pluralForms.indexOf(r);return a[Math.min(l,a.length-1)]}(n,t,e)}}var p=n(6775),d=n(412);const f=function(){const e=(0,p.k6)(),t=(0,p.TH)(),{siteConfig:{baseUrl:n}}=(0,r.Z)(),a=d.Z.canUseDOM?new URLSearchParams(t.search):null,l=(null==a?void 0:a.get("q"))||"",s=(null==a?void 0:a.get("ctx"))||"",c=(null==a?void 0:a.get("version"))||"",o=e=>{const n=new URLSearchParams(t.search);return e?n.set("q",e):n.delete("q"),n};return{searchValue:l,searchContext:s,searchVersion:c,updateSearchPath:t=>{const n=o(t);e.replace({search:n.toString()})},generateSearchPageLink:e=>{const t=o(e);return`${n}search?${t.toString()}`}}};var E=n(22),y=n(8202),S=n(2539),w=n(726),v=n(1073),b=n(311),I=n(3926),P=n(1029);const F="searchQueryInput_CFBF",R="searchResultItem_U687",C="searchResultItemPath_uIbk",$="searchResultItemSummary_oZHr";function k(){const{siteConfig:{baseUrl:e}}=(0,r.Z)(),{selectMessage:t}=g(),{searchValue:n,searchContext:l,searchVersion:c,updateSearchPath:u}=f(),[m,h]=(0,a.useState)(n),[i,p]=(0,a.useState)(),[d,S]=(0,a.useState)(),w=`${e}${c}`,v=(0,a.useMemo)((()=>m?(0,o.I)({id:"theme.SearchPage.existingResultsTitle",message:'Search results for "{query}"',description:"The search page title for non-empty query"},{query:m}):(0,o.I)({id:"theme.SearchPage.emptyResultsTitle",message:"Search the documentation",description:"The search page title for empty query"})),[m]);(0,a.useEffect)((()=>{u(m),i&&(m?i(m,(e=>{S(e)})):S(void 0))}),[m,i]);const I=(0,a.useCallback)((e=>{h(e.target.value)}),[]);return(0,a.useEffect)((()=>{n&&n!==m&&h(n)}),[n]),(0,a.useEffect)((()=>{!async function(){const{wrappedIndexes:e,zhDictionary:t}=await(0,E.w)(w,l);p((()=>(0,y.v)(e,t,100)))}()}),[l,w]),a.createElement(a.Fragment,null,a.createElement(s.Z,null,a.createElement("meta",{property:"robots",content:"noindex, follow"}),a.createElement("title",null,v)),a.createElement("div",{className:"container margin-vert--lg"},a.createElement("h1",null,v),a.createElement("input",{type:"search",name:"q",className:F,"aria-label":"Search",onChange:I,value:m,autoComplete:"off",autoFocus:!0}),!i&&m&&a.createElement("div",null,a.createElement(b.Z,null)),d&&(d.length>0?a.createElement("p",null,t(d.length,(0,o.I)({id:"theme.SearchPage.documentsFound.plurals",message:"1 document found|{count} documents found",description:'Pluralized label for "{count} documents found". Use as much plural forms (separated by "|") as your language support (see https://www.unicode.org/cldr/cldr-aux/charts/34/supplemental/language_plural_rules.html)'},{count:d.length}))):a.createElement("p",null,(0,o.I)({id:"theme.SearchPage.noResultsText",message:"No documents were found",description:"The paragraph for empty search result"}))),a.createElement("section",null,d&&d.map((e=>a.createElement(x,{key:e.document.i,searchResult:e}))))))}function x(e){let{searchResult:{document:t,type:n,page:r,tokens:l,metadata:s}}=e;const o=0===n,u=2===n,m=(o?t.b:r.b).slice(),h=u?t.s:t.t;o||m.push(r.t);let i="";if(P.vc&&l.length>0){const e=new URLSearchParams;for(const t of l)e.append("_highlight",t);i=`?${e.toString()}`}return a.createElement("article",{className:R},a.createElement("h2",null,a.createElement(c.Z,{to:t.u+i+(t.h||""),dangerouslySetInnerHTML:{__html:u?(0,S.C)(h,l):(0,w.o)(h,(0,v.m)(s,"t"),l,100)}})),m.length>0&&a.createElement("p",{className:C},(0,I.e)(m)),u&&a.createElement("p",{className:$,dangerouslySetInnerHTML:{__html:(0,w.o)(t.t,(0,v.m)(s,"t"),l,100)}}))}const _=function(){return a.createElement(l.Z,null,a.createElement(k,null))}}}]);

handbook/build/assets/js/443.a35c493a.js.LICENSE.txt

@@ -0,0 +1 @@
+/*! https://mths.be/cssesc v3.0.0 by @mathias */

handbook/build/assets/js/444af13b.a37fbda4.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkthingsgateway=self.webpackChunkthingsgateway||[]).push([[875],{2776:s=>{s.exports=JSON.parse('{"name":"@easyops-cn/docusaurus-search-local","id":"default"}')}}]);

handbook/build/assets/js/525.ee7ff280.js

@@ -0,0 +1 @@
+(self.webpackChunkthingsgateway=self.webpackChunkthingsgateway||[]).push([[525],{5525:()=>{}}]);