huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,466 Commits 1 Branch 0 Tags 176 MiB
0d49691aa0
Commit Graph

895 Commits

Author SHA1 Message Date
zhijiantianya@gmail.com
7e6b084f77 Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-15 21:02:22 +08:00
YunaiV
5e6e02e4f4 vo 简化：使用 BeanUtils 替代 mapstruct 转换 2023-11-15 09:19:51 +08:00
YunaiV
ddb5bce0a2 vo 简化：post 重构 2023-11-14 22:37:46 +08:00
YunaiV
06649624e5 代码生成：支持设置主子表的信息 2023-11-14 12:57:55 +08:00
YunaiV
256c560d43 代码生成：增加主子表的示例 2023-11-12 22:33:18 +08:00
YunaiV
055eb350aa 代码生成：简化现有 crud 模版的各种 pretty 相关的判断，交给 Java 代码后置统一处理。 2023-11-11 12:56:58 +08:00
YunaiV
01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-08 22:29:31 +08:00
zhijiantianya@gmail.com
2f6456e2b0 代码生成器：主子表，支持多个从字段 50% 2023-11-08 21:00:34 +08:00
YunaiV
2afc2caf1d 代码生成：主子表的部分实现 2023-11-08 09:42:16 +08:00
YunaiV
9762a2a7c3 优化：默认只引入 mysql driver，减少打包大小 2023-11-06 21:17:27 +08:00
YunaiV
c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
YunaiV
787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.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/service/social/SocialUserService.java
 2023-11-04 20:48:27 +08:00
owen
bdfb5b8894 营销：装修页面适配 2023-11-03 09:18:04 +08:00
YunaiV
c886e7eff2 mq：增加 Rabbitmq 教程内容 2023-11-02 20:18:45 +08:00
YunaiV
20725e3dfd mq：增加 rabbitmq 配置项 2023-11-02 08:22:05 +08:00
YunaiV
b8d5a665be mq：增加 rocketmq 配置项 2023-11-02 00:07:38 +08:00
YunaiV
e1c34e9124 mq：优化 redis stream 的命名 2023-11-01 22:46:02 +08:00
zhijiantianya@gmail.com
f8ed0e15f0 mq：增加 kafka、rocketmq、rabbitmq 的实现支持 2023-11-01 19:58:56 +08:00
YunaiV
c066ea46f9 mq 重构：默认的 redis 实现： 
1）默认 channel 和 stream key
2）移除 enabled 开关，通过 listener 是否存在来实现
3）调整包名，为接入 rocketmq 作为 mq 实现做准备
 2023-10-30 21:15:22 +08:00
jason
ccccd9f226 转账 - 转账代码修改，新增转账示例 2023-10-29 23:36:06 +08:00
jason
5f29399cf4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-25 23:42:25 +08:00
jason
626bd0bd55 转账 - code review 修改 2023-10-25 23:41:59 +08:00
YunaiV
52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
 2023-10-24 19:09:01 +08:00
YunaiV
dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
YunaiV
d9a5ef3321 统一 boot 和 cloud 代码 2023-10-24 13:58:35 +08:00
jason
86598dd177 转账 - 动态收款人字段修改 2023-10-24 08:44:30 +08:00
puhui999
6723cae781 营销活动：完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV
d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-22 08:25:27 +08:00
YunaiV
9697aee898 code review：钱包的逻辑 2023-10-21 21:17:49 +08:00
YunaiV
3bb3e4caf6 code review：工作流的加减签 2023-10-21 21:04:20 +08:00
kehaiyou
aca65a66b5 feat: 【工作流】--加减签review修改 2023-10-21 18:16:21 +08:00
jason
db0fbf0596 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-20 23:22:16 +08:00
jason
183206e2d3 转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式 2023-10-20 23:20:47 +08:00
芋道源码
8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2023-10-19 15:59:00 +00:00
zhijiantianya@gmail.com
00e18a480f code review：钱包、充值、转账的实现 2023-10-18 18:39:05 +08:00
owen
0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
 2023-10-17 23:29:11 +08:00
owen
0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
zhijiantianya@gmail.com
4b0333f3e9 code review：订单统计 2023-10-17 20:42:22 +08:00
zhijiantianya@gmail.com
0af205ede1 Merge remote-tracking branch 'origin/master' 2023-10-17 18:49:59 +08:00
owen
6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
owen
76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2023-10-16 15:06:59 +08:00
YunaiV
1ac2f2b5c2 code review：会员统计 2023-10-14 01:26:06 +08:00
YunaiV
7a9dbfe41d Merge remote-tracking branch 'origin/master' 2023-10-12 21:59:04 +08:00
owen
4be709b815 统计：Review修改 2023-10-11 15:26:17 +08:00
YunaiV
fef808d88c code review：统计代码 2023-10-11 12:32:28 +08:00
YunaiV
704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-11 11:30:03 +08:00
puhui999
bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2023-10-10 15:30:58 +08:00
youkehai
bc781d9473 fix: 【工作流】按 review 修改代码 2023-10-10 10:46:16 +08:00
owen
74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-09 23:33:51 +08:00
owen
df16278a03 统计：会员统计 2023-10-09 23:27:10 +08:00