jay
|
d25227d903
|
fix: 操作日志长度
|
2023-06-12 17:48:31 +08:00 |
|
jay
|
28824fb4ff
|
fix: 角色编辑
|
2023-06-12 17:42:58 +08:00 |
|
jay
|
e3f4f815b9
|
fix: 角色编辑
|
2023-06-12 17:32:53 +08:00 |
|
jay
|
e311b9791e
|
fix: 角色管理
|
2023-06-12 17:13:06 +08:00 |
|
jay
|
26f7a8f56d
|
refactor: mapstruct-plus配置
|
2023-06-12 15:43:58 +08:00 |
|
jay
|
6d4446e786
|
refactor: 用户分配角色
|
2023-06-12 15:09:58 +08:00 |
|
jay
|
98055d9d17
|
fix: 手机号,用户唯一校验
|
2023-06-12 11:25:17 +08:00 |
regan
|
abc796c6e4
|
refactor: baety接口封装
|
2023-06-11 20:55:20 +08:00 |
xiwa
|
3632d15485
|
fix:系统管理相关接口报错修复
|
2023-06-11 20:24:28 +08:00 |
|
xiwa
|
4822a8ee50
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-06-10 23:58:05 +08:00 |
|
xiwa
|
57e26656b4
|
fix:系统管理相关接口报错修复
|
2023-06-10 23:57:59 +08:00 |
1621142473@qq.com
|
4ec90c1cd7
|
update：字典服务优化
|
2023-06-10 20:25:25 +08:00 |
荭琪枫
|
822b04eb03
|
refactor:重构OTA升级管理
|
2023-06-10 19:41:11 +08:00 |
|
荭琪枫
|
eb2ba17ba2
|
refactor:重构OTA升级管理
|
2023-06-10 15:59:42 +08:00 |
tangfudong
|
8e41ad2711
|
update:联调用户管理和字典管理
|
2023-06-09 18:52:12 +08:00 |
|
tangfudong
|
9c6e07a7b3
|
update:分页数据属性名改为rows
|
2023-06-09 10:55:17 +08:00 |
|
tangfudong
|
d3dd5701df
|
fix:修复分页无法查询问题
|
2023-06-08 19:17:47 +08:00 |
|
jay
|
b68493be55
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-06-08 11:18:18 +08:00 |
|
jay
|
2256138d83
|
fix 全局返回,只拦截cc.iotkit
|
2023-06-08 11:17:58 +08:00 |
|
tangfudong
|
b00e57cf33
|
update:将所有请求改为post
|
2023-06-08 11:14:18 +08:00 |
|
xiwa
|
165449fcb8
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-06-08 08:08:09 +08:00 |
|
xiwa
|
2e8dca3175
|
fix:获取userId修改
|
2023-06-08 08:08:03 +08:00 |
|
jay
|
293c251bc9
|
update 用户信息查询
|
2023-06-07 16:11:05 +08:00 |
|
jay
|
c3107e6b79
|
update 用户信息查询
|
2023-06-07 15:31:57 +08:00 |
|
jay
|
3a4ce185d3
|
fix 用户信息查询
|
2023-06-07 14:42:04 +08:00 |
|
jay
|
7581079bcf
|
fix 用户信息查询
|
2023-06-07 14:30:48 +08:00 |
|
jay
|
ea89ec6338
|
fix 用户信息查询
|
2023-06-07 12:04:03 +08:00 |
|
jay
|
77f657df32
|
fix id生成: 存在id则不覆盖
|
2023-06-07 11:55:34 +08:00 |
|
jay
|
89e0ee703f
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-06-06 19:39:35 +08:00 |
|
jay
|
94cd29e5c0
|
refactor 接口
|
2023-06-06 19:39:10 +08:00 |
|
regan
|
cc31460052
|
fix: 配置文件redis 密码参数删除
|
2023-06-06 19:09:38 +08:00 |
|
jay
|
cc07728873
|
refactor 接口
|
2023-06-06 18:20:18 +08:00 |
|
jay
|
b0a3ed9756
|
refactor 接口
|
2023-06-06 17:39:48 +08:00 |
荭琪枫
|
6c1bd70c8e
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-06-06 15:13:40 +08:00 |
|
荭琪枫
|
beee0feaf4
|
feat:更新编译报错h2数据库包没要导入导致启动失败问题
|
2023-06-06 15:11:30 +08:00 |
|
jay
|
27b32e7d87
|
fix 登录接口
|
2023-06-06 14:12:54 +08:00 |
|
jay
|
8e7c103494
|
fix mapstruct配置
|
2023-06-05 22:43:34 +08:00 |
|
jay
|
7cd67f6335
|
fix mapstruct配置
|
2023-06-05 22:30:06 +08:00 |
|
jay
|
256df1b0a5
|
fix IJPACommData findall
|
2023-06-05 20:55:54 +08:00 |
|
jay
|
4bf5851b49
|
fix 报错
|
2023-06-05 18:35:39 +08:00 |
|
jay
|
ece079137b
|
fix IJPACommData
|
2023-06-05 18:24:03 +08:00 |
|
jay
|
c2034bc6fc
|
fix 初始化数据
|
2023-06-05 18:15:43 +08:00 |
|
jay
|
276be8b1b9
|
fix IJPACommData
|
2023-06-05 16:37:17 +08:00 |
|
jay
|
c6d168b495
|
fix IJPACommData
|
2023-06-05 15:30:59 +08:00 |
|
jay
|
a2b3dfca87
|
fix 用户异常
|
2023-06-05 11:35:56 +08:00 |
|
jay
|
f4b588fa46
|
mapstruct配置
|
2023-06-05 11:07:27 +08:00 |
|
jay
|
4125b71352
|
mapstruct配置
|
2023-06-05 09:34:30 +08:00 |
|
jay
|
4aaeefcf5b
|
fix mapstruct冲突
|
2023-06-04 20:31:53 +08:00 |
|
jay
|
b470be12c3
|
fix mapstruct-plus配置
|
2023-06-04 16:41:59 +08:00 |
|
jay
|
086caecc66
|
fix 报错
|
2023-06-04 10:50:12 +08:00 |
|
jay
|
8d4a827cb3
|
fix 报错
|
2023-06-04 09:53:05 +08:00 |
|
jay
|
b0aabdf5c3
|
feat 若依登录接口
|
2023-06-02 18:12:36 +08:00 |
|
jay
|
cdf77d22a0
|
feat 若依登录接口
|
2023-06-02 18:11:42 +08:00 |
|
jay
|
7f1453b971
|
fix sa-token 依赖冲突
|
2023-06-02 15:12:47 +08:00 |
|
jay
|
c47c5e4a68
|
chore flattened-pom
|
2023-06-02 11:42:48 +08:00 |
|
jay
|
ed8d5b78a2
|
fix 注入
|
2023-06-02 11:36:31 +08:00 |
|
jay
|
868c147511
|
fix spring2.6以后和knife4j冲突
|
2023-06-02 11:05:09 +08:00 |
|
jay
|
603ebff3cd
|
fix automapper
|
2023-06-01 21:34:10 +08:00 |
|
jay
|
915c81d3f8
|
fix 项目启动失败
|
2023-06-01 21:14:47 +08:00 |
|
jay
|
b64d1399ed
|
fix swagger自动配置
|
2023-06-01 20:26:46 +08:00 |
|
jay
|
fc685dd637
|
refactor swagger依赖
|
2023-06-01 20:22:37 +08:00 |
|
jay
|
b333dc0260
|
refactor oss配置
|
2023-06-01 20:12:29 +08:00 |
|
jay
|
ce1163f8ac
|
fix 数据实现
|
2023-06-01 19:49:29 +08:00 |
|
tangfudong
|
031e01556c
|
update:修改未写的分页函数
|
2023-06-01 17:09:57 +08:00 |
|
jay
|
03bab5d899
|
fix PageBuilder泛型
|
2023-06-01 15:38:37 +08:00 |
|
jay
|
6084ef4333
|
fix PageBuilder泛型
|
2023-06-01 15:08:01 +08:00 |
|
jay
|
f3dbe69e00
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-06-01 15:00:47 +08:00 |
|
jay
|
cb6f165a02
|
feat system基础数据操作接口
|
2023-06-01 15:00:30 +08:00 |
|
tangfudong
|
4a3da101e3
|
update:syscofig优化
|
2023-06-01 14:34:31 +08:00 |
|
jay
|
6dc33d9fbc
|
feat IJPACommData基础数据操作接口
|
2023-06-01 14:08:04 +08:00 |
|
jay
|
f3895c458c
|
feat IJPACommData基础数据操作接口
|
2023-06-01 14:05:55 +08:00 |
|
jay
|
eda4285368
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-06-01 10:40:48 +08:00 |
|
jay
|
91f6b73b45
|
feat IJPACommData基础数据操作接口
|
2023-06-01 10:40:32 +08:00 |
|
荭琪枫
|
b5249a94a2
|
feat:修改icommon
|
2023-06-01 10:23:48 +08:00 |
|
荭琪枫
|
66cfe70478
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-06-01 10:18:19 +08:00 |
|
荭琪枫
|
4c78784e9d
|
feat:修改icommon
|
2023-06-01 10:17:55 +08:00 |
|
tangfudong
|
72dd4a9a0c
|
update:多租户待定
|
2023-06-01 09:52:03 +08:00 |
|
荭琪枫
|
fa5e281317
|
feat:优化角色
|
2023-05-31 23:14:12 +08:00 |
|
荭琪枫
|
871544b1b9
|
feat:优化角色
|
2023-05-31 22:57:00 +08:00 |
|
jay
|
7b5419ce94
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-05-31 18:48:38 +08:00 |
|
jay
|
ebbb930a06
|
refactor 系统配置
|
2023-05-31 18:48:10 +08:00 |
|
荭琪枫
|
b9e5fff02d
|
refactor:重构
|
2023-05-31 18:32:08 +08:00 |
|
jay
|
f152e95010
|
refactor 设备服务
|
2023-05-31 17:44:58 +08:00 |
|
tangfudong
|
dfbdf118db
|
refactor:操作日志服务、用户在线监控服务、系统访问服务
|
2023-05-31 16:23:59 +08:00 |
|
tangfudong
|
5c1e048d61
|
refactor:岗位服务
|
2023-05-31 14:40:56 +08:00 |
|
tangfudong
|
a84987e1ae
|
refactor:用户服务
|
2023-05-31 11:42:58 +08:00 |
|
jay
|
106763d291
|
fix 依赖
|
2023-05-31 11:03:37 +08:00 |
|
jay
|
44e6380f13
|
fix 依赖
|
2023-05-31 11:01:10 +08:00 |
|
荭琪枫
|
eafac7e2ec
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-05-30 16:33:37 +08:00 |
|
荭琪枫
|
a485fb9a5a
|
update:修改sysrole实现
|
2023-05-30 16:32:51 +08:00 |
|
jay
|
713e6d216a
|
refactor 数据库字段注释
|
2023-05-30 14:27:15 +08:00 |
|
jay
|
e335d709fc
|
fix 代码生成器,包引用
|
2023-05-30 10:37:28 +08:00 |
|
荭琪枫
|
6247ea73d2
|
update:修改sysmenu实现
|
2023-05-29 18:17:49 +08:00 |
|
荭琪枫
|
3b28702b69
|
update:修改sysmenu实现
|
2023-05-29 17:33:27 +08:00 |
|
荭琪枫
|
eacbc2f5ec
|
update:修改sysmenu实现
|
2023-05-29 15:46:43 +08:00 |
|
荭琪枫
|
fdc70a097e
|
update:修改sysmenu实现
|
2023-05-29 15:41:06 +08:00 |
|
荭琪枫
|
cd59eb8481
|
update:修改sysmenu实现
|
2023-05-29 15:39:11 +08:00 |
|
jay
|
1b72784166
|
refactor: 重构
|
2023-05-29 11:47:32 +08:00 |
|
荭琪枫
|
7e48dfd5a3
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-05-28 23:37:42 +08:00 |
|
荭琪枫
|
9d02dcfa88
|
update
|
2023-05-28 23:37:09 +08:00 |
|
xiwa
|
71e3e99e6e
|
refactor:处理报错内容、代码简化
|
2023-05-28 20:12:31 +08:00 |
|
荭琪枫
|
252ced4d5f
|
feat:更新引用包
|
2023-05-28 14:30:58 +08:00 |
Longjun.Tu
|
15b560a5f2
|
refactor：queryDsl工具类完善
|
2023-05-26 17:59:58 +08:00 |
|
xiwa
|
783eac5c45
|
refactor:数据字典等实现修改
|
2023-05-26 02:19:02 +08:00 |
|
xiwa
|
d54f520d98
|
refactor:系统配置、部门管理接口实现修改
|
2023-05-25 05:02:25 +08:00 |
|
xiwa
|
4afa3be915
|
refactor:common报错内容修改
|
2023-05-24 08:25:24 +08:00 |
|
Longjun.Tu
|
aa2423c7d1
|
refactor：oss模块引入
|
2023-05-23 19:00:25 +08:00 |
|
regan
|
6da2c1de6e
|
refactor: 日志模块
|
2023-05-19 00:45:38 +08:00 |
|
regan
|
d7a4f0228d
|
refactor: dao实现
|
2023-05-19 00:33:04 +08:00 |
|
xiwa
|
092c7f9cc3
|
refactor:报错内容修改
|
2023-05-18 23:18:35 +08:00 |
|
Longjun.Tu
|
5cae4ea12a
|
refactor：雪花ID实现
|
2023-05-18 15:00:53 +08:00 |
|
xiwa
|
a963dfef48
|
refactor:处理报错内容
|
2023-05-18 08:04:04 +08:00 |
|
regan
|
c7d290d239
|
refactor:mapstruct plus 引用 dao层结构调整
|
2023-05-18 01:02:16 +08:00 |
|
Longjun.Tu
|
5c348d7427
|
refactor：dao层rdb实现修改
|
2023-05-17 16:24:21 +08:00 |
|
regan
|
4fc19b06f9
|
refactor:queryDsl引入和消息模块调整
|
2023-05-16 23:16:36 +08:00 |
|
xiwa
|
80f261dc9e
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-05-16 08:36:55 +08:00 |
|
xiwa
|
a0b3caa80e
|
refactor:结构和引用调整
|
2023-05-16 08:36:47 +08:00 |
|
jay
|
714d8674eb
|
fix: swagger包导入
|
2023-05-15 18:35:37 +08:00 |
|
xiwa
|
1a38916458
|
refactor:基于ruoyi等对框架调整
|
2023-05-15 08:31:02 +08:00 |
|
荭琪枫
|
153d271414
|
feat:添加渠道类型入库
|
2023-05-11 18:21:26 +08:00 |
|
荭琪枫
|
5d44b3498a
|
Merge branch 'dev-shiheng' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-shiheng
|
2023-05-11 10:43:55 +08:00 |
|
荭琪枫
|
3255090ee6
|
Merge branch 'dev' into dev-shiheng
|
2023-05-11 09:49:40 +08:00 |
|
Longjun.Tu
|
16ce89e1c1
|
feat(告警中心):数据库、接口相关
|
2023-05-11 00:05:15 +08:00 |
|
荭琪枫
|
2372a4fc6f
|
feat:添加邮箱消息通知
|
2023-05-09 23:41:46 +08:00 |
|
荭琪枫
|
86b4f05ada
|
feat:添加消息中心设计文档
|
2023-05-09 18:29:49 +08:00 |
|
荭琪枫
|
2b29d500cf
|
feat:添加钉钉和企业微信消息通知
|
2023-05-08 23:33:32 +08:00 |
|
荭琪枫
|
1c0da87072
|
message
|
2023-05-08 18:31:27 +08:00 |
|
荭琪枫
|
f6e3c46276
|
message
|
2023-05-08 18:29:42 +08:00 |
|
Longjun.Tu
|
42e87c6883
|
项目结构调整
|
2023-05-06 14:46:44 +08:00 |
|
tangfudong
|
72af57de8e
|
添加异常枚举，统一自定义异常
|
2023-05-04 14:30:45 +08:00 |
|
tangfudong
|
b236d517e5
|
Merge remote-tracking branch 'remotes/openOrigin/dev' into dev
# Conflicts:
# iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java
# iot-components/iot-websocket-component/src/main/java/cc/iotkit/comp/websocket/server/WebSocketServerVerticle.java
|
2023-04-20 13:53:38 +08:00 |
|
tangfudong
|
5e99867ae9
|
添加支持DLT6451997协议支持
添加设备列表新增时手动绑定父设备功能
|
2023-04-20 11:40:07 +08:00 |
|
xiwa
|
cd23c577bb
|
代码合并
|
2023-04-09 14:44:33 +08:00 |
|
xiwa
|
210ef152ac
|
用graal替换nashorn
|
2023-04-09 09:06:58 +08:00 |
|
tangfudong
|
50ecc1a6de
|
新增小程序家庭切换
新增小程序设备收藏
|
2023-04-06 10:36:57 +08:00 |
|
jay
|
0744d84292
|
add 添加设备属性设置
|
2023-03-24 18:09:19 +08:00 |
huangwenlong
|
fabdb00c4b
|
1.tcp网络组件
2.组件停止,jar仍然被占用解决
|
2022-12-14 19:04:28 +08:00 |
|
xiwa
|
bb9ca476c8
|
打包方式修改
|
2022-11-28 08:27:10 +08:00 |
|
xiwa
|
629f4f551d
|
组件类获取优化
|
2022-11-23 09:11:55 +08:00 |
|
huangwenlong
|
c8e49a65d9
|
数据流转：
1.mqtt数据流转（北向服务端）
script:
this.translate=function(msg,device){
return
{
"topic":"topic",//推送topic
"payload":JSON.stringify(msg.data) // 数据，为字符串
}
}
2.kafka数据流转（北向服务端
script:
this.translate=function(msg,device){
return
{
"topic":"topic",//推送topic
"payload":JSON.stringify(msg.data), // 数据，为字符串
"partition": 1 // 分区，不需要指定分区就不要传分区kv
}
}
|
2022-11-12 13:53:57 +08:00 |
|
xiwa
|
a7fd715409
|
属性入库增加物模型过滤
|
2022-11-06 14:51:25 +08:00 |
|
xiwa
|
ec00cb92b9
|
新增rocketMq支持、性能优化
|
2022-08-09 01:17:31 +08:00 |
|
xiwa
|
19d454697e
|
增加tdengine支持
|
2022-08-07 00:51:10 +08:00 |
|
xiwa
|
3910bd23ca
|
关系数据库存储实现
|
2022-07-19 21:29:43 +08:00 |
|
xiwa
|
61fa50b612
|
数据接口重构
|
2022-07-14 19:45:27 +08:00 |
|
xiwa
|
413818248a
|
增加设备配置功能
|
2022-07-04 11:27:21 +08:00 |
|
xiwa
|
57fce9102a
|
模块名调整
|
2022-06-30 15:08:45 +08:00 |