Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

驱动目录和数据库配置信息，支持优先从环境变量中获取 #22

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

驱动目录和数据库配置信息，支持优先从环境变量中获取 #22

wants to merge 38 commits into from

Commits on Jun 6, 2022

  1. 通过Mqtt 方式将数据写入IotDB

    @ccliushou
    ccliushou committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    dc126a5 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Merge branch 'iioter:master' into master

    @ccliushou
    ccliushou committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    25d13b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. 优化代码第一次启动出现的异常。

    @ccliushou
    ccliushou committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    115f917 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2022

  1. 修复bug和计算表达式问题

    @ccliushou
    ccliushou committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    6030f63 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2022

  1. Merge branch 'master' of https://github.com/iioter/iotgateway 

    # Conflicts:
#	IoTGateway/iotgateway.db
#	Plugins/Plugin/DeviceService.cs
    @ccliushou
    ccliushou committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    5e8d111 View commit details
    Browse the repository at this point in the history

  2. 修改modbus驱动，和基于125个寄存器的数据推iotdb的处理。

    @ccliushou
    ccliushou committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    996b570 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/ccliushou/iotgateway 

    # Conflicts:
#	IoTGateway/iotgateway.db
#	Plugins/Plugin/DeviceService.cs
    @ccliushou
    ccliushou committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    f2cf7f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. test docker

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    a16651b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ccliushou/iotgateway

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    5d5d59c View commit details
    Browse the repository at this point in the history

  3. test Dockerfile

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    3e5c964 View commit details
    Browse the repository at this point in the history

  4. test docker..

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    068cca5 View commit details
    Browse the repository at this point in the history

  5. test docker1

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    ad449a4 View commit details
    Browse the repository at this point in the history

  6. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    7664fb2 View commit details
    Browse the repository at this point in the history

  7. 发布测试

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    b85f3e0 View commit details
    Browse the repository at this point in the history

  8. test

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    a8b889c View commit details
    Browse the repository at this point in the history

  9. test

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    d06c237 View commit details
    Browse the repository at this point in the history

  10. test

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    0e30190 View commit details
    Browse the repository at this point in the history

  11. test

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    47532bd View commit details
    Browse the repository at this point in the history

  12. 111

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    97810e7 View commit details
    Browse the repository at this point in the history

  13. 1

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    c256036 View commit details
    Browse the repository at this point in the history

  14. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    0a19650 View commit details
    Browse the repository at this point in the history

  15. 1

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    d04d2e2 View commit details
    Browse the repository at this point in the history

  16. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    69b9ddb View commit details
    Browse the repository at this point in the history

  17. 1

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    1e63259 View commit details
    Browse the repository at this point in the history

  18. 1

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    5628387 View commit details
    Browse the repository at this point in the history

  19. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    e645a8f View commit details
    Browse the repository at this point in the history

  20. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    4921f11 View commit details
    Browse the repository at this point in the history

  21. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    cb1c961 View commit details
    Browse the repository at this point in the history

  22. 222

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    9a6c31c View commit details
    Browse the repository at this point in the history

  23. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    3dcdbdf View commit details
    Browse the repository at this point in the history

  24. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    862629d View commit details
    Browse the repository at this point in the history

  25. 111

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    1444b14 View commit details
    Browse the repository at this point in the history

  26. 11

    @ccliushou
    ccliushou committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    99213fe View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2022

  1. Merge branch 'master' of https://gitee.com/ccliushou/iotgateway 

    # Conflicts:
#	IoTGateway/IoTGateway.csproj
#	IoTGateway/IoTGateway.csproj.user
#	IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml.user
#	IoTGateway/iotgateway.db
#	Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs
#	Plugins/Plugin/DeviceThread.cs
    @ccliushou
    ccliushou committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    51d1fb0 View commit details
    Browse the repository at this point in the history

  2. 驱动目录和数据库配置信息，支持优先从环境变量中获取（如果不存在，则使用原有的默认配置）。环境变量名称如下： 

    IoTGateway_DB
IoTGateway_DBType
IOT_DriverPath
    @ccliushou
    ccliushou committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    03ca1b5 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. Merge branch 'master' of https://github.com/iioter/iotgateway

    @ccliushou
    ccliushou committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    e6b8c1c View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. Merge branch 'master' of https://gitee.com/ccliushou/iotgateway 

    # Conflicts:
#	IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
#	Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs
#	Plugins/Plugin/DeviceService.cs
#	Plugins/Plugin/DeviceThread.cs
#	Plugins/Plugin/MyMqttClient.cs
#	Plugins/PluginInterface/IotDB/IotTsData.cs
    @ccliushou
    ccliushou committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    ab11432 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ccliushou/iotgateway 

    # Conflicts:
#	Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs
#	Plugins/Plugin/DeviceThread.cs
#	Plugins/Plugin/DrvierService.cs
#	Plugins/Plugin/IoTBackgroundService.cs
    @ccliushou
    ccliushou committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    f141553 View commit details
    Browse the repository at this point in the history