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

1027 Commits

Author SHA1 Message Date
YunaiV 023a7b14d8 ✨ 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
kyle 5ae1d0ab3e fix: 修复3处问题 
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题，导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
 2024-01-16 11:09:02 +08:00
YunaiV d58da7b2b0 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/90/files pr 2024-01-13 21:08:52 +08:00
YunaiV e79c750b46 📖 CRM：code review 跟进记录的实现 2024-01-13 09:56:53 +08:00
YunaiV d80406acbb Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
 2024-01-13 09:23:56 +08:00
YunaiV f6c8159dac ✨ MALL：简化 SPU 的 VO 转化 2024-01-12 22:48:58 +08:00
puhui999 9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2024-01-10 11:29:29 +08:00
YunaiV 2d1e57554d 📖 CRM：code review CRM 客户逻辑 2024-01-07 22:07:17 +08:00
芋道源码 3c7f63c356
!810 fix：修复 issues 提到的一些公众号上的问题 
Merge pull request !810 from puhui999/develop
 2024-01-07 13:23:53 +00:00
YunaiV bbba83ef61 📖 MALL：code review 商品统计的代码 2024-01-07 16:23:02 +08:00
YunaiV eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
 2024-01-06 21:52:10 +08:00
puhui999 68f5edaa88 CRM-客户: 完善一些 TODO 2024-01-06 15:28:10 +08:00
puhui999 ea4b4b8956 CRM-客户：精简 VO 2024-01-05 00:15:26 +08:00
YunaiV 8c9b483ac5 📖 code review 操作日志的实现 2023-12-30 21:36:46 +08:00
芋道源码 9c3cf1d6b6
!806 操作日志：完善 code review 提到的问题 
Merge pull request !806 from puhui999/develop
 2023-12-30 12:14:40 +00:00
YunaiV 290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-12-30 20:11:07 +08:00
YunaiV 2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 2023-12-30 12:01:12 +08:00
YunaiV 51968c4c19 🐛 腾讯云上传 bug 2023-12-30 11:23:59 +08:00
YunaiV 9a03f1a796 🐛 BPM：多租户的工作流隔离 2023-12-30 09:38:01 +08:00
YunaiV 475e932aec 🐛 导出 Excel:Long 类型 ID 会丢失精度 2023-12-29 21:45:43 +08:00
YunaiV 0861372755 🐛 修复修改短信渠道缓存没有更新 2023-12-29 12:59:20 +08:00
YunaiV 829965e50a 🐛 fix(websocket): 修复 websocket 失效的问题 2023-12-29 12:54:52 +08:00
YunaiV 08ff391f78 🐛 Websocket 断开时，未删除会话缓存 bug 2023-12-29 12:48:36 +08:00
puhui999 6950368991 操作日志：完善 code review 提到的问题 2023-12-26 00:04:20 +08:00
YunaiV 5de6a8bd23 📖 code review：操作日志的实现 2023-12-25 21:40:16 +08:00
YunaiV 82a25474f6 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 08:43:38 +08:00
YunaiV 7542b6a78d ✨ Member：完善微信相关配置 2023-12-25 08:43:32 +08:00
puhui999 7286f33a7f Merge remote-tracking branch 'yudao/develop' into develop 2023-12-24 00:32:47 +08:00
puhui999 e8ade5f1fe crm：完善一些遗留的 TODO 2023-12-23 20:10:40 +08:00
YunaiV d65c28d7f7 ✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
puhui999 f56d8a2751 重构操作日志记录实现 2023-12-19 18:34:51 +08:00
puhui999 1fae341cae 重构操作日志记录实现 2023-12-19 16:29:13 +08:00
YunaiV cd45fc35ea Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2023-12-19 12:27:11 +08:00
puhui999 3bab9748db 系统操作日志：使用自定义 starter 的方式重新集成 mzt-biz-log 2023-12-19 09:20:47 +08:00
owen 5851bcb479 Merge remote-tracking branch 'origin/develop' into develop 2023-12-17 10:05:13 +08:00
owen 4a007f0c98 统计：增加商品统计 2023-12-16 23:48:10 +08:00
puhui999 63431082e5 member: 完善连续签到 review 提到的问题 2023-12-11 16:37:14 +08:00
风狗 a6a9f4e3a6
增加 东莞市下面的行政区信息 
Signed-off-by: 风狗 <909275705@qq.com>
 2023-12-11 02:47:22 +00:00
