jay
|
714d8674eb
|
fix: swagger包导入
|
2023-05-15 18:35:37 +08:00 |
xiwa
|
1a38916458
|
refactor:基于ruoyi等对框架调整
|
2023-05-15 08:31:02 +08:00 |
荭琪枫
|
bb94a47c7e
|
feat:添加渠道
|
2023-05-12 17:47:16 +08:00 |
|
荭琪枫
|
16ead18c65
|
Merge branch 'dev' into dev-shiheng
|
2023-05-12 15:24:05 +08:00 |
荭琪枫
|
a53bc698ee
|
feat:添加邮箱消息通知
|
2023-05-11 23:01:08 +08:00 |
regan
|
e96f5fbda6
|
fix（告警中心）：分页查询异常
|
2023-05-11 22:07:22 +08:00 |
|
regan
|
16a6641a8a
|
fix（告警中心）：分页查询异常
|
2023-05-11 21:39:56 +08:00 |
Longjun.Tu
|
6f9457370d
|
fix(告警中心)：修改字段
|
2023-05-11 18:42:30 +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
|
1709d108c5
|
feat(告警中心):数据库、接口相关
|
2023-05-11 00:06:39 +08:00 |
|
Longjun.Tu
|
16ce89e1c1
|
feat(告警中心):数据库、接口相关
|
2023-05-11 00:05:15 +08:00 |
|
xiwa
|
9c65711252
|
Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent
|
2023-05-10 07:49:27 +08:00 |
|
xiwa
|
610de594fe
|
fix:修复emqx设备重复上线
|
2023-05-10 07:49:20 +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 |
|
荭琪枫
|
8a33c66254
|
Merge branch 'dev-shiheng' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-shiheng
|
2023-05-08 20:13:34 +08:00 |
|
jay
|
d5de8cce4a
|
chore: 修改启动命令,增加额外JAVA_OPTS
|
2023-05-08 18:51:20 +08:00 |
|
荭琪枫
|
1c0da87072
|
message
|
2023-05-08 18:31:27 +08:00 |
|
荭琪枫
|
f6e3c46276
|
message
|
2023-05-08 18:29:42 +08:00 |
|
jay
|
d03865d72d
|
chore: 修改启动命令,接收用户配置路径
|
2023-05-08 17:53:47 +08:00 |
|
jay
|
041afdad29
|
chore: 添加mysql依赖
|
2023-05-08 17:20:53 +08:00 |
|
Longjun.Tu
|
fbe2565119
|
打包问题处理
|
2023-05-08 14:03:47 +08:00 |
tangfudong
|
acbcfebbb3
|
删除message-bus空文件夹
|
2023-05-08 09:05:30 +08:00 |
|
tangfudong
|
cabe593fc3
|
删除虚拟设备空文件夹
|
2023-05-08 09:01:44 +08:00 |
|
tangfudong
|
825e7c5371
|
删除DS文件
|
2023-05-08 09:00:17 +08:00 |
|
xiwa
|
74546e5208
|
更新文档链接
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-05-06 23:01:47 +00:00 |
|
Longjun.Tu
|
42e87c6883
|
项目结构调整
|
2023-05-06 14:46:44 +08:00 |
|
荭琪枫
|
668a26ddbf
|
add swagger support
|
2023-05-05 22:42:46 +08:00 |
|
荭琪枫
|
0e69c48018
|
add swagger support
|
2023-05-05 22:20:55 +08:00 |
|
荭琪枫
|
0f9121e4e3
|
add swagger support
|
2023-05-05 20:44:10 +08:00 |
|
荭琪枫
|
eb5f7e7570
|
add swagger support
|
2023-05-04 23:59:52 +08:00 |
|
荭琪枫
|
5c889c3dcd
|
add swagger support
|
2023-05-04 22:39:05 +08:00 |
|
荭琪枫
|
3ec18b6270
|
add swagger support
|
2023-05-04 22:36:40 +08:00 |
|
tangfudong
|
17d3bf586e
|
删除多余文件，修复init数据
|
2023-05-04 18:43:14 +08:00 |
|
tangfudong
|
37fda2af75
|
Application添加启动服务成功提示
|
2023-05-04 17:48:00 +08:00 |
|
tangfudong
|
72af57de8e
|
添加异常枚举，统一自定义异常
|
2023-05-04 14:30:45 +08:00 |
|
xiwa
|
df7a508ba1
|
响应状态码修改
|
2023-04-29 23:45:03 +08:00 |
|
xiwa
|
dded5a0635
|
Merge branch 'dev'
|
2023-04-29 23:04:56 +08:00 |
|
xiwa
|
d4ea4d5b59
|
版本号修正
|
2023-04-29 23:03:57 +08:00 |
|
tangfudong
|
c160f95864
|
Merge branch 'dev'
|
2023-04-28 10:11:14 +08:00 |
|
tangfudong
|
e71bc323e6
|
Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent
|
2023-04-28 10:10:39 +08:00 |
|
tangfudong
|
d82f5f7265
|
智能电表产品key修复
|
2023-04-24 11:11:45 +08:00 |
|
tangfudong
|
9b4d042b6e
|
优化pom文件
添加ws协议服务端脚本
|
2023-04-24 11:09:55 +08:00 |
|
tangfudong
|
658c49d17d
|
解决版本冲突
|
2023-04-20 14:02:07 +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
|
ddaca67a95
|
添加xml遗漏文件
|
2023-04-20 12:02:14 +08:00 |
|
tangfudong
|
2ccbfe73c3
|
WEBSOCKET服务端新增令牌访问
|
2023-04-20 11:51:34 +08:00 |