anhaohao
|
65d7f8c4ab
|
新增:CRM 商业智能,合同金额排行榜和回款金额排行榜
|
2 years ago |
YunaiV
|
722223c659
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
|
2 years ago |
YunaiV
|
3367b4b6d4
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
YunaiV
|
35205edff9
|
✨ 全局:将 sms 融合到 system 模块里,减少 starter
|
2 years ago |
YunaiV
|
ac0b18a808
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
YunaiV
|
5acdd1554e
|
✨ 全局:将 sms 融合到 system 模块里,减少 starter
|
2 years ago |
YunaiV
|
814b6f688d
|
📖 CRM:code review 跟进记录
|
2 years ago |
芋道源码
|
f9b9fbc670
|
!855 修复【短信发送过于频率】的拼写错误
Merge pull request !855 from 杨宇庆/N/A
|
2 years ago |
YunaiV
|
8f2f0ea096
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2 years ago |
YunaiV
|
0dff03b8b1
|
🔥 2.0.0 版本发布准备~
|
2 years ago |
杨宇庆
|
d611ebc0a2
|
修复【短信发送过于频率】的拼写错误
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |
YunaiV
|
16fd1a9639
|
🐛 oracle limit 查询不正确
|
2 years ago |
芋道源码
|
91a7e6b44b
|
!841 去除通知保存VO里的Id不为空验证
Merge pull request !841 from smthhy/master
|
2 years ago |
YunaiV
|
35a1908bc6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
|
2 years ago |
YunaiV
|
6a6e95fcb6
|
✨ 对齐 BOOT 与 CLOUD 的代码
|
2 years ago |
YunaiV
|
a9891405aa
|
✨ 统一 JDK8 和 JDK21 相关代码
|
2 years ago |
YunaiV
|
023a7b14d8
|
✨ 统一 JDK8 和 JDK21 相关代码
|
2 years ago |
YunaiV
|
aa716642ab
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# 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/business/vo/business/CrmBusinessUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/vo/CrmContactBusinessLinkSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerLimitConfigController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerPoolConfigController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/limitconfig/CrmCustomerLimitConfigSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/limitconfig/CrmCustomerLimitConfigUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/poolconfig/CrmCustomerPoolConfigBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/poolconfig/CrmCustomerPoolConfigSaveReqVO.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/controller/admin/product/CrmProductController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contactbusinesslink/CrmContactBusinessLinkService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contactbusinesslink/CrmContactBusinessLinkServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerLimitConfigService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerLimitConfigServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerPoolConfigServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionService.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/product/CrmProductCategoryServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmQueryPageUtils.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategorySaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertySaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentSaveReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsGetReqVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletTransactionController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserUnbindReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
YunaiV
|
ee1870802f
|
BPM:抄送任务的 code review
|
2 years ago |
shihhy
|
93ff08863e
|
去除通知保存VO里的不为空验证
|
2 years ago |
kyle
|
5ae1d0ab3e
|
fix: 修复3处问题
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题,导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
|
2 years ago |
puhui999
|
eaa8e4be96
|
操作日志字段解析方法调整
|
2 years ago |
YunaiV
|
e79c750b46
|
📖 CRM:code review 跟进记录的实现
|
2 years ago |
puhui999
|
9bba1ce8a4
|
新增 ParseFunctionNameConstants 常量枚举
|
2 years ago |
puhui999
|
68f5edaa88
|
CRM-客户: 完善一些 TODO
|
2 years ago |
puhui999
|
9ce50ec369
|
CRM-客户限制配置:VO 简化
|
2 years ago |
puhui999
|
a1c17b9b00
|
CRM-客户:日志表达式调整
|
2 years ago |
YunaiV
|
8c9b483ac5
|
📖 code review 操作日志的实现
|
2 years ago |
puhui999
|
6950368991
|
操作日志:完善 code review 提到的问题
|
2 years ago |
YunaiV
|
5de6a8bd23
|
📖 code review:操作日志的实现
|
2 years ago |
YunaiV
|
82a25474f6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
YunaiV
|
7542b6a78d
|
✨ Member:完善微信相关配置
|
2 years ago |
puhui999
|
7286f33a7f
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
YunaiV
|
7b482f5729
|
✨ Member:增加获取单个社交用户的接口
|
2 years ago |
YunaiV
|
d65c28d7f7
|
✨ Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑
|
2 years ago |
puhui999
|
a05d3bc1d1
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
puhui999
|
f56d8a2751
|
重构操作日志记录实现
|
2 years ago |
puhui999
|
1fae341cae
|
重构操作日志记录实现
|
2 years ago |
puhui999
|
3bab9748db
|
系统操作日志:使用自定义 starter 的方式重新集成 mzt-biz-log
|
2 years ago |
YunaiV
|
b4612262b3
|
✨ MEMBER:修改密码时,发送验证码无需传递 mobile,通过 user 查询
|
2 years ago |
YunaiV
|
ddb6fe7ec8
|
📖 CRM:code review 客户管理的数据权限、操作权限
|
2 years ago |
puhui999
|
daf4651a4f
|
系统操作日志:集成 mzt-biz-log 5,增加日志保存和查询接口
|
2 years ago |
puhui999
|
3c74b22933
|
系统操作日志:集成 mzt-biz-log 4
|
2 years ago |
puhui999
|
c74881c8f0
|
系统操作日志:集成 mzt-biz-log 3
|
2 years ago |
puhui999
|
13d6c42a48
|
系统操作日志:集成 mzt-biz-log 2
|
2 years ago |
puhui999
|
c5cc818a49
|
系统操作日志:集成 mzt-biz-log
|
2 years ago |
YunaiV
|
23df8633f4
|
📖 CRM:code review 数据权限的实现
|
2 years ago |
YunaiV
|
802ac89b73
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2 years ago |
puhui999
|
5c395fc1c4
|
CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils
|
2 years ago |
YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
YunaiV
|
3707662187
|
📈 CRM:code review 数据权限
|
2 years ago |
YunaiV
|
d430063eec
|
Merge remote-tracking branch 'puhui/feature/crm' into feature/crm
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
|
2 years ago |
YunaiV
|
c69fbe540a
|
✅ 增加 codegen 模块的单测覆盖率
|
2 years ago |
puhui999
|
455a4ebc7b
|
CRM-客户:实现数据权限、场景检索和公海数据分页查询
|
2 years ago |
YunaiV
|
da829f7cf5
|
✅ 增加 sms/tenant/senstiveword 模块的单测覆盖率
|
2 years ago |
YunaiV
|
c2e9ecf7be
|
✅ 增加 social 模块的单测覆盖率
|
2 years ago |
YunaiV
|
f656888965
|
✅ 增加 permission 模块的单测覆盖率
|
2 years ago |
YunaiV
|
4dab6d0217
|
✅ 增加 dept 模块的单测覆盖率
|
2 years ago |
YunaiV
|
dab751dc74
|
✅ 增加 dict 模块的单测覆盖率
|
2 years ago |
YunaiV
|
42dc4b6194
|
🔧 简化 user 模块的 VO
|
2 years ago |
YunaiV
|
d4cf945af7
|
🔧 简化 tenant 模块的 VO
|
2 years ago |
YunaiV
|
5bb8fdca7e
|
🔧 简化 social 模块的 VO
|
2 years ago |
YunaiV
|
e61ecb63dd
|
🔧 简化 sms 模块的 VO
|
2 years ago |
YunaiV
|
8b67111733
|
🔧 简化 sensitiveWord 模块的 VO
|
2 years ago |
YunaiV
|
2dd835893a
|
🔧 简化 permission 模块的 VO
|
2 years ago |
YunaiV
|
73d53dbaad
|
🔧 简化 oauth2 模块的 VO
|
2 years ago |
YunaiV
|
9aed06af5d
|
🔧 简化 notify 模块的 VO
|
2 years ago |
YunaiV
|
5eb5472dec
|
🔧 简化 notice 模块的 VO
|
2 years ago |
YunaiV
|
b77b6322e1
|
🔧 简化 mail 模块的 VO
|
2 years ago |
YunaiV
|
4225db217d
|
🔧 简化 loginLog 和 operateLog 模块的 VO
|
2 years ago |
YunaiV
|
8eb04d6805
|
🔧 简化 errorCode 模块的 VO
|
2 years ago |
YunaiV
|
c493397653
|
🔧 简化 dictType 和 dictData 模块的 VO
|
2 years ago |
YunaiV
|
a9c8f6c8e9
|
🔧 简化 post 和 dept 模块的 VO
|
2 years ago |
YunaiV
|
455f8e49fb
|
crm:code review 联系人
|
2 years ago |
zyna
|
3f3899f5d3
|
crm联系人review修改,新增地区字段
|
2 years ago |
YunaiV
|
a1e6348a37
|
移除 weixin starter 组件,直接改成 wxjava starter
|
2 years ago |
芋道源码
|
ee25b8aedb
|
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
Merge pull request !752 from 芋道源码/feature/justauth-op
|
2 years ago |
YunaiV
|
0bf24c6d16
|
使用 spring-boot-starter-justauth 替代原本 social starter
|
2 years ago |
YunaiV
|
6b3a54c8df
|
!69fix(system): 修复更新账号时岗位为空时发生的空指针异常
|
2 years ago |
YunaiV
|
0233b092b8
|
websocket:重新封装 websocket 组件,支持 sender 广播
|
2 years ago |
YunaiV
|
6a61db8508
|
security: query string 支持传递 token 参数,解决 ws token 认证
|
2 years ago |
YunaiV
|
7506a1b012
|
sms:移除 sendCode、sendMsg 字段
|
2 years ago |
YunaiV
|
6f135303d8
|
sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
|
2 years ago |
YunaiV
|
822e441765
|
使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
|
2 years ago |
YunaiV
|
716b081464
|
crm:合并最新的数据权限
|
2 years ago |
YunaiV
|
8c9873c425
|
Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
|
2 years ago |
YunaiV
|
8c9c91f0ca
|
crm:code review 配置管理
|
2 years ago |
YunaiV
|
90f135ad95
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2 years ago |
zhijiantianya@gmail.com
|
067d53ac48
|
代码生成器:增加单元测试,🛫
|
2 years ago |
YunaiV
|
01a55b93c2
|
代码生成:增加更全的 tree 场景下的新增/修改校验
|
2 years ago |
YunaiV
|
f5ea270be3
|
部门:优化父部门的校验逻辑,为代码生成做个铺垫?!
|
2 years ago |
YunaiV
|
5e6e02e4f4
|
vo 简化:使用 BeanUtils 替代 mapstruct 转换
|
2 years ago |
YunaiV
|
ddb5bce0a2
|
vo 简化:post 重构
|
2 years ago |
Wanwan
|
5b295d56b6
|
feat: CRM 客户限制
|
2 years ago |
puhui999
|
668fae9398
|
CRM-数据权限:完善 code review 提到的问题
|
2 years ago |
YunaiV
|
e8bc284dd0
|
优化:默认只引入 mysql driver,减少打包大小
|
2 years ago |
YunaiV
|
feba904fd8
|
多租户:登录界面,根据 host 域名获取对应的租户编号
|
2 years ago |
YunaiV
|
c162b39e1e
|
多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突
|
2 years ago |
YunaiV
|
1eff9822ce
|
同步最新 master 代码
|
2 years ago |
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
|
2 years ago |
YunaiV
|
87bc3f510c
|
优化:社交登录、用户的管理
|
2 years ago |
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
|
2 years ago |
YunaiV
|
d048daf7d6
|
mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖
|
2 years ago |
puhui999
|
8552e86d8a
|
完善三方登录
|
2 years ago |
puhui999
|
12ae5bf128
|
新增社交用户 RUD
|
2 years ago |
puhui999
|
738fcef453
|
新增社交客户端 CRUD
|
2 years ago |
puhui999
|
eb4b719b4b
|
添加社交客户端测试 sql
|
2 years ago |
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
|
2 years ago |
YunaiV
|
dd2f5ba2c3
|
统一 boot 和 cloud 代码
|
2 years ago |
puhui999
|
6723cae781
|
营销活动:完善 review 提到的问题
|
2 years ago |
YunaiV
|
728308cbc0
|
member:优化部分变量的命名
|
2 years ago |
YunaiV
|
94c2ad5d1d
|
修复报错的单元测试
|
2 years ago |
YunaiV
|
d0caa77f80
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
YunaiV
|
ec27a1bae5
|
修复报错的单元测试
|
2 years ago |
YunaiV
|
52ebcaaad7
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/
|
2 years ago |
YunaiV
|
14f006088a
|
code review:敏感词
|
2 years ago |
芋道源码
|
630890d0ac
|
!665 修复敏感词单字符检验失败问题
Merge pull request !665 from 摸鱼散人/master
|
2 years ago |
YunaiV
|
979b484d7f
|
saas:支持社交应用的多租户配置(wx 小程序)
|
2 years ago |
YunaiV
|
6f757e5297
|
saas:支持社交应用的多租户配置(mp)
|
2 years ago |
YunaiV
|
d256275099
|
saas:支持社交应用的多租户配置
|
2 years ago |
zhijiantianya@gmail.com
|
0af205ede1
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
zhijiantianya@gmail.com
|
c629fd2208
|
code review:工作流逻辑
|
2 years ago |
daiwencheng
|
944e3862a5
|
修复敏感词检验问题
1.修复排序,优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
|
2 years ago |
芋道源码
|
8fd814e0c1
|
!636 测试站内信接口增加Member 用户类型的支持。
Merge pull request !636 from 风狗/feature/mall_product
|
2 years ago |
YunaiV
|
3110e427fb
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files
|
2 years ago |
puhui999
|
c71bdd158a
|
拼团活动:完善 review 提到的问题
|
2 years ago |
YunaiV
|
fdb10aeced
|
trade:优化运费模版的实现
|
2 years ago |
YunaiV
|
5913ee0706
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
绮梦
|
5a5f92d2e9
|
feat: 测试站内信接口增加Member 用户类型的支持。
|
2 years ago |
YunaiV
|
e384b810bf
|
code review:分销逻辑
|
2 years ago |
YunaiV
|
9b7c757942
|
1.8.2 版本发布
|
2 years ago |
owen
|
e9fd377772
|
分销:Review代码修改
|
2 years ago |
YunaiV
|
421bb7d154
|
code review:分销逻辑
|
2 years ago |
owen
|
bf0e7d2c77
|
System:字典数据列表过滤已关闭的数据
|
2 years ago |
owen
|
637ae8ce1d
|
分佣: 提现记录
|
2 years ago |
owen
|
594e4d5fee
|
system: uniapp增加字典数据查询接口
|
2 years ago |
YunaiV
|
9630f236f8
|
Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
README.md
|
2 years ago |
YunaiV
|
b81ebe6f19
|
修复 common 下的 test 引入不正确的问题,减少包依赖大小
|
2 years ago |
YunaiV
|
222daa5366
|
pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
|
2 years ago |
YunaiV
|
a51579a77d
|
fileConfig 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
|
2 years ago |
YunaiV
|
48fd4972da
|
sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
|
2 years ago |
YunaiV
|
ebb3a04251
|
优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度
|
2 years ago |
xingyu
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
2 years ago |
YunaiV
|
8b50cd9661
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
|
2 years ago |
xingyu
|
5e9e41c045
|
fix: required 过期
|
2 years ago |
YunaiV
|
40e1a879e3
|
登录:社交登录时,额外返回 openid
|
2 years ago |
YunaiV
|
65d7b30011
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
2 years ago |
lemoncc
|
2fd201c7fa
|
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
|
2 years ago |
YunaiV
|
4809e9b462
|
修复单元测试报错的问题
|
2 years ago |