diff --git a/README.md b/README.md index 5bbaed04..2ee2713e 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,8 @@ * [Mqtt消息服务器EMQX4.0](https://github.com/emqx/emqx) * [ESP8266 Core For Arduino](https://github.com/esp8266/Arduino) * [uCharts高性能跨平台图表库](https://www.ucharts.cn) +* [TDengine时序数据库](https://www.taosdata.com/?zh) + ##### Docker快速安装 * Mysql中创建wumei-smart数据库,[导入Sql脚本](https://gitee.com/kerwincui/wumei-smart/tree/master/springboot/sql) * 修改命令中的Mysql配置,并执行 @@ -110,6 +112,9 @@ kerwincui/wumei-smart:1.1 | [SXH](https://gitee.com/sixiaohu) | [Redamancy_zxp](https://gitee.com/redamancy-zxp) | [LEE](https://gitee.com/yueming188) | [LemonTree](https://gitee.com/fishhunterplus) | [Tang](https://gitee.com/mexiaotang) |--|--|--|--|--| +| [xxmfl](https://gitee.com/xxmfl) | +|--| + ### 九、部分图片 diff --git a/springboot/wumei-admin/src/main/resources/application-druid.yml b/springboot/wumei-admin/src/main/resources/application-druid.yml index ad6dbaf8..f8135ae5 100644 --- a/springboot/wumei-admin/src/main/resources/application-druid.yml +++ b/springboot/wumei-admin/src/main/resources/application-druid.yml @@ -17,9 +17,10 @@ spring: username: password: - #TDengine数据库 + # TDengine数据库 tdengine-server: - enabled: true + # 默认不启用TDengine,true=启用,false=不启用 + enabled: false driverClassName: com.taosdata.jdbc.TSDBDriver url: jdbc:TAOS://127.0.0.1:6030/wumei_smart_log?timezone=Asia/Beijing&charset=utf-8 username: root diff --git a/springboot/wumei-admin/src/main/resources/application.yml b/springboot/wumei-admin/src/main/resources/application.yml index 6637f1ac..60297c88 100644 --- a/springboot/wumei-admin/src/main/resources/application.yml +++ b/springboot/wumei-admin/src/main/resources/application.yml @@ -8,7 +8,7 @@ ruoyi: copyrightYear: 2021 # 实例演示开关 demoEnabled: true - # 文件路径 示例( Windows配置D:/wumei-smart/uploadPath,Linux配置 /var/wumei-smart/java/uploadPath) + # 文件路径,以uploadPath结尾 示例( Windows配置D:/wumei-smart/uploadPath,Linux配置 /var/wumei-smart/java/uploadPath) profile: /var/wumei-smart/java/uploadPath # 获取ip地址开关 addressEnabled: true @@ -43,7 +43,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: druid # 文件上传 servlet: multipart: @@ -65,7 +65,7 @@ spring: # 数据库索引 database: 0 # 密码 - password: + password: wumei-smart # 连接超时时间 timeout: 10s lettuce: @@ -80,13 +80,12 @@ spring: max-wait: -1ms # mqtt 配置 mqtt: - username: wumei-smart # 账号 - password: wumei-smart # 密码 - host-url: tcp://wumei.live:1883 # mqtt连接tcp地址 - # host-url: tcp://127.0.0.1:1883 - client-id: ${random.value} # 客户端Id,每个启动的id要不同 随机:${random.value} - default-topic: test # 默认主题 - timeout: 100 # 超时时间 + username: wumei-smart # 账号 + password: wumei-smart # 密码 + host-url: tcp://localhost:1883 # mqtt连接tcp地址 + client-id: ${random.int} # 客户端Id,不能相同,采用随机数 ${random.value} + default-topic: test # 默认主题 + timeout: 30000 # 超时时间 keepalive: 30 # 保持连接 clearSession: true # 清除会话(设置为false,断开连接,重连后使用原来的会话 保留订阅的主题,能接收离线期间的消息) task: