707 Commits (418ae829daebdda91aef67174a9847b1a4b65005)

Author SHA1 Message Date
YunaiV b06a21f9af mall + pay:
1. 实现 WxNativePayClient 的支付功能
3 years ago
YunaiV e31b40eefa mall + pay:
1. 实现 WxBarPayClient 的支付功能
3 years ago
YunaiV 4014137a4c mall + pay:调整异常的处理
1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。
3 years ago
YunaiV efb221b1fe mall + pay:调整异常的处理
1. 如果是业务异常,则统一转换成 ServiceException
2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常
3 years ago
YunaiV d76bc7aa82 mall + pay:
1、初步完成微信扫码支付,暂时缺少状态的处理
3 years ago
YunaiV 3f33ca2d6b mall + pay:
1、增加获得支付渠道接口
3 years ago
YunaiV d224b6b9be mall + pay:
1、调整微信 Lite 小程序支付的实现
3 years ago
YunaiV cbc61184bd mall + pay:
1、优化微信公众号 MP 支付的实现
3 years ago
YunaiV 67d60e32f8 mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
3 years ago
YunaiV 20eb0a2a88 mall + pay:
1、调整 returnUrl 的实现
3 years ago
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 3 years ago
xingyu 3e9768374b chore: up justauth 1.0.1 captcha-plus 1.0.5 3 years ago
xingyu 7ad3b6ad2b chore: use com.xingyuv.justauth 3 years ago
xingyu c1782c432f chore: up deps version 3 years ago
YunaiV b582206003 mall + promotion:review 页面装修 3 years ago
jason ad1f656dfa 页面装修修改,后端只负责存取 3 years ago
YunaiV 1dfbe45913 mall + order:review 售后日志 3 years ago
YunaiV 07884ef423 Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
3 years ago
jason 6b1d996b66 页面装修数据结构定义 3 years ago
chenchen 2f0aaee823 售后日志优化 3 years ago
chenchen a93b9a616f 售后日志优化 3 years ago
chenchen 7d0e9ea762 fix 依赖启动问题 3 years ago
YunaiV 60b24e36d5 code review:售后日志逻辑 3 years ago
陈賝 59e16795be !514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
3 years ago
YunaiV ecfe0b864b 优化 RedisPendingMessageResendJob 代码排版,以及注释 3 years ago
芋道源码 a978c99617
!480 解决RedisPendingMessageResendJob 任务可能会导致消息重复的问题
Merge pull request !480 from 天气真好/redis-stream-mq
3 years ago
YunaiV 16dd86a8db 498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题 3 years ago
芋道源码 09776a73b5
!511 fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
Merge pull request !511 from Syriana_Zh/N/A
3 years ago
YunaiV 749fe9d515 回退验证码到 1.0.2 3 years ago
YunaiV 8ec3733882 mall + trade:mock 拼团记录列表的接口 3 years ago
xingyu b892a6d2bd feat: captcha-plus 1.0.4 3 years ago
xingyu 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
3 years ago
Syriana钟亨 df6d63068d
fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
Signed-off-by: Syriana钟亨 <4916681+sairupe@user.noreply.gitee.com>
3 years ago
YunaiV dcb1660880 mall + trade:code review 快递计算逻辑 3 years ago
jason 644d976a78 快递100 快递查询实现 3 years ago
jason 45e5578cb4 快递查询、 通过快递鸟查询实现 3 years ago
YunaiV 4f5ac0edbb mall + promotion:增加营销活动的 mock 接口 3 years ago
YunaiV f75f4e8846 mall + product:完善商品详情接口 3 years ago
YunaiV 0631c51d93 mall + trade:review 配置管理列表 3 years ago
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 3 years ago
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 3 years ago
wfm 4faf61a475 增加日志 3 years ago
wfm 86be0bdf80 fix PR 3 years ago
芋道源码 12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性
Merge pull request !469 from xingyu/fix/vue3_codegen
3 years ago
芋道源码 61220cf44e
!471 修复两处错误
Merge pull request !471 from Rundeepin/master
3 years ago
芋道源码 5dab4ae2e2
!479 StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加...
Merge pull request !479 from 重楼/jjjjjjjj/dev
3 years ago
wfm 494928ed88 feat:重放消息判断过期时间 3 years ago
jian.li e4a5a5672f StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加... 3 years ago
LiuZijian 8ec0be01a8 新增:达梦数据库驱动,KeyGenerator 3 years ago
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV da162853ec 商城:完善购物车的逻辑 3 years ago
崔家辉 1e3380d0a3 修复包名路径错误 3 years ago
YunaiV 91f63ff813 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 3 years ago
YunaiV 8ce8f4e3a8 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 3 years ago
YunaiV e5fcc7a387 boot3:适合 ServletUtils 3 years ago
YunaiV fdea0ae0ea 优化请求头的 tenant-id 的解析逻辑,避免前端传错类型 3 years ago
YunaiV d2ba90db5d 修复单元测试报错 3 years ago
xingyuv e3d74b1713 chore: 升级最新依赖 3 years ago
YunaiV 5c0161d762 修复租户名的重复问题 3 years ago
芋道源码 aa16b8279f
!446 配合周建进行测试所提bug的后端修改
Merge pull request !446 from clockdotnet/master_pr
3 years ago
zhangxingjia bc6eaea2b4 fix xss请求Wrapper getAttribute方法 问题修复 3 years ago
shizhong 2b1e5f1a3a 解决登录时输入无效租户名称登录失败提示不友好问题,还原修改 3 years ago
YunaiV 09afdaafcf !24 【轻量级 PR】:PasswordEncoder 加密复杂度自定义 3 years ago
YunaiV b9ba17a477 !31 IP查询导致异常问题 3 years ago
芋道源码 bb0110656b
!440 test: job 租户单元测试
Merge pull request !440 from 与或非/test/tenant-job
3 years ago
冰是睡着的水 fbbd3bc66c
优化大陆手机号验证。以19013896321为例,原来的正则匹配结果为false。
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
3 years ago
shizhong 8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 3 years ago
shizhong 37fcc5cbe7 解决登录时输入无效租户名称登录失败提示不友好问题 3 years ago
gaibu 348a0ff02a test: 修复 code view 存在的问题 3 years ago
gaibu b54c5eaa45 test: job 租户单元测试 3 years ago
YunaiV 467170d3de Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 3 years ago
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 3 years ago
wangzhs 95159b0257 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 3 years ago
wangzhs 7e0fb6cb56 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 3 years ago
YunaiV ef510f9478 增加 mybatis plus join 集成的修改建议 3 years ago
wangzhs 670f67e551 新增 mybatis-plus-join 3 years ago
Xuing eed3d8b18d
修复ContextHolder的NPE异常 3 years ago
芋道源码 a31887568a
!422 feat: 修改错误注释
Merge pull request !422 from 与或非/feat/20230224
3 years ago
zhangxingjia 911040492e fix: 去掉Swagger自动配置类中的冗余配置 3 years ago
gaibu 2083fb7846 test: 修改 code review 3 years ago
gaibu e5957f9133 test: 字典数据模块单元测试 3 years ago
gaibu 5d6e2725a8 feat: 修改错误注释 3 years ago
芋道源码 c419c1e107
!417 支付收银台,接入支付宝的 PC、Wap、二维码、条码、App 等支付方式
Merge pull request !417 from 芋道源码/feature/dev-yunai
3 years ago
YunaiV 14893c4cff pay: 优化回调的逻辑 3 years ago
YunaiV 4390e28eea pay: 新增支付宝 App 支付的接入 3 years ago
YunaiV 2093c3bdb5 pay: 重构支付客户端,移除 PayCommonResult 累 3 years ago
YunaiV 8e1be01451 pay: 增加支付宝的条形码支付的配置 3 years ago
YunaiV 379aeeae16 pay: 接入支付宝 App 支付 3 years ago
YunaiV e6f414b918 pay: 接入支付宝 Wap 支付 3 years ago
YunaiV ce8571e313 pay: 接入支付宝 PC 支付的表单 3 years ago
YunaiV b34801f303 pay: 接入支付宝 PC 支付的跳转模式 3 years ago
YunaiV df702e8d24 pay: 临时性的提交,准备 client 部分的重构 3 years ago
筱龙缘 edc52d5f4f
修复 Redis Pub/Sub 广播消费的容器 默认未启动的问题
默认配置没有启动Redis Pub/Sub 广播消费的容器 导致发出消息后 消费者收不到消息

Signed-off-by: 筱龙缘 <794334212@qq.com>
3 years ago
YunaiV fb45a70bce 集成 Go-View 大屏设计器 3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
yuanhang c3836ca98b 解决操作日志记录报错的问题
javax.validation.ConstraintViolationException: createOperateLog.arg0.name: 操作名
3 years ago
YunaiV 53767614fe 增加商城的提示 3 years ago
YunaiV c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
3 years ago
YunaiV 837345ed95 system:将 api 的方法名的负数都换成 List 3 years ago