YunaiV 23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
YunaiV 10d245afc3 🐛 移除多余的 yudao-spring-boot-starter-security 依赖 2023-12-08 22:17:13 +08:00
puhui999 5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV 98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV b8f8cab699 🐛 修复 Spring Cache Redis 单冒号，而不是双 :: 冒号，避免 Redis Desktop Manager 多余空格 2023-12-07 07:36:33 +08:00
YunaiV 30fef09eee 🔧 简化 errorLog 和 accessLog 模块的 VO 2023-12-03 18:32:47 +08:00
YunaiV 2dd835893a 🔧 简化 permission 模块的 VO 2023-12-02 21:47:03 +08:00
YunaiV 8ecc8cddba 1.9.0 版本发布 2023-11-30 21:22:59 +08:00
芋道源码 fa1aa51c96
!771 同步最新的 CRM 代码 
Merge pull request !771 from 芋道源码/feature/crm
 2023-11-30 12:50:49 +00:00
YunaiV e4378e5628 修复 WxPayOrderNotifyV3Result 的重命名 2023-11-26 19:24:11 +08:00
YunaiV a1e6348a37 移除 weixin starter 组件，直接改成 wxjava starter 2023-11-26 17:08:16 +08:00
芋道源码 ee25b8aedb
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter 
Merge pull request !752 from 芋道源码/feature/justauth-op
 2023-11-26 03:42:16 +00:00
YunaiV f2ff30e465 优化 error-code 加载逻辑，失败不影响启动 2023-11-25 23:00:31 +08:00
YunaiV 6d7491fb02 !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2023-11-25 22:34:08 +08:00
YunaiV bd91276155 websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息 2023-11-25 20:44:36 +08:00
YunaiV 899e40deb9 crm：code review 数据权限的实现 2023-11-25 10:02:55 +08:00
YunaiV a597eb17d4 websocket：修复 RedisWebSocketMessageConsumer 注册失效的问题 2023-11-24 18:56:19 +08:00
YunaiV 0233b092b8 websocket：重新封装 websocket 组件，支持 sender 广播 2023-11-24 00:32:52 +08:00
YunaiV 1941a7b3e6 websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息 2023-11-22 23:17:50 +08:00
YunaiV 6a61db8508 security: query string 支持传递 token 参数，解决 ws token 认证 2023-11-22 23:02:59 +08:00
puhui999 77d7bcc73f crm-数据权限：完善数据权限 code review 提到的问题 2023-11-22 17:56:13 +08:00
YunaiV 6f135303d8 sms：移除 SmsCodeMapping + SmsCommonResult，简化短信的封装 2023-11-21 22:14:07 +08:00
YunaiV 822e441765 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter 2023-11-20 23:27:41 +08:00
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
 2023-11-19 18:39:55 +08:00
YunaiV 7f75f0abfc bpm：code review 指定审批人 2023-11-19 18:28:00 +08:00
YunaiV 6fd8d0095c Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro 2023-11-19 18:17:28 +08:00
YunaiV c7a21b2a64 mall：优化商品收藏的分页接口 2023-11-19 00:58:12 +08:00
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-11-18 21:17:11 +08:00
YunaiV 5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
 2023-11-18 20:44:06 +08:00
zhijiantianya@gmail.com 067d53ac48 代码生成器：增加单元测试，🛫 2023-11-17 19:39:32 +08:00
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
Wanwan 5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +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
niou233 cbaadc3a77 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org 2023-11-08 14:39:01 +08:00
niou233 daa7d14b09 reafactor: 会员商品收藏 2023-11-08 14:36:44 +08:00
YunaiV 2afc2caf1d 代码生成：主子表的部分实现 2023-11-08 09:42:16 +08:00
jason 4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08:00
jason 15313c2992 转账 - 增加转账定时任务 2023-11-07 23:11:07 +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
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 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 5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +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
dongshanshan 98aae5ed1a feat: 会员商品收藏 2023-10-31 16:51: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
YunaiV 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 14:25:38 +08:00
jason 5f29399cf4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-25 23:42:25 +08:00