YunaiV
|
023a7b14d8
|
✨ 统一 JDK8 和 JDK21 相关代码
|
2024-01-19 12:38:57 +08:00 |
|
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
|
2024-01-19 09:13:18 +08:00 |
|
YunaiV
|
ee1870802f
|
BPM：抄送任务的 code review
|
2024-01-18 19:07:01 +08:00 |
|
shihhy
|
93ff08863e
|
去除通知保存VO里的不为空验证
|
2024-01-17 14:01:21 +08:00 |
|
kyle
|
5ae1d0ab3e
|
fix: 修复3处问题
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题，导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
|
2024-01-16 11:09:02 +08:00 |
|
puhui999
|
eaa8e4be96
|
操作日志字段解析方法调整
|
2024-01-13 22:29:05 +08:00 |
|
YunaiV
|
e79c750b46
|
📖 CRM：code review 跟进记录的实现
|
2024-01-13 09:56:53 +08:00 |
|
puhui999
|
9bba1ce8a4
|
新增 ParseFunctionNameConstants 常量枚举
|
2024-01-10 11:29:29 +08:00 |
|
puhui999
|
68f5edaa88
|
CRM-客户: 完善一些 TODO
|
2024-01-06 15:28:10 +08:00 |
|
puhui999
|
9ce50ec369
|
CRM-客户限制配置：VO 简化
|
2024-01-06 13:04:30 +08:00 |
|
puhui999
|
a1c17b9b00
|
CRM-客户：日志表达式调整
|
2024-01-05 17:40:21 +08:00 |
|
YunaiV
|
8c9b483ac5
|
📖 code review 操作日志的实现
|
2023-12-30 21:36:46 +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 |
|
YunaiV
|
7b482f5729
|
✨ Member：增加获取单个社交用户的接口
|
2023-12-23 21:48:33 +08:00 |
|
YunaiV
|
d65c28d7f7
|
✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑
|
2023-12-23 09:59:58 +08:00 |
|
puhui999
|
a05d3bc1d1
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2023-12-19 18:44:34 +08:00 |
|
puhui999
|
f56d8a2751
|
重构操作日志记录实现
|
2023-12-19 18:34:51 +08:00 |
|
puhui999
|
1fae341cae
|
重构操作日志记录实现
|
2023-12-19 16:29:13 +08:00 |
|
puhui999
|
3bab9748db
|
系统操作日志：使用自定义 starter 的方式重新集成 mzt-biz-log
|
2023-12-19 09:20:47 +08:00 |
|
YunaiV
|
b4612262b3
|
✨ MEMBER：修改密码时，发送验证码无需传递 mobile，通过 user 查询
|
2023-12-17 23:46:48 +08:00 |
|
YunaiV
|
ddb6fe7ec8
|
📖 CRM：code review 客户管理的数据权限、操作权限
|
2023-12-17 10:57:49 +08:00 |
|
puhui999
|
daf4651a4f
|
系统操作日志：集成 mzt-biz-log 5，增加日志保存和查询接口
|
2023-12-14 18:45:13 +08:00 |
|
puhui999
|
3c74b22933
|
系统操作日志：集成 mzt-biz-log 4
|
2023-12-13 17:45:43 +08:00 |
|
puhui999
|
c74881c8f0
|
系统操作日志：集成 mzt-biz-log 3
|
2023-12-13 15:18:19 +08:00 |
|
puhui999
|
13d6c42a48
|
系统操作日志：集成 mzt-biz-log 2
|
2023-12-12 22:42:50 +08:00 |
|
puhui999
|
c5cc818a49
|
系统操作日志：集成 mzt-biz-log
|
2023-12-12 22:29:40 +08:00 |
|
YunaiV
|
23df8633f4
|
📖 CRM：code review 数据权限的实现
|
2023-12-09 10:50:47 +08:00 |
|
YunaiV
|
fc9f46947e
|
🎉 精简仅保留 system、infra 功能，适合小项目
|
2023-12-08 22:27:38 +08:00 |
|
YunaiV
|
802ac89b73
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-08 22:17:52 +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
|
3707662187
|
📈 CRM：code review 数据权限
|
2023-12-06 20:04:15 +08:00 |
|
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
|
2023-12-06 19:33:04 +08:00 |
|
YunaiV
|
c69fbe540a
|
✅ 增加 codegen 模块的单测覆盖率
|
2023-12-05 20:00:29 +08:00 |
|
puhui999
|
455a4ebc7b
|
CRM-客户：实现数据权限、场景检索和公海数据分页查询
|
2023-12-05 15:04:53 +08:00 |
|
YunaiV
|
da829f7cf5
|
✅ 增加 sms/tenant/senstiveword 模块的单测覆盖率
|
2023-12-04 13:14:18 +08:00 |
|
YunaiV
|
c2e9ecf7be
|
✅ 增加 social 模块的单测覆盖率
|
2023-12-04 09:54:47 +08:00 |
|
YunaiV
|
f656888965
|
✅ 增加 permission 模块的单测覆盖率
|
2023-12-03 21:55:17 +08:00 |
|
YunaiV
|
4dab6d0217
|
✅ 增加 dept 模块的单测覆盖率
|
2023-12-03 21:26:43 +08:00 |
|
YunaiV
|
dab751dc74
|
✅ 增加 dict 模块的单测覆盖率
|
2023-12-03 21:15:06 +08:00 |
|
YunaiV
|
42dc4b6194
|
🔧 简化 user 模块的 VO
|
2023-12-03 01:02:59 +08:00 |
|
YunaiV
|
d4cf945af7
|
🔧 简化 tenant 模块的 VO
|
2023-12-02 23:42:57 +08:00 |
|
YunaiV
|
5bb8fdca7e
|
🔧 简化 social 模块的 VO
|
2023-12-02 23:01:15 +08:00 |
|
YunaiV
|
e61ecb63dd
|
🔧 简化 sms 模块的 VO
|
2023-12-02 22:39:23 +08:00 |
|
YunaiV
|
8b67111733
|
🔧 简化 sensitiveWord 模块的 VO
|
2023-12-02 21:59:08 +08:00 |
|
YunaiV
|
2dd835893a
|
🔧 简化 permission 模块的 VO
|
2023-12-02 21:47:03 +08:00 |
|
YunaiV
|
73d53dbaad
|
🔧 简化 oauth2 模块的 VO
|
2023-12-02 20:48:51 +08:00 |
|
YunaiV
|
9aed06af5d
|
🔧 简化 notify 模块的 VO
|
2023-12-02 20:25:10 +08:00 |
|
YunaiV
|
5eb5472dec
|
🔧 简化 notice 模块的 VO
|
2023-12-02 20:07:54 +08:00 |
|
YunaiV
|
b77b6322e1
|
🔧 简化 mail 模块的 VO
|
2023-12-02 19:54:58 +08:00 |
|
YunaiV
|
4225db217d
|
🔧 简化 loginLog 和 operateLog 模块的 VO
|
2023-12-02 19:25:25 +08:00 |
|
YunaiV
|
8eb04d6805
|
🔧 简化 errorCode 模块的 VO
|
2023-12-02 18:40:31 +08:00 |
|
YunaiV
|
c493397653
|
🔧 简化 dictType 和 dictData 模块的 VO
|
2023-12-02 18:21:40 +08:00 |
|
YunaiV
|
a9c8f6c8e9
|
🔧 简化 post 和 dept 模块的 VO
|
2023-12-02 10:18:27 +08:00 |
|
YunaiV
|
455f8e49fb
|
crm：code review 联系人
|
2023-11-27 20:42:35 +08:00 |
|
zyna
|
3f3899f5d3
|
crm联系人review修改，新增地区字段
|
2023-11-27 20:42:34 +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
|
0bf24c6d16
|
使用 spring-boot-starter-justauth 替代原本 social starter
|
2023-11-26 11:39:29 +08:00 |
|
YunaiV
|
6b3a54c8df
|
!69fix(system): 修复更新账号时岗位为空时发生的空指针异常
|
2023-11-25 22:28:05 +08:00 |
|
YunaiV
|
0233b092b8
|
websocket：重新封装 websocket 组件，支持 sender 广播
|
2023-11-24 00:32:52 +08:00 |
|
YunaiV
|
6a61db8508
|
security: query string 支持传递 token 参数，解决 ws token 认证
|
2023-11-22 23:02:59 +08:00 |
|
YunaiV
|
7506a1b012
|
sms：移除 sendCode、sendMsg 字段
|
2023-11-21 22:53:57 +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
|
716b081464
|
crm：合并最新的数据权限
|
2023-11-18 22:31:05 +08:00 |
|
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
|
2023-11-18 22:25:13 +08:00 |
|
YunaiV
|
8c9c91f0ca
|
crm：code review 配置管理
|
2023-11-18 22:12: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 |
|
zhijiantianya@gmail.com
|
067d53ac48
|
代码生成器：增加单元测试，🛫
|
2023-11-17 19:39:32 +08:00 |
|
YunaiV
|
01a55b93c2
|
代码生成：增加更全的 tree 场景下的新增/修改校验
|
2023-11-16 20:01:44 +08:00 |
|
YunaiV
|
f5ea270be3
|
部门：优化父部门的校验逻辑，为代码生成做个铺垫？！
|
2023-11-16 12:55:43 +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 |
|
Wanwan
|
5b295d56b6
|
feat: CRM 客户限制
|
2023-11-11 20:49:52 +08:00 |
|
puhui999
|
668fae9398
|
CRM-数据权限：完善 code review 提到的问题
|
2023-11-07 17:52:18 +08:00 |
|
YunaiV
|
e8bc284dd0
|
优化：默认只引入 mysql driver，减少打包大小
|
2023-11-06 21:41:28 +08:00 |
|
YunaiV
|
feba904fd8
|
多租户：登录界面，根据 host 域名获取对应的租户编号
|
2023-11-06 19:47:21 +08:00 |
|
YunaiV
|
c162b39e1e
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
2023-11-06 19:04:01 +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
|
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 |
|
YunaiV
|
d048daf7d6
|
mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖
|
2023-10-30 12:53:54 +08:00 |
|
puhui999
|
8552e86d8a
|
完善三方登录
|
2023-10-26 17:03:26 +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
|
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 |
|
puhui999
|
6723cae781
|
营销活动：完善 review 提到的问题
|
2023-10-23 12:02:13 +08:00 |
|
YunaiV
|
728308cbc0
|
member：优化部分变量的命名
|
2023-10-22 16:35:48 +08:00 |
|
YunaiV
|
94c2ad5d1d
|
修复报错的单元测试
|
2023-10-22 08:55:27 +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
|
ec27a1bae5
|
修复报错的单元测试
|
2023-10-22 08:24:47 +08:00 |
|
YunaiV
|
52ebcaaad7
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/
|
2023-10-20 00:31:35 +08:00 |
|
YunaiV
|
14f006088a
|
code review：敏感词
|
2023-10-19 23:25:17 +08:00 |
|
芋道源码
|
630890d0ac
|
!665 修复敏感词单字符检验失败问题
Merge pull request !665 from 摸鱼散人/master
|
2023-10-19 15:18:31 +00:00 |
|
YunaiV
|
979b484d7f
|
saas：支持社交应用的多租户配置（wx 小程序）
|
2023-10-19 21:42:39 +08:00 |
|
YunaiV
|
6f757e5297
|
saas：支持社交应用的多租户配置（mp）
|
2023-10-19 12:54:44 +08:00 |
|
YunaiV
|
d256275099
|
saas：支持社交应用的多租户配置
|
2023-10-18 23:48:14 +08:00 |
|
zhijiantianya@gmail.com
|
0af205ede1
|
Merge remote-tracking branch 'origin/master'
|
2023-10-17 18:49:59 +08:00 |
|
zhijiantianya@gmail.com
|
c629fd2208
|
code review：工作流逻辑
|
2023-10-17 18:49:35 +08:00 |
|
daiwencheng
|
944e3862a5
|
修复敏感词检验问题
1.修复排序，优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
|
2023-10-15 14:30:43 +08:00 |
|
芋道源码
|
8fd814e0c1
|
!636 测试站内信接口增加Member 用户类型的支持。
Merge pull request !636 from 风狗/feature/mall_product
|
2023-10-14 09:53:41 +00:00 |
|
YunaiV
|
3110e427fb
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files
|
2023-10-14 17:45:49 +08:00 |
|
puhui999
|
c71bdd158a
|
拼团活动：完善 review 提到的问题
|
2023-10-08 17:19:39 +08:00 |
|
YunaiV
|
fdb10aeced
|
trade：优化运费模版的实现
|
2023-10-02 18:30:14 +08:00 |
|
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
|
2023-09-28 15:18:59 +08:00 |
|
绮梦
|
5a5f92d2e9
|
feat: 测试站内信接口增加Member 用户类型的支持。
|
2023-09-25 15:54:31 +08:00 |
|
YunaiV
|
e384b810bf
|
code review：分销逻辑
|
2023-09-25 09:39:39 +08:00 |
|
YunaiV
|
9b7c757942
|
1.8.2 版本发布
|
2023-09-24 23:24:24 +08:00 |
|
owen
|
e9fd377772
|
分销：Review代码修改
|
2023-09-24 20:28:44 +08:00 |
|
YunaiV
|
421bb7d154
|
code review：分销逻辑
|
2023-09-24 11:56:00 +08:00 |
|
owen
|
bf0e7d2c77
|
System：字典数据列表过滤已关闭的数据
|
2023-09-23 23:42:20 +08:00 |
|
owen
|
637ae8ce1d
|
分佣: 提现记录
|
2023-09-22 18:35:43 +08:00 |
|
owen
|
594e4d5fee
|
system: uniapp增加字典数据查询接口
|
2023-09-22 15:11:06 +08:00 |
|
YunaiV
|
9630f236f8
|
Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
README.md
|
2023-09-19 22:28:45 +08:00 |
|
YunaiV
|
b81ebe6f19
|
修复 common 下的 test 引入不正确的问题，减少包依赖大小
|
2023-09-17 01:37:10 +08:00 |
|
YunaiV
|
222daa5366
|
pay 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效
|
2023-09-16 23:22:58 +08:00 |
|
YunaiV
|
a51579a77d
|
fileConfig 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效
|
2023-09-16 21:35:05 +08:00 |
|
YunaiV
|
48fd4972da
|
sms 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效
|
2023-09-16 20:58:34 +08:00 |
|
YunaiV
|
ebb3a04251
|
优化多租户 Job 的实现，采用 AOP 替代 BeanPostProcessor，提升启动速度
|
2023-09-16 14:06:15 +08:00 |
|
xingyu
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
2023-09-13 12:00:10 +08:00 |
|
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
|
2023-09-11 16:19:55 +08:00 |
|
xingyu
|
5e9e41c045
|
fix: required 过期
|
2023-09-11 12:30:33 +08:00 |
|
YunaiV
|
40e1a879e3
|
登录：社交登录时，额外返回 openid
|
2023-09-10 18:01:53 +08:00 |
|
YunaiV
|
65d7b30011
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-09-09 10:35:14 +08:00 |
|
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
2023-09-09 01:30:51 +08:00 |
|
lemoncc
|
2fd201c7fa
|
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
|
2023-09-08 16:33:49 +08:00 |
|
YunaiV
|
4809e9b462
|
修复单元测试报错的问题
|
2023-09-03 18:28:29 +08:00 |
|
YunaiV
|
02bc9d28de
|
解决 MapStruct 的时区问题
|
2023-08-27 11:19:48 +08:00 |
|
shizhong
|
eb4434ecbc
|
解决MapStruct的时区问题
|
2023-08-23 12:11:47 +08:00 |
|
YunaiV
|
bfc72a9802
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
|
2023-08-20 09:45:34 +08:00 |
|
YunaiV
|
95254341a1
|
1. 会员用户的找回密码 API 的优化
|
2023-08-19 23:12:34 +08:00 |
|
YunaiV
|
5d4a7ffa3b
|
1. 会员用户的修改密码 API 的优化
|
2023-08-19 20:16:41 +08:00 |
|
YunaiV
|
87e5b2bed1
|
1. 会员用户的修改手机 API 的优化
|
2023-08-19 19:23:54 +08:00 |
|
wanglei
|
6446b753d3
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-08-18 10:56:08 +08:00 |
|
YunaiV
|
ee53d2ad51
|
修复租户套餐修改时，查询角色报错问题
|
2023-08-11 22:24:01 +08:00 |
|
YunaiV
|
b5515799dc
|
!557 修改创建菜单时permission为空，缓存KEY 为空的BUG
|
2023-08-11 19:32:26 +08:00 |
|
杜继强
|
14c7465bc6
|
修改创建菜单时permission为空，缓存KEY 为空的BUG ，判断 reqVO.permission 为空时，不做 @CacheEvict 的操作
|
2023-08-08 00:13:23 +08:00 |
|
YunaiV
|
1f3794db77
|
fix: 修复MailAccountService 更新/删除缓存未清空
|
2023-08-05 14:49:04 +08:00 |
|
YunaiV
|
c4755c49b1
|
fix: 修复MailAccountService 更新/删除缓存未清空
|
2023-08-05 14:48:14 +08:00 |
|
zhangjiayu
|
508ad76cb8
|
fix: 修复MailAccountService 更新/删除缓存未清空
|
2023-08-03 18:08:38 +08:00 |
|
YunaiV
|
dfa09c787a
|
短信渠道的本地缓存，使用 Job 轮询，替代 MQ 广播
|
2023-07-29 08:59:07 +08:00 |
|
YunaiV
|
27e70e73a3
|
敏感词的本地缓存，使用 Job 轮询，替代 MQ 广播
|
2023-07-29 07:31:53 +08:00 |
|
YunaiV
|
5e7e3d816c
|
彻底移除 RedisKeyDefine
|
2023-07-29 07:16:10 +08:00 |
|
YunaiV
|
95edd1d451
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis
Conflicts:
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2023-07-28 22:31:18 +08:00 |
|
YunaiV
|
5d6308e4bb
|
对齐 boot 与 cloud 的代码
|
2023-07-27 13:59:29 +08:00 |
|
YunaiV
|
859cf74a6c
|
对齐 boot 与 cloud 的代码
|
2023-07-27 13:00:52 +08:00 |
|
YunaiV
|
6c174d9c83
|
对齐 boot 与 cloud 的代码
|
2023-07-26 23:56:02 +08:00 |
|
YunaiV
|
14d7db0c60
|
对齐 boot 与 cloud 的代码
|
2023-07-26 23:27:06 +08:00 |
|
YunaiV
|
114f1e4833
|
对齐 boot 与 cloud 的代码
|
2023-07-26 22:36:34 +08:00 |
|
lwf
|
414c1be128
|
feature(使用redis缓存): 功能合并
1、缓存改为Redis缓存，不在启动时缓存，使用时候根据数据源缓存
2、前端登录接口调整
|
2023-07-26 17:20:54 +08:00 |
|
芋道源码
|
870873e480
|
!540 修复部分问题，升级依赖
Merge pull request !540 from xingyu/feature/captcha
|
2023-07-25 11:20:04 +00:00 |
|
YunaiV
|
3a24d05bdc
|
mall + pay：
1. 修复单元测试的报错
|
2023-07-24 07:04:11 +08:00 |
|
xingyu
|
d556877b13
|
chore: use xingyuv jushauth
|
2023-07-21 17:55:47 +08:00 |
|
xingyu
|
c95a1d0a7d
|
chore: up springboot 2.10.13
|
2023-07-21 17:53:40 +08:00 |
|
YunaiV
|
67d60e32f8
|
mall + pay：
1、调整微信支付，修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
|
2023-07-06 00:19:05 +08:00 |
|
YunaiV
|
23e3c4d0d9
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-07-02 23:45:48 +08:00 |
|
芋道源码
|
11c4c950b7
|
回退 'Pull Request !518 : 添加华为云 maven 升级依赖'
|
2023-07-02 15:41:26 +00:00 |
|
xingyu
|
7ad3b6ad2b
|
chore: use com.xingyuv.justauth
|
2023-06-26 21:08:56 +08:00 |
|
YunaiV
|
7036a6652c
|
mall + member：
1、调整收获地址的返回
|
2023-06-26 20:07:46 +08:00 |
|
YunaiV
|
16dd86a8db
|
498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题
|
2023-06-17 12:36:13 +08:00 |
|
xingyu
|
573ad59edc
|
Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
|
2023-06-14 15:18:12 +08:00 |
|
puhui999
|
5bfca56efa
|
fix：完善 TODO 提到的问题
|
2023-06-07 18:08:49 +08:00 |
|
shizhong
|
6ca09af97e
|
解决邮件发送用户编号为空问题
|
2023-06-05 14:09:49 +08:00 |
|
shizhong
|
3e350151bc
|
解决 Set access token expire time to 0 报错问题
|
2023-06-05 14:03:06 +08:00 |
|
JiangQi
|
8004a11036
|
master代码错误
|
2023-05-29 09:17:11 +08:00 |
|
YunaiV
|
cc049566d1
|
修复邮件日志 sendTime 类型不一致（应该为 LocalDateTime）
|
2023-05-29 00:05:06 +08:00 |
|
YunaiV
|
0631c51d93
|
mall + trade：review 配置管理列表
|
2023-05-28 23:16:11 +08:00 |
|
jason
|
55dbff7570
|
运费模板 review 修改. 运费模块可以选择多个区域
|
2023-05-27 11:20:43 +08:00 |
|
YunaiV
|
0083d12404
|
mall：review + mall：快递费用
|
2023-05-25 22:51:38 +08:00 |
|
jason
|
16956a6501
|
运费模板，区域选择使用懒加载优化性能
|
2023-05-22 23:08:21 +08:00 |
|
芋道源码
|
7bfb426a9d
|
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
Merge pull request !484 from Rundeepin/feature/mall_product
|
2023-05-21 15:38:48 +00:00 |
|
jason
|
01a67289a9
|
mall: 订单中心新增运费模板功能
|
2023-05-21 23:35:07 +08:00 |
|
杨文
|
e25099a49e
|
发送邮件逻辑优化，邮件标题支持模版参数
|
2023-05-19 11:08:56 +08:00 |
|
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
2023-05-19 10:47:23 +08:00 |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +08:00 |
|
YunaiV
|
e5fcc7a387
|
boot3：适合 ServletUtils
|
2023-04-16 21:40:56 +08:00 |
|
芋道源码
|
89e785dc49
|
!457 【轻量级 PR】：解决敏感词导出和字典数据编辑保存的两个BUG
Merge pull request !457 from clockdotnet/master_pr
|
2023-04-15 01:39:41 +00:00 |
|
YunaiV
|
d2ba90db5d
|
修复单元测试报错
|
2023-04-14 22:59:45 +08:00 |
|
shizhong
|
206b5a5e47
|
解决字典数据编辑颜色清空不能保存问题
|
2023-04-14 22:15:50 +08:00 |
|
shizhong
|
27c5b5f369
|
解决敏感词导出excel内容为500错误问题
|
2023-04-14 22:14:34 +08:00 |
|
YunaiV
|
5c0161d762
|
修复租户名的重复问题
|
2023-04-09 11:12:24 +08:00 |
|
芋道源码
|
aa16b8279f
|
!446 配合周建进行测试所提bug的后端修改
Merge pull request !446 from clockdotnet/master_pr
|
2023-04-09 02:30:08 +00:00 |
|
shizhong
|
92cf4b9e63
|
租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题，按规范优化代码
|
2023-04-03 12:55:06 +08:00 |
|
shizhong
|
64cd19f7db
|
解决新增租户时创建的租户第一个用户性别为无效值的问题，前端改了，后端还是默认0即未知吧
|
2023-03-30 21:15:26 +08:00 |
|
shizhong
|
55358aa170
|
租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题
|
2023-03-30 16:00:25 +08:00 |
|
shizhong
|
b8628f75c5
|
解决新增租户时创建的租户第一个用户性别为无效值0的问题
|
2023-03-30 15:19:20 +08:00 |
|
打听幸福的下落
|
aae6f12832
|
fix: MybatisPlus 主键策略使用雪花算法 ASSIGN_ID 时，获取登录验证码主键精度丢失问题
SmsCodeDO 主键类型为 Integer，使用雪花算法后 Long 转 Integer 精度丢失，system_sms_code 表数据入库后主键为负数
|
2023-03-16 20:25:29 +08:00 |
|
joinfriend
|
ede7aabb55
|
补充update分隔符
Signed-off-by: joinfriend <277784977@163.com>
|
2023-03-07 17:25:00 +00:00 |
|
芋道源码
|
6216b1190a
|
!416 用户详情不显示所属部门部门
Merge pull request !416 from babylazsss/master
|
2023-02-28 16:51:59 +00:00 |
|
jian.li
|
c35d4f596a
|
缓存部门命名优化
|
2023-02-24 13:13:10 +08:00 |
|
chiwenda
|
5f47c00c51
|
fix:用户详情不显示所属部门
|
2023-02-20 22:05:28 +08:00 |
|
YunaiV
|
35ba9b36af
|
菜单新增 alwaysShow 总是展示、componentName 组件名
|
2023-02-10 23:03:10 +08:00 |
|