szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,351 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

9351 Commits

Author SHA1 Message Date
YunaiV 4a7515ce3a 【升级】netty from 4.1.113 to 4.1.116 
【升级】velocity from 2.4 to 2.4.1
【升级】guava from 33.3.1 to 33.4.0
 2024-12-28 13:24:11 +08:00
YunaiV 9d73afbd54 【升级】hutool from 5.8.32 to 5.8.35 2024-12-28 13:19:33 +08:00
YunaiV e71c7c3e06 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-12-28 13:18:08 +08:00
YunaiV a7a5563111 【升级】hutool from 5.8.32 to 5.8.35 2024-12-28 13:17:02 +08:00
YunaiV 2e2005bdd0 【升级】mapstruct from 1.6.2 to 1.6.3 2024-12-28 13:08:11 +08:00
YunaiV d02e65b7dd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-12-28 13:07:26 +08:00
YunaiV b6b4847476 【升级】mapstruct from 1.6.2 to 1.6.3 2024-12-28 13:06:56 +08:00
YunaiV 45151dd23e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
 2024-12-28 12:10:58 +08:00
YunaiV 9733c48f4c 【升级】knife4j from 4.5.0 to 4.6.0（社区版） 2024-12-28 12:10:30 +08:00
YunaiV b8ac8c8ccc Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-12-28 11:51:18 +08:00
YunaiV d25625fcc8 【升级】redisson from 3.36.0 to 3.41.0 2024-12-28 11:50:58 +08:00
YunaiV a18ee8c002 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-12-28 11:23:55 +08:00
YunaiV 54a5854908 【升级】spring boot from 3.3.4 to 3.4.1 2024-12-28 11:23:13 +08:00
YunaiV 158b7114a5 【同步】jdk21 和 jdk8 的代码 2024-12-27 21:50:06 +08:00
YunaiV d676dcc525 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/BpmModelSaveReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
 2024-12-27 21:46:30 +08:00
YunaiV 427cc63764 Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-12-27 21:46:10 +08:00
YunaiV b1b74cf14a 【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl 2024-12-27 21:46:01 +08:00
芋道源码 8c4f906da4
!1168 【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl.java. 
Merge pull request !1168 from 山野羡民/N/A
 2024-12-27 13:45:35 +00:00
YunaiV 5998df0119 【同步】jdk21 和 jdk8 的代码 2024-12-27 21:41:39 +08:00
YunaiV 9039af46d4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
 2024-12-27 21:30:31 +08:00
YunaiV fa526a98c0 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-12-27 21:29:41 +08:00
puhui999 f623a57862 Merge remote-tracking branch 'yudao/feature/iot' into iot 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelEvent.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java
 2024-12-27 10:54:52 +08:00
puhui999 8b7f329183 【代码优化】IOT: ThingModel 2024-12-27 10:37:16 +08:00
YunaiV b4288bc393 【代码评审】IoT：ThingModel 维护 2024-12-26 13:56:38 +08:00
芋道源码 4075fde765
!1171 【功能完善】IOT: ThingModel 服务和事件 
Merge pull request !1171 from puhui999/iot
 2024-12-26 05:50:02 +00:00
puhui999 fae17e9125 【功能完善】IOT: ThingModel 服务和事件 2024-12-26 13:27:02 +08:00
puhui999 3524bfd3b3 Merge remote-tracking branch 'yudao/feature/iot' into iot 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotProductThingModelServiceImpl.java
 2024-12-26 13:14:53 +08:00
YunaiV 7b64b7fc69 【功能优化】IoT：跨租户校验 ProductKey 和 DeviceKey，避免跨租户的 Tdengine 表冲突 2024-12-26 12:57:56 +08:00
YunaiV 09a26666ec 【功能修复】IoT：解决 device 建表的时候，tdengine 默认字段都是小写的问题，通过 _ 解决 2024-12-26 12:51:36 +08:00
YunaiV 245ab4e62d 【代码优化】IoT：修复 device 建表时，tdengine 分成 length 和 type 的情况 2024-12-26 09:55:19 +08:00
YunaiV 064b3381df 【代码重构】IoT：弱化 TdEngineDDLMapper 封装，由每个业务独立实现 2024-12-26 07:55:15 +08:00
puhui999 1f9af15e71 【功能完善】IOT: ThingModel 服务和事件 2024-12-26 00:15:57 +08:00
puhui999 38796cc4d4 【功能完善】IOT: ThingModel 服务和事件 2024-12-25 18:36:22 +08:00
puhui999 f4e9a586e3 【功能完善】IOT: ThingModel 服务和事件 2024-12-25 15:47:24 +08:00
puhui999 94cfc4a1b1 【功能完善】IOT: ThingModel 服务和事件 2024-12-25 12:15:58 +08:00
芋道源码 39896555f0
!1170 【代码优化】IOT: ThingModel 评审优化 
Merge pull request !1170 from puhui999/iot
 2024-12-24 01:28:58 +00:00
puhui999 ed901bc97f Merge remote-tracking branch 'yudao/feature/iot' into iot 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
 2024-12-23 09:47:59 +08:00
YunaiV e01d03eefb 【代码评审】IoT：物模型日志 2024-12-21 16:33:50 +08:00
芋道源码 f580383267
!1167 【代码优化】IOT:物模型日志评审优化 
Merge pull request !1167 from alwayssuper/feature/iot
 2024-12-21 08:29:40 +00:00
YunaiV e998b0c7eb 【代码评审】IoT：评审 plugin 实现 2024-12-21 16:28:25 +08:00
山野羡民 fb436ac189
【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2024-12-21 06:55:11 +00:00
alwayssuper f68f0de05d Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into origin/feature/iot 2024-12-21 08:00:59 +08:00
安浩浩 a2532013ec 【新增功能】IoT： HTTP 插件模块 2024-12-20 18:57:40 +08:00
alwayssuper 8ff09fea01 [代码优化]：物模型日志评审优化 2024-12-20 14:44:46 +08:00
puhui999 767a26dd70 【代码优化】IOT: ThingModel 评审优化 2024-12-20 10:18:02 +08:00
YunaiV 6a746a4d89 【同步】jdk21 和 jdk8 的代码 2024-12-19 21:31:11 +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
YunaiV b2434b7b41 【代码评审】IoT：模拟设备发送的 review 2024-12-19 21:23:07 +08:00
YunaiV 95067fd6c6 【代码评审】IoT：评审 ThingModel 的实现 2024-12-19 21:12:07 +08:00
YunaiV 92de5b1f09 Merge branch 'feature/iot' of https://gitee.com/alwayssuper/ruoyi-vue-pro into feature/iot 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelArgument.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/tdengine/IotThingModelMessageService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
 2024-12-19 21:07:25 +08:00