p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,236 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

8236 Commits

Author SHA1 Message Date
YunaiV e46163cba7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-11-09 18:38:24 +08:00
YunaiV 0bbc682ba4 【代码优化】infra：s3 minio sdk 替换为 aws sdk 2024-11-09 18:33:52 +08:00
YunaiV e1ffb2e911 Merge branch 'master-jdk17-updateS3ToAws' of https://gitee.com/radio-devil/ruoyi-vue-pro into master-jdk17 2024-11-09 15:39:42 +08:00
芋道源码 717549691a
!1119 【修复】错误日志表中user_id字段类型不匹配 
Merge pull request !1119 from 杨宇庆/N/A
 2024-11-09 07:32:32 +00:00
芋道源码 b93199bd0a
!1124 【修复】修复会员取消售后接口中未校验用户ID的漏洞 
Merge pull request !1124 from 杨宇庆/N/A
 2024-11-09 07:29:00 +00:00
YunaiV 14dc2e3849 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2024-11-09 15:11:28 +08:00
芋道源码 9f4e94deb1
Merge pull request #694 from shanaiardor/fix/tenantjob-aspect-voidretuenfail 
修复由于多租户定时任务方法返回 void 导致的 xxlJob 任务执行失败的问题
 2024-11-09 15:10:58 +08:00
杨宇庆 c776371d48
【修复】修复会员取消退款接口中未校验用户ID的漏洞 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-11-06 15:21:25 +00:00
wct 72d2d81d6a 修复由于多租户定时任务方法返回 void 导致的执行 xxlJob 执行失败的问题 2024-11-06 17:32:35 +08:00
杨宇庆 00c2205442
【修复】错误日志表中user_id字段类型不匹配 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-11-04 17:21:38 +00:00
segerts ad00fbc566 S3 minio sdk 替换为 aws sdk 2024-11-03 19:28:23 +08:00
YunaiV d97ba8d4d8 【缺陷修复】商城：活动的库存校验，从 > 改成 >= 2024-11-01 21:22:23 +08:00
YunaiV cd2c6d29c4 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-10-28 09:15:13 +08:00
gaibu 3fb1215104 bugfix: sql 文件路径指定错误 2024-10-27 22:55:34 +08:00
YunaiV 8d4cc35cde 【缺陷修复】商城：优惠劵在不限制时，无法发送的问题 2024-10-27 20:33:49 +08:00
YunaiV b1ad2f8176 【缺陷修复】商城：拼团取消已支付的订单时，缺少 ip 和状态检查不正确 2024-10-27 20:00:00 +08:00
YunaiV ac50b4b11c 148 fix：商城系统->营销中心->优惠活动->限时折扣，折扣百分比按正常折扣（比如说90%）填写时，后端报错“折扣百分比需要大于等于 1，小于等于 99” 2024-10-27 17:36:45 +08:00
YunaiV c6f67a5a02 !1112【代码优化】支付：微信支付退款时，日志记录发起微信支付异常信息 2024-10-27 15:16:35 +08:00
芋道源码 1753f2d1e4
!1112 【优化】日志记录发起微信支付异常信息 
Merge pull request !1112 from 杨宇庆/N/A
 2024-10-27 07:15:08 +00:00
YunaiV 8e4ba25e84 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java
 2024-10-27 15:14:38 +08:00
YunaiV e6770399e6 Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2024-10-27 15:14:24 +08:00
YunaiV cf1b41741e !1108【代码优化】排序：字段驼峰改为下划线 2024-10-27 15:14:18 +08:00
芋道源码 a57396aa4c
!1108 【代码优化】排序：字段驼峰改为下划线 
Merge pull request !1108 from jinmh/master
 2024-10-27 07:11:27 +00:00
芋道源码 e7f779225e
!1107 【修复】修复当不存在优惠价格时，商城却显示优惠价格 
Merge pull request !1107 from 杨宇庆/N/A
 2024-10-27 07:09:02 +00:00
芋道源码 5bf6361ebd
!1106 【Bug修复】修复滑动脱敏处理器禁用脱敏的判断 
Merge pull request !1106 from Asa/master-jdk17
 2024-10-27 07:07:02 +00:00
