YunaiV
|
68fcb018a9
|
✨ 对齐 BOOT 与 CLOUD 的代码
|
2024-01-19 23:37:37 +08:00 |
|
YunaiV
|
106d603f67
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.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/brand/vo/ProductBrandUpdateReqVO.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/ProductCommentReplyReqVO.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/comment/vo/ProductCommentUpdateVisibleReqVO.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/admin/spu/vo/ProductSpuUpdateStatusReqVO.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/category/vo/AppCategoryRespVO.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/comment/vo/AppCommentPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/AppFavoriteController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteBatchReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteReqVO.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/brand/ProductBrandService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.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/favorite/ProductFavoriteService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleCategoryController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/category/ArticleCategoryBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/category/ArticleCategoryUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/BannerController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainHelpController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageItemRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/recrod/BargainRecordBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/product/CombinationProductBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/recrod/CombinationRecordBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/recrod/CombinationRecordReqPage2VO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/CouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/CouponTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/coupon/CouponBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/coupon/CouponSendReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateUpdateStatusReqVO.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/admin/discount/DiscountActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/RewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/activity/SeckillActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/config/SeckillConfigBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/config/SeckillConfigSimpleRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/config/SeckillConfigUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/config/SeckillConfigUpdateStatusReqVo.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/product/SeckillProductBaseVO.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/article/AppArticleCategoryController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/AppBannerController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/vo/AppBannerRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainHelpController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/help/AppBargainHelpCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.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/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponTakeReqVO.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/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/consumer/coupon/CouponTakeByRegisterConsumer.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleCategoryService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/banner/BannerService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/banner/BannerServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainHelpServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.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/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.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/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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigServiceImpl.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/admin/delivery/vo/pickup/DeliveryPickUpStoreCreateReqVO.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/controller/admin/address/vo/AddressBaseVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.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-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/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
|
2024-01-19 22:55:28 +08:00 |
|
YunaiV
|
92f8fa8d7c
|
✨ 升级最新依赖
|
2024-01-19 22:41:05 +08:00 |
|
YunaiV
|
2208eef8cf
|
✨ MEMBER:同步 jdk21 boot 最新代码
|
2024-01-19 21:19:48 +08:00 |
|
YunaiV
|
8289a22f03
|
✨ SYSTEM:同步 jdk21 boot 最新代码
✨ INFRA:同步 jdk21 boot 最新代码
|
2024-01-19 20:34:59 +08:00 |
|
YunaiV
|
9c61ad553a
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-30 11:59:26 +08:00 |
|
YunaiV
|
c98738d405
|
🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递
|
2023-12-30 11:59:16 +08:00 |
|
YunaiV
|
4cb68f24b7
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-30 11:21:38 +08:00 |
|
芋道源码
|
f742c7b22d
|
Merge pull request #123 from Breadswim/master-jdk21
fix 腾讯云上传bug
|
2023-12-30 11:21:00 +08:00 |
|
YunaiV
|
aa2dac145f
|
🐛 修复 ExcelUtils 报错
|
2023-12-29 22:23:24 +08:00 |
|
YunaiV
|
20c1ee87ff
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-29 21:45:00 +08:00 |
|
YunaiV
|
882b70dcf1
|
🐛 导出 Excel:Long 类型 ID 会丢失精度
|
2023-12-29 21:44:48 +08:00 |
|
moon69
|
0012f6f06d
|
修复导出 excel 时,Long 类型丢失精度的问题
|
2023-12-29 20:09:02 +08:00 |
|
YunaiV
|
5f64c0b07f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-29 12:58:30 +08:00 |
|
YunaiV
|
3434a089a3
|
🐛 修复修改短信渠道缓存没有更新
|
2023-12-29 12:58:19 +08:00 |
|
芋道源码
|
87bdc1bba6
|
!87 fix(websocket): 修复 websocket 失效的问题
Merge pull request !87 from oc/master-jdk21
|
2023-12-29 04:50:16 +00:00 |
|
YunaiV
|
a7e7631ce8
|
🐛 Websocket 断开时,未删除会话缓存 bug
|
2023-12-29 12:43:53 +08:00 |
|
芋道源码
|
c3c191ec6a
|
!71 优化 BaseMapperX & fix websocket 未删除会话缓存bug
Merge pull request !71 from 陈晨成/master
|
2023-12-29 04:39:20 +00:00 |
|
oc
|
b1b15185eb
|
fix(websocket): 修复 websocket 失效的问题
|
2023-12-25 00:51:37 +08:00 |
|
Breadswim
|
8bdddd719d
|
fix 腾讯云上传bug
|
2023-12-15 10:17:59 +08:00 |
|
YunaiV
|
fd9c4d73b1
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-09 00:54:34 +08:00 |
|
YunaiV
|
bca3d0c691
|
⬆️ JDK21 + Spring Boot 3.2.0 + Spring Cloud 2023 晋升 master 分支,开启 2.0.0 版本
|
2023-12-09 00:43:37 +08:00 |
|
芋道源码
|
fd42b3e30f
|
!61 修复方法权限注解找不到认证器问题。
Merge pull request !61 from fangyuan/master
|
2023-12-07 16:09:16 +00:00 |
|
芋道源码
|
65dcb16d57
|
!81 fix:修复spring cache redis 单冒号,而不是双 :: 冒号,避免 Redis Desktop Manager 多余空格
Merge pull request !81 from 晨曦伴读/fix-master-dev
|
2023-12-06 13:28:20 +00:00 |
|
YunaiV
|
6210bde1de
|
✅ 增加 codegen 模块的单测覆盖率
|
2023-12-05 20:00:20 +08:00 |
|
862412451@qq.com
|
b5391c3ed2
|
fix: 修复spring cache redis 单冒号,而不是双 :: 冒号,避免 Redis Desktop Manager 多余空格。issues详情地址: https://gitee.com/zhijiantianya/yudao-cloud/issues/I86VY2
|
2023-12-05 14:40:10 +08:00 |
|
芋道源码
|
8610ffe0ba
|
!72 新增 feign-okhttp 依赖
Merge pull request !72 from Henry/fix-feign-compression
|
2023-12-03 11:10:23 +00:00 |
|
YunaiV
|
930cdce7a0
|
🔧 简化 errorLog 和 accessLog 模块的 VO
|
2023-12-03 18:32:40 +08:00 |
|
YunaiV
|
df2bcb267d
|
🔧 简化 permission 模块的 VO
|
2023-12-02 21:47:07 +08:00 |
|
1351515658@qq.com
|
1535ae03b6
|
fix websocket断开连接未删除会话缓存
|
2023-11-29 19:45:22 +08:00 |
|
Henry
|
216a5b1343
|
新增 feign-okhttp 依赖。解决:OpenFeign默认使用jdk自带的HttpURLConnection,没有连接池、性能和效率比较低。且feign开启压缩,会遇到数据量大时,json解析异常
|
2023-11-29 14:56:04 +08:00 |
|
1351515658@qq.com
|
bc05fe497c
|
优化 BaseMapperX的update、insert方法返回值
|
2023-11-29 09:51:03 +08:00 |
|
YunaiV
|
16c303bc28
|
移除 weixin starter 组件,直接改成 wxjava starter
|
2023-11-28 07:56:20 +08:00 |
|
YunaiV
|
4e83cef189
|
同步最新的达梦适配
|
2023-11-27 19:48:26 +08:00 |
|
YunaiV
|
a47cd877f8
|
修复 WxPayOrderNotifyV3Result 的重命名
|
2023-11-26 19:25:01 +08:00 |
|
YunaiV
|
35bd977e19
|
移除 weixin starter 组件,直接改成 wxjava starter
|
2023-11-26 17:08:01 +08:00 |
|
YunaiV
|
11c0c0d52b
|
使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
|
2023-11-26 11:54:55 +08:00 |
|
YunaiV
|
f7a96d5aa0
|
优化 error-code 加载逻辑,失败不影响启动
|
2023-11-25 22:58:58 +08:00 |
|
芋道源码
|
6be49dae3a
|
!60 未启动system模块,其他模块 【bpm\report等模块】,因依赖错误码组件无法启动服务
Merge pull request !60 from 陈晨成/master
|
2023-11-25 14:49:41 +00:00 |
|
YunaiV
|
5ca97b6d70
|
#I8I2EW 修复@PermitAll注解失效问题
|
2023-11-25 22:33:31 +08:00 |
|
芋道源码
|
516de93cd7
|
!67 #I8I2EW 修复@PermitAll注解失效问题,
Merge pull request !67 from 胡庆春/master2
|
2023-11-25 14:30:16 +00:00 |
|
YunaiV
|
2d9aa7a94a
|
websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息
|
2023-11-25 20:44:42 +08:00 |
|
huqingchun
|
7fd2ef7e8a
|
#I8I2EW 修复@PermitAll注解失效问题,
原因:@PermitAll注解方法的@RequestMapping未指定method时,PermitAll配置不生效,
解决方案:未指定method时将4个请求方法均加入result 结果
|
2023-11-25 10:13:02 +08:00 |
|
YunaiV
|
562f82580e
|
sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
|
2023-11-21 23:32:26 +08:00 |
|
YunaiV
|
ae14ff2f95
|
代码生成:主子表、树形表的实现
|
2023-11-17 20:46:02 +08:00 |
|
YunaiV
|
95d5fc4a58
|
bugfix:解决 Redis MQ 消息队列的类加载初始化问题
|
2023-11-08 08:30:05 +08:00 |
|
YunaiV
|
91832e2ae3
|
优化:默认只引入 mysql driver,减少打包大小
|
2023-11-06 21:26:05 +08:00 |
|
YunaiV
|
77e98bbb2d
|
三方登录:支持 saas 多租户配置
|
2023-11-04 22:10:58 +08:00 |
|
YunaiV
|
f353011d96
|
mq:修复 kafka 租户未传递的问题
|
2023-11-02 20:07:26 +08:00 |
|
YunaiV
|
1f12d253fd
|
mq:修复 KeyValue 不支持序列化,导致 rabbitmq 发送消息失败的问题
|
2023-11-02 19:53:35 +08:00 |
|
YunaiV
|
e21b8f977e
|
mq:改造支持 redis、rocketmq、rabbitmq、kafka 作为消息实现
|
2023-11-02 18:59:46 +08:00 |
|
YunaiV
|
2450d7afdc
|
mq:移除默认的 spring cloud stream 和 bus,使用原生的 spring-rocketmq、spring-kafka、spring-rabbitmq 替代,降低学习成本,提升使用灵活性。
|
2023-11-02 13:06:05 +08:00 |
|
YunaiV
|
80edb0e808
|
统一 boot 和 cloud 代码
|
2023-10-24 20:45:01 +08:00 |
|
YunaiV
|
e10f325843
|
统一 boot 和 cloud 代码
|
2023-10-24 18:48:12 +08:00 |
|
YunaiV
|
57330054de
|
统一 boot 和 cloud 代码
|
2023-10-24 13:59:20 +08:00 |
|
YunaiV
|
110b3476a8
|
bpm:跟进最新功能(驳回、加减签)
|
2023-10-24 08:40:34 +08:00 |
|
YunaiV
|
df2b1b45a4
|
pay:同步最新功能的代码(钱包、转账)
|
2023-10-24 08:00:01 +08:00 |
|
YunaiV
|
97103a8846
|
statistics:初始化
|
2023-10-23 19:40:29 +08:00 |
|
YunaiV
|
537d3421a8
|
trade:初始化
|
2023-10-23 09:48:38 +08:00 |
|
YunaiV
|
93715790ae
|
promotion:初始化项目
|
2023-10-22 22:25:26 +08:00 |
|
YunaiV
|
6653c074fa
|
product:初始化代码
|
2023-10-22 17:01:10 +08:00 |
|
YunaiV
|
625e62ef9d
|
system:同步多租户下,微信小程序、微信公众号,允许每个租户独立配置
|
2023-10-22 11:33:28 +08:00 |
|
wfy
|
7a303e5b45
|
土豆,fix:修复方法权限注解找不到认证器问题。
|
2023-10-20 13:35:42 +08:00 |
|
1351515658@qq.com
|
0bac17d6a6
|
optimize 错误码组件初始化不阻塞服务启动
|
2023-10-19 19:02:53 +08:00 |
|
xingyu
|
e74135c386
|
feat: remove swagger use springdoc
|
2023-09-25 18:42:43 +08:00 |
|
YunaiV
|
594834e66c
|
Merge branch 'master' of https://github.com/YunaiV/yudao-cloud
|
2023-09-24 23:36:35 +08:00 |
|
芋道源码
|
cfe86a31d7
|
Merge pull request #111 from dengyumin/patch-1
typo: Correcting typos
|
2023-09-24 09:47:51 +08:00 |
|
YunaiV
|
e7703c6f48
|
1. 移除 netty-all,减少依赖
2. 修复 xss 无法禁用的问题
|
2023-09-17 00:46:11 +08:00 |
|
YunaiV
|
3af88326f9
|
pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
|
2023-09-16 23:46:36 +08:00 |
|
YunaiV
|
3b9affe056
|
1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印
目的:优化启动速度
|
2023-09-16 18:10:18 +08:00 |
|
YunaiV
|
b80a928fec
|
优化多租户 Job 的实现,保持和 boot 版本尽量一致
|
2023-09-16 14:13:53 +08:00 |
|
YunaiV
|
9ec0ce48e2
|
优化 tenant 组件的注释
|
2023-09-16 14:06:31 +08:00 |
|
YunaiV
|
984bcc8885
|
默认禁用 resilience4j 依赖,保证启动速度
|
2023-09-16 13:15:29 +08:00 |
|
YunaiV
|
2769ee3635
|
默认禁用 resilience4j 依赖,保证启动速度
|
2023-09-16 12:01:56 +08:00 |
|
小民同学
|
f0dae8f1c6
|
typo: Correcting typos
|
2023-09-09 15:04:25 +08:00 |
|
YunaiV
|
4e56907919
|
引入 mybatis plus join 作为基类
|
2023-09-09 14:57:30 +08:00 |
|
luodz
|
4fe865e94e
|
为解决多租户时Redis缓存设置失效时间不生效问题,而将TimeoutRedisCacheManager作为TenantRedisCacheManager的父类。这里修改后让租户ID可以被传递。
|
2023-09-05 10:46:19 +08:00 |
|
luodz
|
f546d33f40
|
解决启用多租户时,使用Redis缓存,设置失效时间不生效的问题。
|
2023-09-05 10:41:44 +08:00 |
|
芋道源码
|
938f40d02d
|
!51 数据权限bugfix
Merge pull request !51 from sodkwhy/数据权限bugfix
|
2023-09-03 10:43:00 +00:00 |
|
YunaiV
|
247be4ce44
|
同步 https://github.com/YunaiV/ruoyi-vue-pro/pull/337
|
2023-09-03 18:33:59 +08:00 |
|
YunaiV
|
c4cbb1db42
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/594/files
|
2023-09-03 17:58:25 +08:00 |
|
YunaiV
|
f82a323508
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/586/
|
2023-08-27 11:19:27 +08:00 |
|
YunaiV
|
bb34cdea2c
|
同步 https://github.com/YunaiV/ruoyi-vue-pro/pull/326
|
2023-08-27 10:53:12 +08:00 |
|
YunaiV
|
c0d7235cba
|
同步 https://github.com/YunaiV/ruoyi-vue-pro/pull/332
|
2023-08-27 10:50:12 +08:00 |
|
yinli
|
09d4d56304
|
数据权限bugfix
|
2023-08-22 17:46:49 +08:00 |
|
YunaiV
|
c28ef89a78
|
!562 优化 redisCache
|
2023-08-11 21:46:44 +08:00 |
|
YunaiV
|
58d70ace8a
|
!558 支付模块微信App统一下单返回值解析错误
|
2023-08-11 19:10:48 +08:00 |
|
YunaiV
|
abe05db277
|
fix: banner 日志打印
|
2023-08-05 16:35:20 +08:00 |
|
YunaiV
|
2b9973d374
|
支付中心:增加模拟支付,方便开发调试
|
2023-07-29 11:41:27 +08:00 |
|
YunaiV
|
0b17298963
|
彻底移除 RedisKeyDefine
|
2023-07-29 07:16:16 +08:00 |
|
YunaiV
|
8b704ff483
|
使用 Redis 缓存,替代本地缓存
|
2023-07-29 06:37:27 +08:00 |
|
YunaiV
|
7f7a3c589b
|
移除 Dubbo 依赖,Dubbo 在国内使用率太低
|
2023-07-28 19:20:27 +08:00 |
|
YunaiV
|
3930fd739a
|
修复记录操作时,会存在调用异常的情况
|
2023-07-28 13:57:10 +08:00 |
|
YunaiV
|
0ff2f9783d
|
mp 服务可正常启动
|
2023-07-27 23:11:06 +08:00 |
|
YunaiV
|
9a18483482
|
2. 增加 mp 服务
|
2023-07-27 19:55:34 +08:00 |
|
YunaiV
|
9ba06ec07e
|
对齐 boot 与 cloud 的代码
|
2023-07-27 13:59:20 +08:00 |
|
YunaiV
|
0feb865ef0
|
对齐 boot 与 cloud 的代码
|
2023-07-27 13:01:17 +08:00 |
|
YunaiV
|
6236b4a5ab
|
对齐 boot 与 cloud 的代码
|
2023-07-27 00:17:37 +08:00 |
|
YunaiV
|
c6595afb01
|
对齐 boot 与 cloud 的代码
|
2023-07-26 23:27:18 +08:00 |
|
YunaiV
|
94b4a0f93c
|
对齐 boot 与 cloud 的代码
|
2023-07-26 22:37:45 +08:00 |
|