Commit Graph

7414 Commits

Author SHA1 Message Date
YunaiV
387ef6f396 【功能简化】商城:1)拼团活动,移除用户主动取消,不常用;2)review 拼团相关的逻辑 2024-08-10 12:15:57 +08:00
YunaiV
6e67120b8e Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-08-09 21:48:24 +08:00
YunaiV
5071194501 Merge branch 'develop' of https://github.com/YunaiV/ruoyi-vue-pro into develop 2024-08-09 21:45:31 +08:00
芋道源码
ce610131f4
Merge pull request #619 from bro0k/develop
fix: insertOrUpdate死循环问题
2024-08-09 21:45:08 +08:00
YunaiV
22686bafa2 【代码优化】SYSTEM:增加新阿里云 SmsClient 的单测 2024-08-09 20:41:35 +08:00
brook
fd42e1711d fix: insertOrUpdate死循环问题 2024-08-09 11:31:14 +08:00
YunaiV
0c8ee55a17 【代码优化】SYSTEM:去除阿里云短信的 maven 依赖 2024-08-09 00:28:20 +08:00
YunaiV
dc267ea568 Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClient.java
2024-08-09 00:16:41 +08:00
YunaiV
b453856864 【代码优化】AI:向量化的集成 2024-08-09 00:09:19 +08:00
芋道源码
f8d1fa9b49
!16 文档向量化demo
Merge pull request !16 from 小新/master-jdk21-ai
2024-08-08 16:04:10 +00:00
YunaiV
a86ce73542 【代码优化】商城:优惠券回收之后,领取数量和剩余数量的更新 2024-08-08 23:35:20 +08:00
芋道源码
55f2612369
!1034 修复优惠券回收之后,领取数量和剩余数量不更新的问题
Merge pull request !1034 from 卢越/master-jdk17
2024-08-08 15:32:39 +00:00
scholar
2f38261de8 阿里云短信fix urlencode问题 2024-08-08 22:16:23 +08:00
卢越
9606687878 修复优惠券回收后,领取数量和剩余数量不更新的问题 2024-08-08 15:17:35 +08:00
卢越
04fdc70f58 修复优惠券回收后,领取数量和剩余数量不更新的问题 2024-08-08 14:13:09 +08:00
芋道源码
257e3c6ae3
!1032 购物车查询新增返回字段:商品类别ID
Merge pull request !1032 from 卢越/master-jdk17
2024-08-08 05:08:39 +00:00
卢越
17fa59249b 购物车查询添加返回商品类别ID 2024-08-08 09:33:07 +08:00
YunaiV
8775472af7 【代码评审】门店自提:相关代码的优化、以及 todo 评审 2024-08-07 22:09:31 +08:00
芋道源码
5b59ce5261
!1031 【代码优化】MALL-TRADE:订单结算信息返回积分相关信息
Merge pull request !1031 from puhui999/develop
2024-08-07 13:24:51 +00:00
YunaiV
8eb82f0b59 【代码优化】SYSTEM:去除腾讯云短信的 maven 依赖 2024-08-07 21:20:29 +08:00
芋道源码
44014c7772
!1030 阿里云短信修改为基于API方式,减少SDK依赖
Merge pull request !1030 from scholarli/develop
2024-08-07 13:12:20 +00:00
puhui999
4322e2f8e1 【代码优化】腾讯云短信功能还需要 tencentcloud-sdk 2024-08-07 17:31:46 +08:00
puhui999
cd03ddddb3 Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop 2024-08-07 17:09:36 +08:00
puhui999
24b1594976 【代码优化】MALL-TRADE:订单结算信息返回积分相关信息 2024-08-07 17:09:16 +08:00
YunaiV
30c6f1eb77 【代码优化】SYSTEM:去除阿里云短信的 maven 依赖 2024-08-07 13:03:42 +08:00
scholar
2192129220 完成todo部分的修改 2024-08-07 10:52:07 +08:00
xiaoxin
d698ef70b5 【新增】AI 知识库:支持读取 PDF、DOC/DOCX、PPT/PPTX 和 HTML等格式 2024-08-05 14:00:35 +08:00
xiaoxin
2a984504d9 【新增】AI 知识库:文档向量化 demo 2024-08-05 13:53:50 +08:00
YunaiV
2dd66847cf Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java
2024-08-03 19:54:53 +08:00
YunaiV
7ba3b12313 【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏 2024-08-03 18:48:06 +08:00
YunaiV
8c2b8ed894 Merge branch 'develop' of https://github.com/YunaiV/ruoyi-vue-pro into develop 2024-08-03 18:47:37 +08:00
芋道源码
55fec9e8ef
Merge pull request #605 from craftsman4j/dev-0712-sensitive
【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏
2024-08-03 18:47:23 +08:00
YunaiV
760b4c147d Merge branch 'dev-0712-sensitive' of https://github.com/craftsman4j/ruoyi-vue-pro into develop 2024-08-03 16:54:17 +08:00
YunaiV
1eb07b8389 V2.2.0 版本发布 2024-08-02 23:11:13 +08:00
YunaiV
7de546385a 【代码优化】SYSTEM:微信小程序的订阅 2024-08-01 23:21:14 +08:00
YunaiV
abe2f8580b 【代码优化】SYSTEM:微信小程序的订阅 2024-07-31 23:47:02 +08:00
zhougang
08e1c69d10 【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏 2024-07-31 22:43:48 +08:00
YunaiV
ba18788517 【代码优化】SYSTEM:微信小程序的订阅 2024-07-31 19:48:02 +08:00
芋道源码
1f65dd2ec9
!1027 【新增】MALL:拼团结果通知订阅消息
Merge pull request !1027 from puhui999/develop
2024-07-31 11:38:44 +00:00
puhui999
b678da810e 【新增】MALL:拼团结果通知订阅消息 2024-07-31 16:26:08 +08:00
芋道源码
e860314b20
!1025 【代码优化】SYSTEM:订阅消息跳转小程序类型
Merge pull request !1025 from puhui999/develop
2024-07-31 05:45:14 +00: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
芋道源码
9058c152d8
!1024 【新增】MALL: 订单发货订阅消息、钱包退款订阅消息
Merge pull request !1024 from puhui999/develop
2024-07-30 14:30:49 +00:00
puhui999
0cca6be63a 【新增】MALL: 订单发货订阅消息 2024-07-30 16:55:58 +08:00
puhui999
5307852fb2 【优化】SYSTEM: 小程序订阅模版获取增加缓存 2024-07-30 16:05:25 +08:00
puhui999
4c846ef4ce 【新增】MALL: 新增退款订阅消息发送 2024-07-30 15:40:21 +08:00
YunaiV
a9862b798d 【代码评审】SYSTEM:微信小程序的订阅 2024-07-30 12:57:32 +08:00
芋道源码
3be6ee271b
!1023 【优化】SYSTEM: 根据代码评审优化订阅消息
Merge pull request !1023 from puhui999/develop
2024-07-30 04:44:00 +00:00