YunaiV
|
075157417c
|
清理代码：无用的 test-integration 目录，暂时不考虑集成测试
|
2024-04-22 21:00:02 +08:00 |
|
YunaiV
|
a27c040a8f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
|
2024-04-22 19:56:17 +08:00 |
|
YunaiV
|
9a31613e5b
|
【移除】敏感词的管理，简化项目的复杂度
|
2024-04-22 19:53:01 +08:00 |
|
YunaiV
|
8093ef3b96
|
【移除】错误码的管理，简化项目的复杂度
|
2024-04-22 19:42:45 +08:00 |
|
YunaiV
|
e859b76231
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
|
2024-04-22 19:14:27 +08:00 |
|
YunaiV
|
ff5276998c
|
【移除】数据库文档，简化项目的复杂度
|
2024-04-22 19:14:10 +08:00 |
|
YunaiV
|
248e0b5e46
|
Merge remote-tracking branch 'origin/master'
|
2024-04-22 19:08:31 +08:00 |
|
YunaiV
|
24dacacf15
|
优化：将 hutool-all 6.0 版本替换成 hutool-extra，减少依赖
|
2024-04-22 19:08:25 +08:00 |
|
YunaiV
|
6c3f88bacd
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2024-04-22 19:02:13 +08:00 |
|
YunaiV
|
5d58037d05
|
优化：将 hutool-all 6.0 版本替换成 hutool-extra，减少依赖
|
2024-04-22 19:01:25 +08:00 |
|
scholar
|
9e6474a123
|
1，优化mapper.xml的sql语句；
2，对于无销售数据的月份，插入销售结果为0的数据；
|
2024-04-19 17:09:12 +08:00 |
|
YunaiV
|
1274f92544
|
优化 job 调度：
1. 新增或修改 job 配置时，校验 handlerName 对应的 Spring Bean 存在
2. 删除 job 时，额外暂停 Trigger、取消调度，更完善
|
2024-04-18 22:19:26 +08:00 |
|
芋道源码
|
488c46073b
|
!947 fix: selectCustomerDealCycleGroupByProductId使用LEFT JOIN替换子查询
Merge pull request !947 from dhb52/develop
|
2024-04-18 01:22:41 +00:00 |
|
YunaiV
|
b20ff55511
|
code review：销售统计
|
2024-04-18 09:19:07 +08:00 |
|
芋道源码
|
cc82e471ea
|
!949 CRM: 新增商机赢单转化率分析
Merge pull request !949 from puhui999/develop
|
2024-04-18 01:13:18 +00:00 |
|
YunaiV
|
222afd48af
|
修改 rabbitmq 序列化方式，使用 Jackson2JsonMessageConverter 替代
|
2024-04-17 21:29:04 +08:00 |
|
YunaiV
|
98743db480
|
解决 rocketmq 在 spring boot 3.x 的兼容性
|
2024-04-17 21:29:04 +08:00 |
|
YunaiV
|
b5af357dfc
|
同步最新的 bugfix
|
2024-04-17 21:29:04 +08:00 |
|
YunaiV
|
1d239c9877
|
修改 rabbitmq 序列化方式，使用 Jackson2JsonMessageConverter 替代
|
2024-04-16 09:17:11 +08:00 |
|
puhui999
|
bb25f0712b
|
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
|
2024-04-15 16:40:51 +08:00 |
|
puhui999
|
c573585e75
|
CRM: 新增商机赢单转化率分析
|
2024-04-15 16:40:36 +08:00 |
|
puhui999
|
5cf34c2ba7
|
CRM: 完善销售漏斗
|
2024-04-15 15:26:05 +08:00 |
|
YunaiV
|
bf70707719
|
解决 rocketmq 在 spring boot 3.x 的兼容性
|
2024-04-15 12:34:06 +08:00 |
|
YunaiV
|
2a40678ff8
|
同步最新的 bugfix
|
2024-04-14 22:09:11 +08:00 |
|
芋道源码
|
1f93ac25b6
|
!933 修正 swagger 文档错误
Merge pull request !933 from moon69/master
|
2024-04-14 14:03:57 +00:00 |
|
芋道源码
|
7f8d3b31d8
|
!939 updateCommentVisible 应该用前端传入的显示值
Merge pull request !939 from 云扬四海/fix_comment_bug
|
2024-04-14 13:58:26 +00:00 |
|
芋道源码
|
ddf25d24a9
|
!945 bugfix：修复获取登录用户的权限信息接口在没有授权角色时，没有菜单列表导致报错的问题
Merge pull request !945 from a472159403/bug_getMenuList
|
2024-04-14 13:57:30 +00:00 |
|
dhb52
|
488f99b512
|
fix: selectCustomerDealCycleGroupByProductId使用LEFT JOIN替换子查询
|
2024-04-14 21:55:45 +08:00 |
|
芋道源码
|
002e5a4b25
|
!938 修复创建跟进记录bug
Merge pull request !938 from dftba_effy/master
|
2024-04-14 13:55:26 +00:00 |
|
YunaiV
|
ed5f3a6bc2
|
crm：code review 销售漏斗
|
2024-04-14 21:22:02 +08:00 |
|
芋道源码
|
0eff2ae602
|
!946 CRM: 完善销售漏斗分析
Merge pull request !946 from puhui999/develop
|
2024-04-14 12:23:49 +00:00 |
|
YunaiV
|
5159da30b4
|
crm：code review 员工客户分析
|
2024-04-14 20:13:31 +08:00 |
|
芋道源码
|
0d1e2c604d
|
!944 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !944 from dhb52/develop
|
2024-04-14 10:31:21 +00:00 |
|
puhui999
|
20b4bfd1b0
|
CRM: 完善新增商机分析
|
2024-04-14 16:31:53 +08:00 |
|
puhui999
|
fc3cdc4499
|
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
|
2024-04-14 13:12:05 +08:00 |
|
lihaiyang
|
85cd07aa87
|
bugfix：修复获取登录用户的权限信息接口在没有授权角色时，没有菜单列表导致报错的问题
|
2024-04-13 23:30:34 +08:00 |
|
puhui999
|
6c9a3b0e11
|
CRM: 完善销售漏斗分析
|
2024-04-13 23:30:11 +08:00 |
|
dhb52
|
67b02c7e5b
|
feat: 客户成交周期分析(按区域、按产品)
|
2024-04-12 22:15:24 +08:00 |
|
YunaiV
|
8e86706d50
|
同步 develop 最新代码
|
2024-04-12 20:31:33 +08:00 |
|
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2024-04-12 19:18:30 +08:00 |
|
YunaiV
|
62c6c4b9bd
|
同步 develop 最新代码
|
2024-04-12 19:17:49 +08:00 |
|
YunaiV
|
9cba258d8f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2024-04-12 19:14:56 +08:00 |
|
芋道源码
|
2038e5204a
|
!943 回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
Merge pull request !943 from 芋道源码/revert-merge-937-develop
|
2024-04-12 11:13:59 +00:00 |
|
芋道源码
|
48aef10d2d
|
回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
|
2024-04-12 11:13:11 +00:00 |
|
芋道源码
|
decdfb2aa7
|
!937 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !937 from dhb52/develop
|
2024-04-12 11:11:30 +00:00 |
|
YunaiV
|
048c6ed7b9
|
移除 resilience4j 组件
|
2024-04-11 22:53:05 +08:00 |
|
YunaiV
|
1904f8ca88
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-11 22:52:53 +08:00 |
|
YunaiV
|
1e348dbf83
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2024-04-11 22:52:34 +08:00 |
|
YunaiV
|
ceaf192bf2
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
|
2024-04-11 22:45:07 +08:00 |
|
YunaiV
|
cc50891632
|
【新增】RateLimiter 限流器，支持全局、用户、IP 等级别的限流
|
2024-04-11 22:43:37 +08:00 |
|