更新文档

1、增加采集通道冗余
2、优化多个界面
3、导出导入功能优化
4、增加中间变量
5、OPCUAClient支持动态类型
6、离线缓存多处覆盖，包含上传插件/历史报警/时序库
7、增加通用调试界面，增加s7调试
8、其他优化

.gitignore

@@ -362,8 +362,10 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
-/src/ThingsGateway.Web.Server/Default.db
+/src/Plugins/Other
+/src/ThingsGateway.Web.Server/*.db
 /src/PluginPro*/
 /src/*Pro*
 /src/TestResults*/
 /src/ThingsGateway.Web.Server/ThingsGateway.db
+

README.md

@@ -1,26 +1,73 @@
-<div align="center"><h1 align="center">ThingsGateway</a></h1></div>
-<div align="center"><h3 align="center">边缘采集网关</h3></div>
+
+<div align='center'>
+<img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/gitLogo.png" height=100 />
+
+<div align="center"> 
+
+[![NuGet(ThingsGateway)](https://img.shields.io/nuget/v/ThingsGateway.Foundation.svg?label=ThingsGateway.Foundation)](https://www.nuget.org/packages/kimdiego/)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![star](https://gitee.com/diego2098/ThingsGateway/badge/star.svg)](https://gitee.com/diego2098/ThingsGateway/stargazers) 
+[![fork](https://gitee.com/diego2098/ThingsGateway/badge/fork.svg)](https://gitee.com/diego2098/ThingsGateway/members) 
+![qq](https://img.shields.io/badge/QQ群-605534569-blue)
+
+</div>  
+</div>
 
 #### 介绍
 
-基于[ThingsBlazor](https://gitee.com/diego2098/ThingsBlazor)权限管理框架开发的跨平台边缘采集网关，支持南北端插件式开发，
-动态更新插件，
+基于Net6/7+Blazor Server的跨平台边缘采集网关，支持南北端插件式开发，
 并拥有较完善的北端Rpc权限管理。
 
+[Github地址](https://github.com/kimdiego2098/ThingsGateway)
+
+<div >
+如果对您有帮助，请点击右上角⭐Star关注，感谢支持开源！
+</div>
+
+#### 开源说明
+
+Apache 2.0+[附加协议](https://diego2098.gitee.io/thingsgateway-docs/docs/)
+
+Apache 2.0 开源协议的核心内容是以保护和尊重原作者的著作权为主要目的。对使用，复制，修改，商用不做过多限制，但必须包含原著的License信息。
 
 ####  功能亮点
 
 - Blazor Server架构，开发部署更简单
 - 采集/上传配置完全支持Excel导入导出
-- 插件式驱动，方便驱动二次开发，并支持动态更新
-- Modbus、OPCDA、OPCUA采集插件（支持导入节点）
-- Modbus Server、Mqtt Server(Client)、OPC UAServer插件,支持Rpc写入，支持WebApi
-- 支持时序数据库存储
+- 插件式驱动，方便驱动二次开发
+- 支持采集通道冗余，上传离线缓存
+- 时序数据库存储
 - 实时/历史报警(Sql转储)，支持布尔/高低限值
 
+#### 演示
+
+http://120.24.62.140:5000/
+
+默认账户密码：superAdmin 111111
+
+
+#### 社区版采集插件
+> 支持分包解析/订阅
+- Modbus(Rtu/Tcp/Udp)
+- OPCDAClient（支持导入节点）
+- OPCUAClient（支持导入节点，动态类型）
+- 西门子S7协议
+
+#### 社区版上传插件
+> 支持Rpc写入
+- Modbus Server
+- OPCUA Server (支持历史查询)
+- Mqtt Server (支持自定义json)
+- Mqtt Client (支持自定义json)
+- IotSharp Client (IotSharp网关插件，Rpc待测试)
+
+> 不支持Rpc
+- RabbitMQ (支持自定义json)
+- Kafka
+
 #### nuget
 
-- Modbus库，支持ModbusTcp、ModbusRtuOverTcp、ModbusUdp、ModbusServer等
+- Modbus库，支持ModbusTcp、ModbusRtu、ModbusRtuOverTcp、ModbusUdp、ModbusServer等
 ``` powershell
  dotnet add package ThingsGateway.Foundation.Adapter.Modbus
 ```
@@ -32,6 +79,12 @@
 ``` powershell
  dotnet add package ThingsGateway.Foundation.Adapter.OPCUA
 ```
+
+- S7库
+``` powershell
+ dotnet add package ThingsGateway.Foundation.Adapter.Siemens
+```
+
 ####  效果图
  <table>
     <tr>
@@ -54,23 +107,33 @@
 
  ####  文档
 
- 使用前请查看Gitee Pages [文档站点](https://diego2098.gitee.io/thingsgateway/)
+ 使用前请查看Gitee Pages [文档站点](https://diego2098.gitee.io/thingsgateway-docs/)
+
+ #### 特别鸣谢
+-  Furion：[https://dotnetchina.gitee.io/furion](https://dotnetchina.gitee.io/furion)
+-  SqlSugar：[https://gitee.com/dotnetchina/SqlSugar](https://gitee.com/dotnetchina/SqlSugar)
+-  Simple.Admin：[https://gitee.com/zxzyjs/SimpleAdmin](https://gitee.com/zxzyjs/SimpleAdmin)
+-  Masa.Blazor：[https://www.masastack.com/blazor](https://www.masastack.com/blazor)
+-  MiniExcel：[https://gitee.com/dotnetchina/MiniExcel](https://gitee.com/dotnetchina/MiniExcel)
+-  TouchSocket：[https://gitee.com/rrqm_home/touchsocket](https://gitee.com/rrqm_home/touchsocket)
+-  IdGenerator：[https://github.com/yitter/idgenerator](https://github.com/yitter/idgenerator)
+-  CodingSeb.ExpressionEvaluator：[https://github.com/codingseb/ExpressionEvaluator](https://github.com/codingseb/ExpressionEvaluator)
+-  Hardware.Info：[https://github.com/Jinjinov/Hardware.Info](https://github.com/Jinjinov/Hardware.Info)
+-  UAParser：[https://github.com/ua-parser/uap-csharp](https://github.com/ua-parser/uap-csharp)
+-  OPCUAWebPlatformUniCT：[https://github.com/OPCUAUniCT/OPCUAWebPlatformUniCT](https://github.com/OPCUAUniCT/OPCUAWebPlatformUniCT)
 
- 
 #### 补充说明
 * 使用OPC相关插件时请遵循OPC基金会的授权规则
+* 使用OPCDA插件时，需安装OPC核心库，[文件地址](https://gitee.com/diego2098/ThingsGateway/attach_files)
 
-#### 开源协议
-
-请仔细阅读 [授权协议](https://diego2098.gitee.io/thingsgateway/docs/)
-
-
-
+ 
 
 ####  支持作者
  如果对您有帮助，请点击右上角⭐Star关注，感谢支持开源！
- 若希望捐赠项目，请跳转到文档站点查看捐赠码或使用Gitee捐赠功能
- 
+
+ 若希望捐赠项目，请查看以下捐赠码或使用Gitee捐赠功能
+
+<img src="https://gitee.com/diego2098/ThingsGateway/raw/master/Image/pay.png" height=180 />
 
 ####  联系作者
  * QQ群：605534569

handbook/LICENSE.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   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:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   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
+
+       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.

handbook/README.md

@@ -1,9 +1,10 @@
 文档基于 [https://www.docusaurus.io/](https://www.docusaurus.io/) 构建。
+文档样式摘自 TouchSocket [Pages](http://rrqm_home.gitee.io/touchsocket/)
 
 ### 本地运行
 
 ```bash
-npm install
+npm run install
 
 npm run start
 ```