Commit Graph

1328 Commits

Author SHA1 Message Date
YunaiV 07b3865f2e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-04-12 12:01:22 +08:00
YunaiV fdd15424fc 171 fix(protection): 修复HTTP接口签名 API重复请求问题 2025-04-12 12:01:00 +08:00
YunaiV d8451b004e 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/service/kefu/KeFuMessageServiceImpl.java
2025-04-12 11:56:35 +08:00
YunaiV f6601ab639 171 fix(protection): 修复HTTP接口签名 API重复请求问题 2025-04-12 11:32:18 +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
qiny ba4d4540ab 条件判断添加支持JOIN表的属性 2025-03-24 16:58:42 +08:00
YunaiV 71add4b058 【代码评审】IoT:整体实现 2025-03-17 20:45:26 +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 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 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 c95f0c152d 【功能优化】全局:增加 methodArgumentNotValidExceptionExceptionHandler 对「组合校验」场景的兼容 2025-03-16 16:58:13 +08:00
YunaiV 2dc8071faa 【功能优化】全局:增加 selectFirstOne 方法,解决容易出现并发场景下的查询 2025-03-16 16:31:36 +08:00
YunaiV 36165e72fc Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-16 16:19:10 +08:00
YunaiV fc8e4662bb 【功能优化】限流的配置,增加 expire 过期,原因参见 https://t.zsxq.com/lcR0W 场景 2025-03-16 14:45:09 +08:00
安浩浩 86e4379e62 【功能完善】IoT:新增 TDengine 相关依赖 2025-03-15 18:08:05 +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
YunaiV deca69ada6 【功能优化】AI:DispatcherType.ASYNC 时,不进行认证,解决 Spring AI SSE 的认证问题
https://github.com/YunaiV/yudao-cloud/issues/197
2025-02-24 21:28:15 +08:00
puhui999 0400932260 【代码优化】IoT: 数据桥梁的执行器抽离 2025-02-20 17:44:06 +08:00
puhui999 add90365df 【功能新增】IoT: 数据桥梁增加 RocketMQConfig 配置,实现executeRocketMQ 发送消息 2025-02-19 15:51:34 +08:00
YunaiV a44a45a2cb 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/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
2025-02-09 11:36:21 +08:00
YunaiV bb11fdd3fa Merge branch 'master-jdk17' 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/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
2025-02-09 07:23:17 +08:00
YunaiV 949fa22509 添加项目前缀,日志无法插入 #731 2025-02-09 07:15:59 +08:00
YunaiV 9569c3fbed 【代码评审】BPM:触发器 - 表单修改 2025-02-09 06:55:56 +08:00
YunaiV d718f80108 【代码评审】IoT:plugin 相关的实现 2025-02-08 07:39:48 +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 910bb6ca3c 【代码新增】IoT:完善 IotRuleSceneServiceImpl 的规则匹配计算,isTriggerConditionParameterMatched 函数有点长,= = 捉摸咋优化下 2025-02-02 22:08:34 +08:00
YunaiV 252366781d 【代码优化】IoT:优化插件 common 和 http 的配置类 2025-01-31 21:51:06 +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 8089f3a319 【功能优化】IoT:
1. DeviceDataApi => IotDeviceUpstreamApi,并新建 upstream 包
2. ThingModelMessage => IotDeviceMessage 设备消息
3. 基于 spring event 异步消费 IotDeviceMessage,并实现 IotDeviceLogMessageConsumer 记录日志
2025-01-27 14:15:07 +08:00
jason 44486afd95 【代码评审修复】 Http 触发器返回值处理修改 2025-01-26 15:36:14 +08:00
YunaiV 599c432abb 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/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessListenerServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2025-01-25 09:49:57 +08:00
YunaiV bb798681f7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java
2025-01-24 22:48:37 +08:00
YunaiV aab61f7963 【代码评审】Bpm:更多设置-摘要设置 2025-01-24 21:03:55 +08:00
YunaiV 0911d42e49 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
2025-01-24 20:56:26 +08:00
YunaiV 0e07da807a Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:46 +08:00
YunaiV 295fad7d97 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:17 +08:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定 2025-01-24 17:31:41 +08:00
mcwindy 408f88da54
【代码优化】 简化滑动脱敏处理器实现 2025-01-24 02:05:46 +08:00
YunaiV bd7f9761d8 https://gitee.com/zhijiantianya/yudao-cloud/pulls/165/files 2025-01-23 20:16:19 +08:00
YunaiV 916024b891 【功能新增】IoT:验证通过独立、内嵌模式的调用 2025-01-21 19:38:41 +08:00
YunaiV a985ba923e 【功能优化】全局:清理掉多余重复的 "/*.html" 2025-01-17 19:56:09 +08:00
YunaiV 3871a1f83f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2024-12-31 09:22:59 +08:00
YunaiV d49c11fbec 【拼写修正】KafkaWebSocketMessageConsumer 的 kafkaWebSocketMessageSender 拼错 2024-12-28 19:17:55 +08:00
YunaiV f202613987 【升级】mybatis-plus from 3.5.8 to 3.5.9 2024-12-28 17:29:03 +08:00
YunaiV 5831534ed3 【升级】mybatis-plus from 3.5.8 to 3.5.9 2024-12-28 17:22:52 +08:00
YunaiV 9733c48f4c 【升级】knife4j from 4.5.0 to 4.6.0(社区版) 2024-12-28 12:10:30 +08:00
YunaiV 50536f1af0 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/task/BpmProcessInstanceServiceImpl.java
2024-12-19 21:27:52 +08:00