Commit Graph

784 Commits

Author SHA1 Message Date
随遇而安
aa9efa0121 update pipeline-vue.yml for Gitee Go updated_at:2022-05-29 14:15:13 2022-05-29 14:15:13 +00:00
随遇而安
d8010fce1e update pipeline-java.yml for Gitee Go updated_at:2022-05-29 14:14:03 2022-05-29 14:14:03 +00:00
随遇而安
076a5c2905 update pipeline-docker.yml for Gitee Go updated_at:2022-05-29 14:01:03 2022-05-29 14:01:03 +00:00
随遇而安
5866624317 add pipeline-docker.yml for Gitee Go created_at:2022-05-29 14:00:25 2022-05-29 14:00:25 +00:00
随遇而安
c9bc4ba0e2 update pipeline-vue.yml for Gitee Go updated_at:2022-05-29 13:47:32 2022-05-29 13:47:32 +00:00
随遇而安
be2fcad8dc update pipeline-java.yml for Gitee Go updated_at:2022-05-29 13:44:57 2022-05-29 13:44:57 +00:00
随遇而安
f06383e46b update .workflow/pipeline-java.yml. 2022-05-29 13:34:25 +00:00
随遇而安
16d3d26a31 重命名 .workflow/pipeline-deploy.yml 为 .workflow/pipeline-java.yml 2022-05-29 13:34:08 +00:00
随遇而安
2e0fd23695 add pipeline-vue.yml for Gitee Go created_at:2022-05-29 13:33:16 2022-05-29 13:33:16 +00:00
随遇而安
0bec7efd5c update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 13:22:32 2022-05-29 13:22:33 +00:00
随遇而安
f3a80259eb update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 13:07:06 2022-05-29 13:07:06 +00:00
随遇而安
d25592232b update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 13:01:53 2022-05-29 13:01:53 +00:00
随遇而安
042761259e update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 12:50:08 2022-05-29 12:50:08 +00:00
随遇而安
7f524eb48b update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 12:44:07 2022-05-29 12:44:07 +00:00
随遇而安
bcca79dfc1 update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 12:39:09 2022-05-29 12:39:09 +00:00
随遇而安
5c40f81e3d update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 12:34:15 2022-05-29 12:34:15 +00:00
kerwincui
1f54ec3a85 添加构建目录 2022-05-29 20:33:18 +08:00
kerwincui
4429882b60 测试持续集成 2022-05-29 20:15:28 +08:00
随遇而安
00e11e7cb6 update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 12:00:30 2022-05-29 12:00:31 +00:00
随遇而安
2714fc076f update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 11:55:44 2022-05-29 11:55:44 +00:00
随遇而安
d7fc72e45d update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 10:36:29 2022-05-29 10:36:29 +00:00
随遇而安
214a55898c update pipeline-deploy.yml for Gitee Go updated_at:2022-05-29 10:33:26 2022-05-29 10:33:26 +00:00
随遇而安
90b1eb2da0 add pipeline-deploy.yml for Gitee Go created_at:2022-05-29 10:10:48 2022-05-29 10:10:48 +00:00
随遇而安
391a5310e0 update app/README.md. 2022-05-28 18:02:39 +00:00
随遇而安
b339724a25 update README.md. 2022-05-28 15:12:49 +00:00
kerwincui
ea403c0be5 Merge remote-tracking branch 'origin/master' into version1.2 2022-05-25 16:22:39 +08:00
随遇而安
6ed91b856a update README.md. 2022-05-25 02:27:10 +00:00
kerwincui
17ef0b28ef yml文件还原 2022-05-24 19:41:14 +08:00
随遇而安
f793b62627 !36 修复查询日志和监控数据报错问题
Merge pull request !36 from xxmfl/master
2022-05-24 11:39:47 +00:00
wxy001
2788764430 2022年5月24日19:20:31 修复查询设备日志和检测数据报错问题 2022-05-24 19:20:54 +08:00
随遇而安
d31fae1077 !35 增加启动时创建TDengine数据库和日志表
Merge pull request !35 from xxmfl/master
2022-05-24 07:33:31 +00:00
wxy001
14197e7436 2022年5月24日14:34:18 增加初始化时创建数据库功能 2022-05-24 15:28:39 +08:00
wxy001
4dde2bd121 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java
2022-05-24 15:15:52 +08:00
wxy001
6c58e34bec 2022年5月24日14:34:18 增加初始化时创建数据库功能 2022-05-24 14:34:39 +08:00
kerwincui
f07b05eaa1 Merge remote-tracking branch 'origin/master' into version1.2 2022-05-24 13:58:57 +08:00
随遇而安
315f9f8d18 update springboot/wumei-admin/src/main/resources/application-druid.yml. 2022-05-24 05:23:24 +00:00
kerwincui
ca688aa975 备注信息 2022-05-24 13:21:59 +08:00
随遇而安
d25d81967d update README.md. 2022-05-24 04:28:07 +00:00
kerwincui
8a1db44119 提示信息调整 2022-05-24 12:21:00 +08:00
随遇而安
1970b9f007 update README.md. 2022-05-24 04:16:43 +00:00
随遇而安
416935e530 update README.md. 2022-05-24 04:14:00 +00:00
kerwincui
6fc2a47527 还原配置 2022-05-24 10:29:06 +08:00
随遇而安
ba91433bb1 !33 将TDEngine相关配置移到同一个包中
Merge pull request !33 from xxmfl/master
2022-05-24 02:25:27 +00:00
wxy001
f783503b51 2022年5月24日01:05:38 还原ApplicationStart,讲TDengine相关类型和配置归于同一个包 2022-05-24 01:53:27 +08:00
wxy001
5219a0c766 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
#	springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java
#	springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/config/TDengineConfig.java
#	springboot/wumei-iot/src/main/resources/mapper/tdengine/DatabaseMapper.xml
#	springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml
2022-05-24 01:18:18 +08:00
wxy001
d032413a56 2022年5月24日01:05:38 还原ApplicationStart,讲TDengine相关类型和配置归于同一个包 2022-05-24 01:06:40 +08:00
随遇而安
8fb4f017e5 !32 增加时序数据库TDengine支持
Merge pull request !32 from xxmfl/master
2022-05-23 03:40:19 +00:00
wxy001
c43459e987 增加时序数据库TDengine存储设备日志和设备监测数据 2022-05-23 00:48:30 +08:00
wxy001
81232fbb04 2022年5月22日23:48:54 增加TDengine存储日志功能,
提供基础的新增和查询功能
2022-05-22 23:50:01 +08:00
kerwincui
34d6a676ea 设备定位方式界面 2022-05-22 01:33:38 +08:00