alwayssuper
|
9f8c6a944c
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into origin/feature/iot
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
|
2025-02-26 08:36:27 +08:00 |
安浩浩
|
4015e7905f
|
【功能完善】IoT: 更新 MQTT 客户端逻辑，重构消息处理和重连机制，优化配置文件
|
2025-02-25 08:14:19 +08:00 |
|
alwayssuper
|
6d059eae61
|
[fix]：statistics
|
2025-02-22 16:58:47 +08:00 |
YunaiV
|
7168e60fdd
|
【功能新增】IoT：实现 IotRuleSceneDataBridgeAction 的 http 部分的逻辑
|
2025-02-03 18:33:43 +08:00 |
|
YunaiV
|
48cfcdadc1
|
【代码优化】IoT：实现规则 IotRuleSceneDeviceControlAction 执行器
|
2025-02-03 12:05:13 +08:00 |
|
YunaiV
|
7670ac19e5
|
【代码新增】IoT：增加 plugin 插件的心跳机制，以及 Job 超时离线
|
2025-01-30 23:36:18 +08:00 |
|
YunaiV
|
5fbfe49305
|
【功能优化】Bpm：设备属性上报
|
2025-01-28 04:56:03 +08:00 |
|
YunaiV
|
8236154ae8
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotThingModelTypeEnum.java
|
2025-01-28 03:54:16 +08:00 |
|
YunaiV
|
269dec1b2e
|
【代码评审】IoT：模拟设备数据
|
2025-01-25 11:46:26 +08:00 |
alwayssuper
|
62a868f497
|
feat:simulator1
|
2025-01-12 20:13:41 +08:00 |
|
alwayssuper
|
f1d887d0e0
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
Conflicts:
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDeviceLogDataMapper.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceLogDataService.java
yudao-server/src/main/resources/application-local.yaml
|
2025-01-10 20:46:43 +08:00 |
|
alwayssuper
|
d9dda54cce
|
local
|
2025-01-10 20:42:00 +08:00 |
|
安浩浩
|
d39e2c1bc4
|
【代码优化】修改配置文件
|
2025-01-07 23:21:49 +08:00 |
|
安浩浩
|
77b89aad77
|
【功能完善】IoT: 集成 Vert.x 支持，重构 HTTP 插件为 Vert.x 插件
|
2025-01-07 23:13:57 +08:00 |
|
YunaiV
|
c239d9cc56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
|
2024-11-19 09:26:44 +08:00 |
痴货
|
325d5e6b12
|
【功能优化】完成转账回调接口
|
2024-10-08 21:25:52 +08:00 |
|
YunaiV
|
f7bed6d833
|
【代码评审】IoT：产品、设备、物模型的代码
|
2024-10-01 19:56:15 +08:00 |
|
YunaiV
|
44b466c678
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-server/pom.xml
|
2024-10-01 19:54:22 +08:00 |
|
YunaiV
|
805f80c36a
|
【功能优化】INFRA：代码生成时，默认禁用单元测试的生成，更符合大家的习惯
|
2024-09-19 13:10:23 +08:00 |
|
YunaiV
|
fee7267799
|
【代码优化】商城：价格计算相关逻辑
|
2024-09-15 15:38:38 +08:00 |
|
YunaiV
|
2876c7ce16
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
|
2024-09-15 11:24:32 +08:00 |
|
痴货
|
e44c0e668e
|
【功能】完成商品列表价格计算时，需要支持减免金额的功能
|
2024-09-14 19:01:57 +08:00 |
|
YunaiV
|
7c79aae2b4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2024-09-07 20:37:57 +08:00 |
|
YunaiV
|
10334f3fb6
|
【代码评审】IOT：产品的管理
|
2024-09-07 20:37:13 +08:00 |
|
YunaiV
|
74492d65f0
|
【功能优化】AI：model-uri、tokenizer 地址调整
|
2024-09-07 14:57:36 +08:00 |
|
YunaiV
|
30fd7996f6
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-09-07 08:47:56 +08:00 |
|
YunaiV
|
2759a32331
|
【功能移除】INFRA：移除 Vue3 + Element Plus schema 模式
|
2024-09-07 08:30:29 +08:00 |
|
YunaiV
|
15f46db7ac
|
【代码优化】全局：MySQL JDBC 增加 rewriteBatchedStatements 批量插入
|
2024-09-04 09:08:12 +08:00 |
|
YunaiV
|
ae9ff74e23
|
【代码优化】全局：MySQL JDBC 增加 rewriteBatchedStatements 批量插入
|
2024-09-04 09:07:16 +08:00 |
|
YunaiV
|
acf0e401d3
|
【代码优化】SYSTEM：user_role_ids 忽略多租户
|
2024-09-03 16:11:08 +08:00 |
|
YunaiV
|
2578ca7311
|
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into master-jdk17
|
2024-09-01 09:01:04 +08:00 |
|
YunaiV
|
34231bc5f8
|
【代码优化】AI 大模型：transformer 的 onnx、tokenizer 走 CDN，避免 github
|
2024-09-01 08:55:58 +08:00 |
|
YunaiV
|
1dadfb8fba
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 15:30:35 +08:00 |
陈玄礼
|
6eb40aa544
|
!1041 支付应用，增加 appKey 标识，用于不同接入方的标识
* feat[yudao-module-pay]: 更新新增和更新支付应用时校验逻辑
* fix[yudao-module-trade]: 为支付应用标识提供缺省值
* fix[yudao-module-pay]: appKey注释应用编码更新为应用标识
* feat[yudao-module-pay]: 为支付应用新增支付编码属性
|
2024-08-18 07:02:09 +00:00 |
|
安浩浩
|
36a828866b
|
新增：iot 产品
|
2024-08-17 19:41:42 +08:00 |
|
YunaiV
|
7288e6c980
|
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into develop
|
2024-08-10 18:41:48 +08:00 |
|
YunaiV
|
83bd96d672
|
【功能新增】AI：集成 Azure 的 OpenAI 模型
|
2024-08-10 14:34:57 +08:00 |
|
YunaiV
|
b453856864
|
【代码优化】AI：向量化的集成
|
2024-08-09 00:09:19 +08:00 |
|
安浩浩
|
b47176c96e
|
新增：iot 模块 集成 emqx 接收 mqtt 接收消息
|
2024-08-06 22:17:29 +08:00 |
xiaoxin
|
2a984504d9
|
【新增】AI 知识库：文档向量化 demo
|
2024-08-05 13:53:50 +08:00 |
|
YunaiV
|
ba18788517
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-31 19:48:02 +08:00 |
puhui999
|
2bc96fe521
|
【代码优化】SYSTEM：订阅消息跳转小程序类型
|
2024-07-31 12:58:06 +08:00 |
|
YunaiV
|
0e24994c92
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-07-30 23:12:18 +08:00 |
|
YunaiV
|
7782b36f90
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-30 23:12:06 +08:00 |
|
YunaiV
|
29ade63f87
|
【代码优化】AI：image 作品中心的代码
|
2024-07-30 00:01:08 +08:00 |
|
YunaiV
|
ebe3cc727b
|
【功能新增】全局：多租户缓存，增加忽略的 Spring Cache 配置
|
2024-07-23 23:25:56 +08:00 |
|
YunaiV
|
70663af4cb
|
【代码优化】全局：去除 application.yaml 相关配置文件的冗余
|
2024-07-20 16:35:11 +08:00 |
|
YunaiV
|
4de27eb12d
|
【依赖】easy-trans from 1.6.6 to 1.7.8
|
2024-07-15 12:38:23 +08:00 |
|
YunaiV
|
211e196fce
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 21:57:52 +08:00 |
|
YunaiV
|
45805aa761
|
【依赖】spring boot from 3.2.2 to 3.3.1
|
2024-07-13 16:38:26 +08:00 |