Commit Graph

800 Commits

Author SHA1 Message Date
zhou-hao 40d6a3ba41 设备导入导出支持机构:需要先将用户绑定到机构中. 2021-06-08 10:07:47 +08:00
老周 f04e02590d
Merge pull request #62 from qq517634644/master
docs(网络组件&设备网关):
2021-06-07 09:25:52 +08:00
zhou-hao 63f6812c27 docker 使用adoptopenjdk:8-jdk 2021-06-04 19:03:06 +08:00
Tensai bd0b936a56 docs(网络组件&设备网关): 网络组件(TCP)启动、管理、收发数据&解析
Signed-off-by: Tensai <517634644@qq.com>
2021-06-04 16:41:35 +08:00
zhou-hao 1585916776 增加属性源时间支持 2021-06-04 08:51:12 +08:00
zhou-hao 078542d98e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2021-06-02 15:16:08 +08:00
zhou-hao ab40055a6e 1.10.0 2021-06-02 15:07:09 +08:00
zhou-hao c1ee8618ae 优化 2021-06-02 15:04:38 +08:00
zhou-hao 3433eabd87 升级依赖 2021-06-02 13:46:29 +08:00
zhou-hao 5666c23af1 1.10.0-SNAPSHOT 2021-06-02 13:46:18 +08:00
老周 3962ca9bb7
Merge pull request #60 from codacy-badger/codacy-badge
Add a Codacy badge to README.md
2021-06-01 10:51:45 +08:00
The Codacy Badger 4c63ebc8e5 Add Codacy badge 2021-06-01 02:50:14 +00:00
zhou-hao e47bfcb439 1.9 2021-05-31 10:32:00 +08:00
zhou-hao 3fa9c47af3 1.9.0 2021-05-31 09:31:03 +08:00
zhou-hao c93df4715b Merge remote-tracking branch 'origin/master' 2021-05-28 17:43:41 +08:00
zhou-hao 1919e563d8 升级依赖 2021-05-28 14:41:31 +08:00
老周 b409932ac9
Create pull_request.yml 2021-05-28 14:33:55 +08:00
老周 b18698196e
Merge pull request #59 from qq517634644/master
增加数据流入库的代码注释
2021-05-28 14:30:11 +08:00
Tensai 9c65346a6c docs(数据流【设备网关-->物模型转换->时序入库】): 增加数据流入库的代码注释 优化代码结构
Signed-off-by: Tensai <517634644@qq.com>
2021-05-28 14:06:12 +08:00
Tensai 6a8a11338e Merge branch 'master' of https://github.com/jetlinks/jetlinks-community
 Conflicts:
	jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/AbstractDeviceDataStoragePolicy.java
2021-05-28 11:52:50 +08:00
Tensai f991c63403 Merge branch 'master' of https://github.com/qq517634644/jetlinks-community 2021-05-28 11:00:11 +08:00
Tensai 84ba163992 docs(数据流【设备网关-->物模型转换->时序入库】): 增加数据流入库的代码注释 优化代码结构
Signed-off-by: Tensai <517634644@qq.com>
2021-05-28 10:57:38 +08:00
zhou-hao 68bed142fe 增加用户详情 2021-05-27 16:52:28 +08:00
zhou-hao c1363bd555 支持指定属性查询记录 2021-05-26 11:14:42 +08:00
zhou-hao d8d4668da1 优化每日在线数量统计 2021-05-26 10:14:04 +08:00
zhou-hao efe03f7318 websocket支持ping pong 2021-05-25 16:51:44 +08:00
zhou-hao 4326ea01ae 增加机构绑定,解绑用户接口。 2021-05-25 11:06:02 +08:00
zhou-hao a3e46f128c 优化参数命名 2021-05-24 16:37:45 +08:00
zhou-hao 4c53c2cd80 优化自状态管理 2021-05-24 15:53:27 +08:00
zhou-hao f6cbc93baa 优化指令发送处理 2021-05-20 17:41:38 +08:00
zhou-hao f19c3421b4 忽略自动启动规则错误 2021-05-20 17:27:51 +08:00
zhou-hao e945969963 use jakarta.mail 2021-05-20 16:52:30 +08:00
zhou-hao 07faaf21eb hsweb-utils 3.0.3 2021-05-20 16:52:10 +08:00
zhou-hao 98e89d8c9b 属性增加手动写值,当物模型配置了手动写值时,下发修改属性指令将不再发送到设备,而是直接入库并返回成功。 2021-05-20 16:29:43 +08:00
zhou-hao a1cc54696e 开启全新过滤配置 2021-05-14 16:59:58 +08:00
zhou-hao dc46a0374c 赋权时,增加越权处理 2021-05-14 16:15:55 +08:00
zhou-hao b5875a9675 增加权限过滤相关配置 2021-05-10 17:15:09 +08:00
zhou-hao 20e06b844f Merge remote-tracking branch 'origin/master' 2021-04-29 14:57:59 +08:00
zhou-hao 5f1548a663 ignore application-local.yml 2021-04-29 14:57:39 +08:00
zhou-hao f37600d45c database 2021-04-29 14:57:05 +08:00
zhou-hao ae34ef70f8 org.elasticsearch: error 2021-04-29 14:56:25 +08:00
老周 f3cefa155a
Merge pull request #53 from jetlinks/dependabot/maven/jetlinks-components/io-component/commons-io-commons-io-2.7
Bump commons-io from 2.6 to 2.7 in /jetlinks-components/io-component
2021-04-27 13:34:12 +08:00
zhou-hao 9996403e86 优化说明 2021-04-27 11:30:05 +08:00
dependabot[bot] 1425a5a598
Bump commons-io from 2.6 to 2.7 in /jetlinks-components/io-component
Bumps commons-io from 2.6 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 20:04:07 +00:00
zhou-hao babc2d7711 tcp 支持 onClientConnect 2021-04-26 16:45:33 +08:00
zhou-hao 342c59cdb0 优化子设备状态管理 2021-04-25 18:48:34 +08:00
zhou-hao 127028d32a 优化子设备状态管理 2021-04-25 18:44:35 +08:00
zhou-hao e06f1d2608 修复topics错误 2021-04-22 09:31:05 +08:00
zhou-hao ac51b0f77c 优化物模型拓展配置作用域 2021-04-19 17:00:48 +08:00
zhou-hao e0b9c4f170 优化websocket消息订阅 2021-04-19 15:41:56 +08:00