kehaiyou
|
9537669d01
|
fix: 去除无用行
|
2023-11-05 20:14:21 +08:00 |
|
kehaiyou
|
ca184026cf
|
feat: 创建流程实例时，提前指派审批人
|
2023-11-05 14:21:37 +08:00 |
|
kehaiyou
|
b400aaac36
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-05 13:26:38 +08:00 |
|
YunaiV
|
1eff9822ce
|
同步最新 master 代码
|
2023-11-04 20:52:37 +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 |
|
YunaiV
|
f9e64a9f0a
|
同步最新 SQL
|
2023-11-04 20:43:18 +08:00 |
|
YunaiV
|
87bc3f510c
|
优化：社交登录、用户的管理
|
2023-11-04 14:37:36 +08:00 |
|
YunaiV
|
e9317bf293
|
Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
|
2023-11-04 12:03:54 +08:00 |
|
芋道源码
|
01641cd1be
|
!696 新增社交客户端 CRUD,新增社交用户 RUD
Merge pull request !696 from puhui999/feature/mall_product_tmp
|
2023-11-04 04:00:12 +00:00 |
|
芋道源码
|
20b11092c2
|
!712 商城装修
Merge pull request !712 from 疯狂的世界/feature/mall_product
|
2023-11-03 11:04:53 +00:00 |
|
owen
|
bdfb5b8894
|
营销：装修页面适配
|
2023-11-03 09:18:04 +08:00 |
|
jason
|
cf114409b0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-11-03 08:43:40 +08:00 |
|
jason
|
f4d600398c
|
转账 - 管理后台增加转账单查询
|
2023-11-03 08:43:21 +08:00 |
|
owen
|
9996608da6
|
营销：装修模板APP接口
|
2023-11-03 06:38:49 +08:00 |
|
芋道源码
|
497d826ac4
|
!711 增加 RocketMQ、Kafka、RabbitMQ 消息队列的支持
Merge pull request !711 from 芋道源码/feature/mq-optimize
|
2023-11-02 12:53:26 +00:00 |
|
YunaiV
|
c886e7eff2
|
mq：增加 Rabbitmq 教程内容
|
2023-11-02 20:18:45 +08:00 |
|
YunaiV
|
456b0c8ddd
|
mq：增加 kafka 配置项
|
2023-11-02 12:25:50 +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 |
|
芋道源码
|
bee4b761ec
|
!709 营销：完善商城装修
Merge pull request !709 from 疯狂的世界/feature/mall_product
|
2023-11-01 00:47:06 +00:00 |
|
owen
|
32499be98f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2023-10-31 16:01:23 +08:00 |
|
YunaiV
|
c066ea46f9
|
mq 重构：默认的 redis 实现：
1）默认 channel 和 stream key
2）移除 enabled 开关，通过 listener 是否存在来实现
3）调整包名，为接入 rocketmq 作为 mq 实现做准备
|
2023-10-30 21:15:22 +08:00 |
|
芋道源码
|
df8a81f658
|
!705 修复 vben 代码生成错误
Merge pull request !705 from xingyu/fix/vben_codegen
|
2023-10-30 12:08:54 +00:00 |
|
xingyu
|
7767a8f837
|
chore: up mybatis-plus-join 1.4.7
|
2023-10-30 18:17:17 +08:00 |
|
xingyu
|
5bfb8098d6
|
fix: vben codegen
|
2023-10-30 18:15:22 +08:00 |
|
YunaiV
|
d048daf7d6
|
mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖
|
2023-10-30 12:53:54 +08:00 |
|
jason
|
48b1c19f28
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-29 23:36:26 +08:00 |
|
jason
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2023-10-29 23:36:06 +08:00 |
|
芋道源码
|
1d3ef770a0
|
!703 商城装修
Merge pull request !703 from 疯狂的世界/feature/mall_diy
|
2023-10-29 14:15:55 +00:00 |
|
owen
|
b5f9ed9edf
|
营销：装修SQL调整
|
2023-10-29 22:04:21 +08:00 |
|
芋道源码
|
87fb47ca6a
|
!698 fix: 修复PayWalletRechargeCerate参数校验
Merge pull request !698 from JaysonAlbert/fix/validate-pay-wallet
|
2023-10-29 13:07:18 +00:00 |
|
owen
|
c637a172ec
|
营销：装修代码整理
|
2023-10-29 18:50:55 +08:00 |
|
Jayson Albert
|
f4ea648ac9
|
fix: 修复PayWalletRechargeCerate参数校验
|
2023-10-28 19:45:06 +08:00 |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2023-10-27 14:58:04 +08:00 |
|
puhui999
|
8552e86d8a
|
完善三方登录
|
2023-10-26 17:03:26 +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 |
|
puhui999
|
12ae5bf128
|
新增社交用户 RUD
|
2023-10-25 16:57:13 +08:00 |
|
puhui999
|
738fcef453
|
新增社交客户端 CRUD
|
2023-10-25 16:07:17 +08:00 |
|
puhui999
|
eb4b719b4b
|
添加社交客户端测试 sql
|
2023-10-25 15:09:34 +08:00 |
|
YunaiV
|
126dc610b1
|
1.8.3 版本发布
|
2023-10-24 23:14:14 +08:00 |
|
YunaiV
|
3fdc132c17
|
1.8.3 版本发布
|
2023-10-24 20:53:37 +08:00 |
|
YunaiV
|
3a9ac56f96
|
修复 banner 返回字段不对
|
2023-10-24 20:29:15 +08:00 |
|
YunaiV
|
c11300d33a
|
解决启动问题
|
2023-10-24 19:54:49 +08:00 |
|
YunaiV
|
a4aa1fac0b
|
Merge branch 'feature/v2.7.17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-10-24 19:13:09 +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
|
07dbfc5546
|
code review：sign 签到逻辑
|
2023-10-24 19:08:08 +08:00 |
|
芋道源码
|
c7695def5e
|
!694 完善 review 提到的问题，商品模块移除对营销模块的依赖
Merge pull request !694 from puhui999/feature/mall_product
|
2023-10-24 10:49:13 +00:00 |
|