opensource/iot-dc3
3
0
Fork 0
mirror of https://gitee.com/pnoker/iot-dc3.git synced 2026-11-02 03:01:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 8237ca8ca4 Merge branch '20200813' into dev pnoker 2020-08-24 20:45:46 +08:00
  • bc66237a73 取消 udp read timeout pnoker 2020-08-24 20:44:35 +08:00
  • d3448acfe1 fix(driver): remove read timeout from Netty UDP server pnoker 2020-08-24 20:44:35 +08:00
  • 18e365fad3 Merge branch 'dev' pnoker 2020-08-23 23:39:48 +08:00
  • 1afb89029a Merge branch 'dev' pnoker 2020-08-23 23:39:48 +08:00
  • de0692a7b3 允许**/*.json文件打包到resources pnoker 2020-08-23 23:38:55 +08:00
  • 51803d9c3e build(driver): include JSON files in driver module resources packaging pnoker 2020-08-23 23:38:55 +08:00
  • 2d8c0a5d4f 优化 pnoker 2020-08-23 23:36:58 +08:00
  • 384c5acdcf refactor(manager): improve batch API, DriverContext, and SDK bootstrap config pnoker 2020-08-23 23:36:58 +08:00
  • 51b809da55 . pnoker 2020-08-23 23:23:15 +08:00
  • 93b57e3528 feat(driver): implement 188b TCP/UDP Netty handlers with batch import templates pnoker 2020-08-23 23:23:15 +08:00
  • 0b94feb295 . pnoker 2020-08-21 22:21:09 +08:00
  • dff2566c9a refactor(manager): clean up BatchServiceImpl and fix DriverContext field pnoker 2020-08-21 22:21:09 +08:00
  • 5328c62781 . pnoker 2020-08-21 14:36:00 +08:00
  • 65e8da0b96 build(driver): fix modbus-tcp Dockerfile base image reference pnoker 2020-08-21 14:36:00 +08:00
  • a25cfc6d63 . pnoker 2020-08-21 14:35:03 +08:00
  • 2acb3b0401 build(driver): fix Dockerfile base image references for modbus-tcp and 188b drivers pnoker 2020-08-21 14:35:03 +08:00
  • 7385f5e138 sdk中通过设备查询日志打印null pnoker 2020-08-21 12:50:20 +08:00
  • 7ab8be9760 fix(sdk): fix null log output when querying device in DriverContext pnoker 2020-08-21 12:50:20 +08:00
  • 313f2226ca . pnoker 2020-08-21 12:48:34 +08:00
  • 69bbde1499 feat(driver): add UDP batch-import template and fix Netty handler refs pnoker 2020-08-21 12:48:34 +08:00
  • 2410f2659e . pnoker 2020-08-21 12:15:02 +08:00
  • 7dbce1e9fd refactor(driver): rename NettyServer/Handler classes to Tcp/Udp variants pnoker 2020-08-21 12:15:02 +08:00
  • 7e45756ce1 188b tcp & udp pnoker 2020-08-21 11:31:35 +08:00
  • c58570c299 feat(driver): add water-188b UDP driver module with Netty server pnoker 2020-08-21 11:31:35 +08:00
  • a30c22acbc dev.sh pnoker 2020-08-20 22:32:15 +08:00
  • 2a43b9ace2 chore(dev): update dev.sh server startup script pnoker 2020-08-20 22:32:15 +08:00
  • 3f12df1fc0 dev.sh pnoker 2020-08-20 08:16:54 +08:00
  • 463ceb0fa3 chore(dev): update dev.sh server startup script pnoker 2020-08-20 08:16:54 +08:00
  • 6b6256f021 代码优化 pnoker 2020-08-20 00:06:42 +08:00
  • 97945982e0 refactor(driver): extract DriverUtils helpers and simplify NettyServerHandler pnoker 2020-08-20 00:06:42 +08:00
  • ab98d27ae8 添加bytesToInt大小端转换 pnoker 2020-08-19 23:57:35 +08:00
  • 914c4164ae feat(sdk): add bytesToInt with big/little-endian support in DriverUtils pnoker 2020-08-19 23:57:35 +08:00
  • 445ff37b65 . pnoker 2020-08-19 23:27:57 +08:00
  • 517d055aa4 refactor(driver): simplify water-188b-tcp custom service and Netty handler pnoker 2020-08-19 23:27:57 +08:00
  • 81fcebfc21 Merge branch 'dev' pnoker 2020-08-19 23:01:48 +08:00
  • 8b72ddbbf9 Merge branch 'dev' pnoker 2020-08-19 23:01:48 +08:00
  • b812455cc9 merge pnoker 2020-08-19 23:01:32 +08:00
  • d43a2d80f8 chore(driver): remove legacy water-188b combined driver module pnoker 2020-08-19 23:01:32 +08:00
  • 8344f081ac Merge branch '20200813' into dev pnoker 2020-08-19 22:59:46 +08:00
  • af6e7fb05f Merge branch '20200813' into dev pnoker 2020-08-19 22:59:46 +08:00
  • 1357d3a629 . pnoker 2020-08-19 22:58:45 +08:00
  • bfeb773e51 refactor(driver): rewrite water-188b Netty handler and trim batch template pnoker 2020-08-19 22:58:45 +08:00
  • a5cd354693 优化批量导入 共享模版功能 pnoker 2020-08-19 22:54:56 +08:00
  • a381afe58a feat(manager): improve batch import to support shared profile templates pnoker 2020-08-19 22:54:56 +08:00
  • 9788deb61d #bugfix 修复批量导入是出现中文乱码的问题 pnoker 2020-08-19 22:53:28 +08:00
  • efee7b3f8c fix(common): fix garbled Chinese characters during batch import file reading pnoker 2020-08-19 22:53:28 +08:00
  • f2fcafbf81 . pnoker 2020-08-19 17:11:23 +08:00
  • e23ff7a212 feat(driver): populate 188b batch-import template with full point definitions pnoker 2020-08-19 17:11:23 +08:00
  • 20f92fb193 Merge branch 'dev' pnoker 2020-08-18 23:39:12 +08:00
  • febe1ecc97 Merge branch 'dev' pnoker 2020-08-18 23:39:12 +08:00
  • 46f712ee39 更新说明 pnoker 2020-08-18 23:38:59 +08:00
  • 242decd634 docs(common): add banner text to dc3-config module pnoker 2020-08-18 23:38:59 +08:00
  • 75ad8323fb water device 188b driver pnoker 2020-08-18 23:32:59 +08:00
  • ad865391ad feat(driver): add water-188b TCP driver module with Netty server and batch template pnoker 2020-08-18 23:32:59 +08:00
  • a609a1d9a0 Merge remote-tracking branch 'origin/dev' into dev pnoker 2020-08-18 23:28:24 +08:00
  • ca67c49026 Merge remote-tracking branch 'origin/dev' into dev pnoker 2020-08-18 23:28:24 +08:00
  • 9453b3085b . pnoker 2020-08-18 23:26:32 +08:00
  • 45b145e45f fix(api): correct modbus-tcp HTTP request file entries pnoker 2020-08-18 23:26:32 +08:00
  • 9c03e8d7ec 位号数据 存储类型支持：单点 & 结构化 存储 pnoker 2020-08-18 23:25:35 +08:00
  • 10dce56ffb feat(data): support single and structured point value storage with device status receiver pnoker 2020-08-18 23:25:35 +08:00
  • 11b586e26d 优化 manager & data & driver sdk 消息组件配置 pnoker 2020-08-18 23:19:01 +08:00
  • 192591abaa refactor(messaging): improve RabbitMQ topic config in data, manager, and sdk pnoker 2020-08-18 23:19:01 +08:00
  • 5806ee2760 #bugfix 修复批量导入，不更新位号问题 pnoker 2020-08-18 23:08:04 +08:00
  • f0fa3a74cf fix(manager): update point attributes during batch import pnoker 2020-08-18 23:08:04 +08:00
  • fcbb26994d rabbitmq 添加 virtual-host=dc3 配置 pnoker 2020-08-18 07:52:19 +08:00
  • 15e6217c97 build(rabbitmq): set virtual-host to dc3 in Dockerfile pnoker 2020-08-18 07:52:19 +08:00
  • 78e56c02b0 mysql 设备添加multi（数据存储类型）字段 pnoker 2020-08-18 07:51:21 +08:00
  • fc229150e2 feat(data): add multi field to device table in seed sql pnoker 2020-08-18 07:51:21 +08:00
  • ac89a1ad8c install-env.sh 安装基础环境脚本文件 pnoker 2020-08-14 15:04:03 +08:00
  • aa451c25d7 build(deploy): add install-env.sh base environment setup script pnoker 2020-08-14 15:04:03 +08:00
  • b10ca77f39 . pnoker 2020-08-13 21:16:08 +08:00
  • 3f6e6df8c8 refactor(rtmp): move ffmpeg field from Transcode to TranscodeRunner pnoker 2020-08-13 21:16:08 +08:00
  • 9db9d0a55d Merge branch 'dev' pnoker 2020-08-12 23:52:00 +08:00
  • ea072cf9f4 Merge branch 'dev' pnoker 2020-08-12 23:52:00 +08:00
  • ce5a2ff461 #bugfix gateway authentic pnoker 2020-08-12 23:51:05 +08:00
  • d33f0f1857 fix(gateway): replace AuthenticFilter with AuthenticGatewayFilter and add BlackIpGlobalFilter pnoker 2020-08-12 23:51:05 +08:00
  • 9245b30503 1.调整rabbitmq配置，添加virtual-host:dc3 2.调整redis线程池 pnoker 2020-08-12 21:07:08 +08:00
  • 9182d0204c build(common): set rabbitmq virtual-host to dc3 and tune redis thread pool pnoker 2020-08-12 21:07:08 +08:00
  • 10909b87ac auth update pnoker 2020-08-12 21:03:47 +08:00
  • 079db94f89 feat(auth): improve token and user service logic, add auth README pnoker 2020-08-12 21:03:47 +08:00
  • 10dfb6a354 Merge branch 'dev' pnoker 2020-08-07 10:18:40 +08:00
  • c4d2cb5dc3 Merge branch 'dev' pnoker 2020-08-07 10:18:40 +08:00
  • b6335b9339 add maven setting.xml pnoker 2020-08-07 10:18:22 +08:00
  • 1799c0b477 build: update Dockerfile to reference maven settings.xml pnoker 2020-08-07 10:18:22 +08:00
  • 49292114ee 调整： 1.redis pool 2.openfeign log 3.spring boot version 4.mysql version 5.hystrix pool & timeout 6.mongo 7.spring security pnoker 2020-08-04 21:01:20 +08:00
  • d2d1ad240c refactor(common): tune redis pool, hystrix, feign log, spring boot and mysql versions pnoker 2020-08-04 21:01:20 +08:00
  • 99a75c71d5 . pnoker 2020-08-04 15:29:06 +08:00
  • 53afe2e398 build: add maven settings.xml for dependency mirrors pnoker 2020-08-04 15:29:06 +08:00
  • 7113702d0e . pnoker 2020-08-04 14:58:04 +08:00
  • d456185825 docs: update README and simplify docker-compose-demo.yml pnoker 2020-08-04 14:58:04 +08:00
  • 6158a19e3a . pnoker 2020-08-04 14:24:07 +08:00
  • f2fafa67a1 docs: add web UI screenshots to dc3/images pnoker 2020-08-04 14:24:07 +08:00
  • d222415544 #bugfix 修复Mqtt和Virtual Listening驱动模块的profile driverInfo 为空异常 pnoker 2020-08-03 23:06:22 +08:00
  • e6269608c0 fix(sdk): fix null driverInfo in DriverContext for mqtt and virtual drivers pnoker 2020-08-03 23:06:22 +08:00
  • 2ca733362e update spring boot version pnoker 2020-08-03 09:15:30 +08:00
  • fadb0c449f feat(driver): upgrade spring boot version and add netty driver and gateway route config pnoker 2020-08-03 09:15:30 +08:00
  • 1253875bf9 Set theme jekyll-theme-cayman 张红元 2020-07-31 15:06:28 +08:00
  • 42f3b0ab7e docs: set jekyll theme to cayman pnoker 2020-07-31 15:06:28 +08:00
  • d205352fcb Merge remote-tracking branch 'origin/master' pnoker 2020-07-25 17:36:34 +08:00