Commit Graph

110 Commits (3e5564272f8ee9869821f158e2816f9e444d499c)

Author SHA1 Message Date
jay 86d51844ff update 租户id类型 String->Long 2024-06-13 19:08:46 +08:00
jay 83d9974fe8 add 代码生成器模块-后端 2024-05-28 17:47:36 +08:00
jay eafab2a0c1 add 代码生成器模块-后端 2024-05-28 17:33:44 +08:00
jay dec7438275 update 上传文件大小限制 2024-05-28 13:32:02 +08:00
jay 2045b802ba Merge remote-tracking branch 'origin/V0.5.x-feature-modbus' into V0.5.x
# Conflicts:
#	iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/ThingModel.java
2024-05-18 14:39:27 +08:00
jay 95f065d993 update Copyright 2024-05-15 17:44:17 +08:00
ZOUZDC bdee6f4653 feat: modbus管理点位管理
modbus管理点位管理
2024-05-14 12:23:11 +08:00
tangfudong db1997fb32 feat:产品与物模型属性添加图标系统 2024-04-30 16:56:16 +08:00
jay 993f05b75e update: 更新配置文件 2024-04-24 13:28:37 +08:00
tangfudong 71afcad7ff feat:app接口添加规则相关接口 2024-03-27 17:27:13 +08:00
xiwa 1c9b9ce046 feat:数据库配置简化 2024-03-21 00:01:29 +08:00
xiwa cfc30500cc feat:产品增加保活时长、离线状态更新 2024-03-20 01:58:13 +08:00
xiwa e818736dad feat:增加内置oss 2024-03-16 10:23:54 +08:00
tangfudong c5ac5b66db feat:添加系统与app的数据下行 2024-03-06 09:39:40 +08:00
xiwa b661638bc6 fix:微信小程序登录修复 2024-03-05 22:24:54 +08:00
xiwa f0c4b175f7 feat:在线查询、注册消息缺少时间等修复 2024-03-03 12:41:54 +08:00
xiwa 3cd0622adb feat:增加指定初始文件路径 2024-02-28 22:36:56 +08:00
jay 8c44979dcf update: 从application中读取配置, 1.内置redis配置默认值,2内置es配置默认值 2024-02-27 12:03:07 +08:00
jay debbc8e836 update: 从application中读取配置, 1.内部redis启用 2.内部es启用 2024-02-26 15:02:01 +08:00
xiwa 3ab219c182 fix:依赖修正 2024-02-25 11:46:15 +08:00
xiwa 7ea874c5ac feat:增加子设备注册关联 2024-02-24 23:30:26 +08:00
gaoyoulong 93ca44ebb2 fix: application.yml h2数据库配置更新,与mysql配置格式保持统一,方便切换mysql 2024-02-22 15:43:49 +08:00
xiwa 62c3be6ea0 fix:数据初始化、插件上报等修改 2024-02-20 21:13:37 +08:00
xiwa 1fcf5035dc feat:迁移plugin-core到iot-core 2024-02-09 00:12:27 +08:00
xiwa e85dc4e0ea Merge branch 'dev-V0.5.0' of https://gitee.com/open-iita/iotkit-parent into dev-V0.5.0 2024-02-03 19:54:31 +08:00
xiwa c25318d60f fix:规则引擎问题修复 2024-02-03 19:54:17 +08:00
xiwa 0d04a302a8 fix:属性过滤取值错误修复 2024-01-17 21:31:58 +08:00
tangfudong 3ee1343b80 fix:配置文件中内置缓存端口修改 2024-01-11 17:06:03 +08:00
xiwa c4ab4c90f3 Merge branch 'dev-V0.5.0' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.5.0 2024-01-06 22:43:26 +08:00
xiwa 69df507ae3 feat:独立spring-brick仓库 2024-01-06 22:43:18 +08:00
tangfudong eb434732cf fix:小程序的登录接口添加 2024-01-04 17:35:19 +08:00
tangfudong 70c8d69444 Merge remote-tracking branch 'origin/dev-V0.5.0' into dev-V0.5.0 2023-12-21 16:27:35 +08:00
tangfudong b66f500a5a Merge branch 'dev-V0.4.5' into dev-V0.5.0
# Conflicts:
#	data/components/750da259-ff77-4869-a5a5-12a5433b0e4c/component.js
#	data/init/sys_app.json
#	iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java
#	iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/config/SaTokenConfig.java
#	iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/utils/LoginHelper.java
#	iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java
#	iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java
#	iot-components/iot-nb-component/src/main/java/cc/iotkit/comp/nb/NBVerticle.java
#	iot-components/iot-nb-component/src/main/resources/component.js
#	iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java
#	iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
2023-12-20 11:40:25 +08:00
xiwa 9ac5c81fc5 feat:更新脚本不用重启插件 2023-12-18 00:20:48 +08:00
xiwa 4070f1cca3 feat:修复插件重启报错、增加iotdb支持 2023-12-10 23:05:24 +08:00
xiwa 7217438afb fix:bug#I8DLHU 2023-11-03 23:10:03 +08:00
xiwa 1934b743c2 fix:修复bug #I8DLHU 2023-11-03 22:58:29 +08:00
xiwa b0ef14f731 fix:插件支持脚本文件自动导入 2023-10-27 08:12:06 +08:00
xiwa d159c2b8a7 fix:mysql配置缩进调整 2023-10-20 23:12:02 +08:00
xiwa 0a90c90498 fix:mysql配置缩进调整 2023-10-20 23:10:34 +08:00
xiwa 99ce49f4c5 fix:合并dev-v0.4.6调整 2023-10-15 09:20:44 +08:00
xiwa 6c8dc8af9f feat:核心模块、插件模块抽离,插件完善 2023-10-10 07:34:00 +08:00
jay 1229b668b9 revert application.yml
revert pom
2023-09-22 10:36:33 +08:00
xiwa 21b8755751 feat:插件功能 2023-09-19 08:48:28 +08:00
jay de53e07304 fix: 退出登录接口 2023-09-18 11:19:03 +08:00
jay 97f48c4b16 fix: 微信默认配置为空 2023-09-05 11:07:56 +08:00
jay 5f68b99c90 Merge branch 'dev-V0.4.5' into dev-V0.4.5-postgre
# Conflicts:
#	iot-starter/src/main/resources/application.yml
2023-08-30 19:07:53 +08:00
zak b49c65312c fix: 修复mysql动态数据源配置缺失 2023-08-17 14:49:34 +08:00
xiwa a6420febe0 fix:还原默认时序数据库配置 2023-08-13 09:12:22 +08:00
xiwa def1852011 feat:td3.0支持调整 2023-08-13 09:01:25 +08:00