YunaiV
|
54941f1361
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
|
2025-04-30 00:11:24 +08:00 |
|
YunaiV
|
4cebe4af14
|
reactor：使用 justauth 官方 1.16.7
|
2025-04-30 00:05:54 +08:00 |
|
YunaiV
|
4ed753d6b8
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2025-03-30 10:55:04 +08:00 |
|
YunaiV
|
138239324c
|
【功能新增】AI：百川模型的接入
|
2025-03-23 12:48:13 +08:00 |
|
YunaiV
|
9b11199665
|
【功能新增】system：增加租户的下拉选择，用于登录界面
|
2025-03-22 09:41:22 +08:00 |
|
YunaiV
|
7119350a37
|
【同步】jdk21 和 jdk8 的代码
|
2025-03-17 13:37:52 +08:00 |
|
YunaiV
|
77e64c217e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/IotDeviceStatusUpdateReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotThingModelSaveReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/vo/IotThinkModelFunctionPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/callback/EmqxCallback.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/client/EmqxClient.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/start/EmqxStart.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
# yudao-server/src/main/resources/application-local.yaml
|
2025-03-17 13:16:59 +08:00 |
|
YunaiV
|
7c84ab9919
|
【代码评审】IoT：整体实现
|
2025-03-17 13:14:54 +08:00 |
|
YunaiV
|
eb7269083a
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-03-17 08:54:10 +08:00 |
|
YunaiV
|
8203e074ac
|
【代码评审】IoT：OTA 的实现
|
2025-03-16 22:28:10 +08:00 |
|
YunaiV
|
9dfe2f6fdf
|
【代码评审】IoT：OTA 的实现
|
2025-03-16 21:33:47 +08:00 |
|
YunaiV
|
3b85adc754
|
【代码评审】IoT：数据桥梁的接入
|
2025-03-16 20:51:00 +08:00 |
|
YunaiV
|
7609c74c8b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
|
2025-03-16 17:22:39 +08:00 |
|
YunaiV
|
d597d0057e
|
【缺陷修复】全局：application-dev 配置文件，多了一个 spring 前缀
|
2025-03-16 17:04:04 +08:00 |
|
YunaiV
|
8ccc55d1aa
|
【功能优化】商城：KdNiaoExpressClient 增加 requestType 配置，使用免费版，还是增值版
|
2025-03-16 16:45:48 +08:00 |
|
YunaiV
|
937ae041bc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-03-15 18:58:53 +08:00 |
|
YunaiV
|
dd0cadd426
|
【缺陷修复】关闭 knife4j 增强，存在兼容性问题，悲伤
|
2025-03-15 18:58:02 +08:00 |
|
YunaiV
|
41640642d4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
|
2025-03-15 06:56:16 +08:00 |
puhui999
|
966357b44e
|
【代码优化】IoT: 数据桥梁测试代码抽离到测试类
|
2025-03-14 17:34:16 +08:00 |
|
YunaiV
|
34453a3f70
|
【代码评审】IoT：数据桥梁的维护
|
2025-03-13 08:30:27 +08:00 |
|
芋道源码
|
27e08266e0
|
!1269 【代码优化】IoT: 优化数据桥梁
Merge pull request !1269 from puhui999/iot
|
2025-03-13 00:18:30 +00:00 |
|
YunaiV
|
569d651481
|
【功能完善】IoT：增加 device config 配置
|
2025-03-13 08:17:31 +08:00 |
|
YunaiV
|
07fe6167e0
|
【功能新增】AI：接入 minimax 和 moonshot 月之暗灭（kimi）
|
2025-03-11 13:20:59 +08:00 |
|
YunaiV
|
f2ee2008e6
|
【功能新增】AI：增加 MilvusVectorStore 向量库的接入
|
2025-03-09 09:27:33 +08:00 |
|
YunaiV
|
588c9fe323
|
【功能新增】AI：增加 RedisVectorStore 向量库的接入
|
2025-03-08 22:09:16 +08:00 |
|
puhui999
|
831970233c
|
【代码优化】IoT: 数据桥梁的执行器根据引入的消息队列动态加载
|
2025-03-08 10:50:22 +08:00 |
|
YunaiV
|
44bcc9476d
|
【功能新增】AI：增加 QdrantVectorStore 向量库的接入
|
2025-03-06 22:22:22 +08:00 |
|
YunaiV
|
6ccd0ca61e
|
【代码优化】AI：优化 pom 依赖的说明
|
2025-03-04 23:12:24 +08:00 |
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 |
|
YunaiV
|
a7e5aaec3b
|
【代码新增】AI：轨迹流动的接入
|
2025-02-24 21:19:44 +08:00 |
|
YunaiV
|
a1d5602c40
|
【代码新增】AI：适配腾讯混元大模型、知识引擎（deepseek）
|
2025-02-23 21:14:53 +08:00 |
|
YunaiV
|
46726fe67c
|
【代码新增】AI：适配字节豆包 doubao、deepseek
|
2025-02-23 20:00:54 +08:00 |
|
YunaiV
|
4ee638db87
|
【代码优化】AI：适配 Spring AI 1.0.6 对 sd、mj 的兼容
|
2025-02-23 18:47:35 +08:00 |
|
YunaiV
|
5655ae925c
|
【代码优化】AI：适配 Spring AI 1.0.6 对 OpenAI 的逻辑
|
2025-02-23 17:19:19 +08:00 |
|
alwayssuper
|
6d059eae61
|
[fix]：statistics
|
2025-02-22 16:58:47 +08:00 |
|
安浩浩
|
6eadbba345
|
【代码重构】IoT：重构插件配置管理，替换 PluginInfo 为 PluginConfig
|
2025-02-05 21:44:23 +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
|
bbb1bec1b9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java
# 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/service/kefu/KeFuMessageServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApiImpl.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
|
2024-11-25 19:32:10 +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 |