芋道源码 8aaa96c887
Merge pull request #680 from sfiloveyou/master-jdk17 
postgresql数据库建表sql文件添加相关AI功能的菜单
 2024-10-27 15:04:23 +08:00
shifeng 14e3ca8ef0 postgresql数据库建表sql文件添加相关AI功能的菜单 2024-10-25 10:26:35 +08:00
杨宇庆 c3e1374b1e
【优化】日志记录发起微信支付异常信息 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-10-23 09:02:41 +00:00
jinmh716 454370f3ed 【代码优化】排序：字段驼峰改为下划线 2024-10-17 20:19:56 +08:00
杨宇庆 922aa0678d
【修复】修复当不存在优惠价格时，商城却显示优惠价格 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-10-16 16:32:50 +00:00
张杰 88f1af6d2e fix: 修复滑动脱敏处理器禁用脱敏的判断 2024-10-16 20:26:11 +08:00
YunaiV d08cc2f533 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderRespDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundRespDTO.java
 2024-10-13 17:11:18 +08:00
YunaiV 7fbdf24bca 1103 【轻量级 PR】：【优化】补全退款订单字段 2024-10-13 17:10:45 +08:00
芋道源码 1b925cf221
!1103 【优化】补全退款订单字段 
Merge pull request !1103 from 杨宇庆/N/A
 2024-10-13 09:10:36 +00:00
芋道源码 90eee556bb
!1102 【修复】补全微信Wap网站支付的字典数据 
Merge pull request !1102 from 杨宇庆/N/A
 2024-10-13 09:08:43 +00:00
YunaiV 1afdd04543 【依赖降级】weixin-java from 4.6.5B to 4.6.0，避免 privateCertPath 报错 2024-10-13 17:02:05 +08:00
YunaiV 46a0d4f6af Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java
 2024-10-13 17:00:43 +08:00
YunaiV 9ad95223d1 【依赖降级】weixin-java from 4.6.5B to 4.6.0，避免 privateCertPath 报错 2024-10-13 17:00:14 +08:00
YunaiV 6e7db6ebd0 !144 【代码修复】商城订单的支付回调接口添加@PermitAll和部分DO缺少@KeySequence问题 2024-10-12 20:38:22 +08:00
YunaiV 7e3f92c3a3 【优化】忽略多租户的表，兼容表名带有包裹符号的情况 2024-10-12 19:55:13 +08:00
芋道源码 a269950d7d
!1101 【优化】忽略多租户的表，兼容表名带有包裹符号的情况 
Merge pull request !1101 from zoemak/master
 2024-10-12 11:53:25 +00:00
YunaiV 6f7fe84c41 【修复】AI 模块：Midjourney notify 时，缺少租户的忽略 2024-10-12 19:47:18 +08:00
杨宇庆 e249123d73
【优化】补全退款订单字段 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-10-10 16:27:16 +00:00
杨宇庆 7ec34fd885
【修复】补全微信Wap网站支付的字典数据 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-10-10 13:40:32 +00:00
zoemak acc20af6ad
【优化】忽略多租户的表，兼容表名带有包裹符号的情况 
利用SqlParserUtils.removeWrapperSymbol(tableName)去掉表名前后的引用符号，比如MySQL的反引号或者SQLServer的中括号

Signed-off-by: zoemak <58775+zoemak@user.noreply.gitee.com>
 2024-10-10 08:40:10 +00:00
YunaiV 15a3d139ed V2.3.0 版本发布~ 2024-10-07 16:06:41 +08:00
YunaiV 09cb9e114d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-10-07 16:06:04 +08:00
YunaiV 8da00083d8 V2.3.0 版本发布~ 2024-10-07 16:03:05 +08:00
YunaiV daa1de2d19 【同步】jdk21 和 jdk8 的代码 2024-10-07 16:00:20 +08:00
YunaiV e163bdf634 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/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeSeckillActivityPriceCalculator.java
 2024-10-07 15:57:56 +08:00