Commit Graph

654 Commits

Author SHA1 Message Date
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
痴货 325d5e6b12 【功能优化】完成转账回调接口 2024-10-08 21:25:52 +08:00
YunaiV 5f75fcb0fb 【代码优化】工作流:删除用不到的方法 2024-10-04 17:17:01 +08:00
YunaiV eaa22e7a56 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/controller/admin/definition/BpmModelController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
#	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/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.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/BpmProcessDefinitionServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
#	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/BpmTaskService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
#	yudao-server/pom.xml
2024-10-04 17:16:23 +08:00
YunaiV 9334edc9ea Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2024-10-03 11:28:22 +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 ef4e7176a2 【依赖优化】snapshot to SNAPSHOT,解决 https://github.com/YunaiV/ruoyi-vue-pro/issues/417 问题 2024-10-01 16:14:58 +08:00
YunaiV 5e9bdcb21f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2024-10-01 16:11:13 +08:00
YunaiV 2bbb7f86fe 【同步】BOOT 和 CLOUD 的功能 2024-10-01 14:39:30 +08:00
YunaiV 9f676fecfa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java
2024-09-29 12:58:49 +08:00
YunaiV 805f80c36a 【功能优化】INFRA:代码生成时,默认禁用单元测试的生成,更符合大家的习惯 2024-09-19 13:10:23 +08:00
YunaiV 4e8e491035 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
2024-09-17 15:34:30 +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 8024d0af3f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
#	yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java
#	yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/dto/CouponValidReqDTO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/RewardActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
#	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/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.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/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
2024-09-07 20:45:32 +08:00
YunaiV 1e69face92 【代码评审】IOT:产品的管理 2024-09-07 20:38:49 +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 840cfad84a 【功能优化】商城:价格计算时,返回可用 + 不可用的优惠劵 2024-09-07 12:05:42 +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 d3f28b92a7 【代码优化】SYSTEM:认证令牌的操作,增加 @Transactional 注解 2024-09-03 10:34:44 +08:00
YunaiV 608af2ed69 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-09-01 09:02:04 +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 e2197551ec 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/app/combination/AppCombinationRecordController.java
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/product/ProductStatisticsJob.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/config/TradeOrderProperties.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
2024-08-18 17:22:47 +08:00
YunaiV b632726a69 【功能优化】支付:支付应用,增加 appKey 标识,用于不同接入方的标识 2024-08-18 16:33:55 +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 923b967766 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm 2024-08-10 19:31:06 +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 f3a8d6f06c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
2024-07-31 23:49:21 +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 257acba31e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
2024-07-24 18:46:33 +08:00
YunaiV ebe3cc727b 【功能新增】全局:多租户缓存,增加忽略的 Spring Cache 配置 2024-07-23 23:25:56 +08:00
YunaiV 68dd270258 【代码修复】MALL:更新库存时,同时更新销量,和 taobao 保持一致的逻辑 2024-07-23 12:44:57 +08:00
YunaiV e2f3491295 【代码修复】MALL:更新库存时,同时更新销量,和 taobao 保持一致的逻辑 2024-07-23 12:43:49 +08:00
YunaiV 198c374a6f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-20 16:35:22 +08:00
YunaiV 70663af4cb 【代码优化】全局:去除 application.yaml 相关配置文件的冗余 2024-07-20 16:35:11 +08:00
YunaiV bc365800b5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2024-07-15 12:38:42 +08:00
YunaiV 4de27eb12d 【依赖】easy-trans from 1.6.6 to 1.7.8 2024-07-15 12:38:23 +08:00
YunaiV eca0a0422b 【依赖】jimureport from 1.6.6 to 1.7.8 2024-07-14 22:01:20 +08:00
YunaiV 2e3f998ee7 【依赖】jimureport from 1.6.6 to 1.7.8 2024-07-14 22:01:03 +08:00
YunaiV 438078d28f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-report/yudao-module-report-biz/pom.xml
2024-07-14 21:58:59 +08:00
YunaiV 211e196fce 【依赖】jimureport from 1.6.6 to 1.7.8 2024-07-14 21:57:52 +08:00
YunaiV 375745828b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2024-07-13 16:39:15 +08:00
YunaiV 45805aa761 【依赖】spring boot from 3.2.2 to 3.3.1 2024-07-13 16:38:26 +08:00
YunaiV dee820b8fd 【功能新增】MALL:新增 mall 客服 2024-07-13 12:25:55 +08:00
YunaiV 03e07a2902 【功能新增】MALL:新增 mall 客服 2024-07-13 12:24:49 +08:00
YunaiV ce1940e4f3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.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/brokerage/BrokerageUserServiceImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
2024-07-13 12:14:46 +08:00
YunaiV 41afea6818 【功能新增】MALL:新增 mall 客服 2024-07-13 12:14:07 +08:00
芋道源码 b586a09b90
!1011 新增 mall 客服
Merge pull request !1011 from 芋道源码/develop
2024-07-13 04:11:46 +00:00
YunaiV 8d1d0c15f7 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:03:26 +08:00
puhui999 ec5a209eed 【修复】恢复 websocket path 2024-07-12 18:01:30 +08:00
YunaiV 88b897ca13 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-12 09:34:44 +08:00
YunaiV c3af08900c 【模块新增】AI:支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力 2024-07-12 09:32:17 +08:00
芋道源码 90fa7be660
!1006 AI 大模型的草稿提交(code review 代码)
Merge pull request !1006 from 芋道源码/master-jdk21-ai
2024-07-12 01:29:43 +00:00
YunaiV a19bd126e1 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-07 17:00:16 +08:00
YunaiV 6e64ae774e 【代码新增】AI:接入智谱 GLM-4 模型 2024-07-06 18:16:47 +08:00
YunaiV 59c853b54d 【代码优化】AI:完善 DeepSeekChatTests、XingHuoChatModelTests 单测,方便大家快速体验 2024-07-06 17:37:17 +08:00