YunaiV
|
446935fc72
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
|
2024-01-20 00:56:22 +08:00 |
|
YunaiV
|
5693ebeb87
|
✨ 增加 jakartaPackage 标识，统一 Spring Boot 2.X 和 3.X 代码生成的模版
|
2024-01-20 00:55:43 +08:00 |
|
YunaiV
|
478d57f2a1
|
✨ 降低 podam 到 7.2.11，解决 Spring Boot 2.X 单测报错问题
|
2024-01-20 00:20:47 +08:00 |
|
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
|
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
|
1c409b8a6b
|
Update Dockerfile base image to 8-jre
|
2023-12-30 11:28:19 +08:00 |
|
YunaiV
|
55d5b81360
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-30 11:27:50 +08:00 |
|
芋道源码
|
a7fcf268cf
|
Merge pull request #120 from csgear/csgear/dockerfile
Update Dockerfile base image to 21-jre
|
2023-12-30 11:27:26 +08:00 |
|
YunaiV
|
b33e0f7970
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-29 22:24:02 +08:00 |
|
YunaiV
|
479062e599
|
🐛 文件路径 url 中文解码问题
|
2023-12-29 22:23:51 +08:00 |
|
Xiaojun Yang
|
8e97e38050
|
Update Dockerfile base image to 21-jre
|
2023-12-09 09:08:04 -05: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 |
|
YunaiV
|
6210bde1de
|
✅ 增加 codegen 模块的单测覆盖率
|
2023-12-05 20:00:20 +08:00 |
|
YunaiV
|
e4c62c34b3
|
✅ 增加 infra logger 模块的单测覆盖率
|
2023-12-04 20:43:32 +08:00 |
|
YunaiV
|
930cdce7a0
|
🔧 简化 errorLog 和 accessLog 模块的 VO
|
2023-12-03 18:32:40 +08:00 |
|
YunaiV
|
2a52f61e01
|
🔧 简化 file 模块的 VO
|
2023-12-03 10:33:52 +08:00 |
|
YunaiV
|
b512a23465
|
🔧 简化 dataSourceConfig 模块的 VO
|
2023-12-03 10:07:00 +08:00 |
|
YunaiV
|
f91d419b7f
|
🔧 简化 config 模块的 VO
|
2023-12-03 09:57:41 +08:00 |
|
YunaiV
|
f8991ba134
|
同步 ruoyi-vue-pro 差异代码
|
2023-11-30 21:23:26 +08:00 |
|
芋道源码
|
28d3356467
|
!68 #I83A66 修复MP配置文件错误
Merge pull request !68 from 胡庆春/master3
|
2023-11-25 14:39:48 +00:00 |
|
YunaiV
|
2314806d82
|
简化 yudao-ui 目录
|
2023-11-25 22:06:08 +08:00 |
|
YunaiV
|
2d9aa7a94a
|
websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息
|
2023-11-25 20:44:42 +08:00 |
|
huqingchun
|
d047424b98
|
#I83A66 修复MP配置文件错误
原因：类型别名路径配置错误，导致根据类型别名获取类型失败
解决方案：统一修改类型别名配置路径，均基于当前模块基础包匹配别名包
|
2023-11-25 12:25:45 +08:00 |
|
YunaiV
|
e0bac57c14
|
代码生成：优化前端模版的 package 路径
|
2023-11-18 17:42:24 +08:00 |
|
YunaiV
|
ae14ff2f95
|
代码生成：主子表、树形表的实现
|
2023-11-17 20:46:02 +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
|
e850e39e80
|
统一 boot 和 cloud 代码
|
2023-10-24 14:17:50 +08:00 |
|
YunaiV
|
57330054de
|
统一 boot 和 cloud 代码
|
2023-10-24 13:59:20 +08:00 |
|
YunaiV
|
51f96686f8
|
统一 boot 和 cloud 代码
|
2023-10-24 13:39:31 +08:00 |
|
YunaiV
|
6ec18e8942
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/677/files
|
2023-10-19 23:57:25 +08:00 |
|
YunaiV
|
e8da08a2ea
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/675/files 修复
|
2023-10-17 23:17:26 +08:00 |
|
xingyu
|
4ce1280686
|
fix: 多次引入 Schema
|
2023-09-25 18:43:20 +08:00 |
|
YunaiV
|
91ab421b65
|
https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/618
|
2023-09-19 23:19:32 +08:00 |
|
YunaiV
|
6863041251
|
修复 infra 由于 spring boot admin 报错的问题
|
2023-09-19 21:00:15 +08:00 |
|
YunaiV
|
0162933ce7
|
fileConfig 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效
|
2023-09-16 23:39:41 +08:00 |
|
YunaiV
|
3b9affe056
|
1. 简化 JsonUtils 初始化方式，去掉 BeanPostProcessor
2. 减少日志打印
目的：优化启动速度
|
2023-09-16 18:10:18 +08:00 |
|
YunaiV
|
be7ee3e447
|
1. 减少 mybatis 日志打印
2. 降低 local 环境的初始连接
目的：提升项目的启动速度
|
2023-09-16 17:05:11 +08:00 |
|
YunaiV
|
4fedb6be0b
|
默认禁用 spring boot admin 的启动，提升项目的启动速度
|
2023-09-16 15:43:23 +08:00 |
|
YunaiV
|
54df71b900
|
默认禁用 spring data redis repositories，一方面没用到，一方面提高启动速度
|
2023-09-16 13:29:18 +08:00 |
|
YunaiV
|
1123e6f1e4
|
修复 knife4j get 参数无法正确展示的问题
|
2023-09-09 15:04:15 +08:00 |
|
YunaiV
|
f2b7c0483c
|
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
|
2023-09-06 20:42:01 +08:00 |
|
YunaiV
|
866c21a624
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/565/files
|
2023-09-03 18:01:20 +08:00 |
|
芋道源码
|
dbcfab3bd8
|
!47 对齐ruoyi-vue-pro彩色日志,修复菜单ids为空时select查询菜单列表报错
Merge pull request !47 from babylazsss/master
|
2023-08-05 06:42:13 +00:00 |
|
jhaol
|
591242c76c
|
feat: 添加docker-compose.yml、添加system、infra模块健康检查接口
|
2023-08-03 11:55:16 +08:00 |
|
babylazsss
|
2f7c306c9d
|
fix: 统一各模块日志彩色打印
|
2023-08-02 21:32:41 +08:00 |
|
LuDaShi
|
af4f8ef0dd
|
搞了几个Dockerfile文件，希望大佬弄个docker-compose.yml出来
|
2023-08-01 18:29:49 +08:00 |
|
YunaiV
|
ca886c2791
|
文件配置的本地缓存，使用 Job 轮询，替代 MQ 广播
|
2023-07-29 09:10:42 +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
|
0feb865ef0
|
对齐 boot 与 cloud 的代码
|
2023-07-27 13:01:17 +08:00 |
|
YunaiV
|
6236b4a5ab
|
对齐 boot 与 cloud 的代码
|
2023-07-27 00:17:37 +08:00 |
|
YunaiV
|
93c123633e
|
对齐 boot 与 cloud 的代码
|
2023-07-26 23:57:22 +08:00 |
|
YunaiV
|
94b4a0f93c
|
对齐 boot 与 cloud 的代码
|
2023-07-26 22:37:45 +08:00 |
|
YunaiV
|
9e01afc1da
|
批量将 required = true 替换成 requiredMode = Schema.RequiredMode.REQUIRED
|
2023-07-26 20:52:15 +08:00 |
|
YunaiV
|
496a81393b
|
修复 Spring Cloud Bus RocketMQ 无法广播消费的问题
|
2023-07-26 07:29:35 +08:00 |
|
YunaiV
|
e502fe2921
|
!525 local配置文件，master数据库pg连接串的数据库名由slave引用改为master
|
2023-07-25 20:14:31 +08:00 |
|
YunaiV
|
2c915af2b4
|
!533 vue3代码生成器表单Editor属性修正为v-model
|
2023-07-25 20:09:24 +08:00 |
|
YunaiV
|
bd7fee0a88
|
#540 修复部分问题，升级依赖
|
2023-07-25 19:51:44 +08:00 |
|
芋道源码
|
d68fa54e55
|
!38 修改生成PageReqVO和ExportReqVO实体，时间类型为Date而不是LocalDateTime的错误问题
Merge pull request !38 from jiaohongtao/master
|
2023-07-02 05:14:46 +00:00 |
|
YunaiV
|
eb44015b74
|
!513 优化代码生成
|
2023-06-17 12:22:12 +08:00 |
|
jiaohongtao
|
333eecae77
|
修改生成PageReqVO和ExportReqVO实体，时间类型为Date而不是LocalDateTime的错误问题
Signed-off-by: jiaohongtao <jiaohongtaovip@163.com>
|
2023-06-16 09:09:51 +00:00 |
|
YunaiV
|
e0e814f38a
|
!470 fix: 代码生成：解决Java代码DO和VO中的警告
|
2023-05-15 21:57:47 +08:00 |
|
YunaiV
|
b4bf529179
|
!458 【Fix Bug】”占位“文件影响改包工具运行
|
2023-04-22 19:26:28 +08:00 |
|
YunaiV
|
ac5299a00b
|
!462 fix: 代码生成：Vue3标准模板问题修复。
|
2023-04-22 19:01:20 +08:00 |
|
YunaiV
|
ec5007c3b9
|
!454 vben 版本代码生成器
|
2023-04-14 23:01:38 +08:00 |
|
YunaiV
|
ca9656a40f
|
代码生成，支持配置前端 UI 类型
|
2023-04-13 08:50:22 +08:00 |
|
YunaiV
|
c5b6a2a53d
|
移除多余的 Spring Boot Admin 配置
|
2023-04-09 17:26:15 +08:00 |
|
YunaiV
|
b56c3b0e00
|
Merge remote-tracking branch 'origin/master'
|
2023-04-09 16:49:25 +08:00 |
|
YunaiV
|
7f20cdecac
|
增加 JobController，引导使用 XXL-Job
|
2023-04-09 16:49:18 +08:00 |
|
芋道源码
|
4d11b76b39
|
!32 修复代码生成模板中未更新至swagger3的bug
Merge pull request !32 from sukun/master
|
2023-04-09 04:59:53 +00:00 |
|
YunaiV
|
83d2e79f96
|
修复租户名的重复问题 + 配合周建进行测试所提bug的后端修改
|
2023-04-09 11:03:33 +08:00 |
|
YunaiV
|
95aeee54e7
|
修复配置不可见时，返回 null 的问题
|
2023-04-08 00:13:53 +08:00 |
|
14772
|
251c217a40
|
修复代码生成模板中未更新至swagger3的bug
|
2023-04-04 16:53:35 +08:00 |
|
YunaiV
|
9f6d8d2139
|
去除 CodegenTableDO 的自增标识
|
2023-04-02 19:22:41 +08:00 |
|
芋道源码
|
61394e577f
|
!20 代码生成模块
Merge pull request !20 from yk_9546/master
|
2023-04-02 11:22:06 +00:00 |
|
YunaiV
|
984e9e7d27
|
优化 bootstrap-local.yaml 的注释说明
|
2023-04-02 19:05:39 +08:00 |
|
lovezhike
|
803e3eda71
|
修复infra、bpm、report 的server直接运行
|
2023-03-15 08:38:06 +08:00 |
|
YunaiV
|
6d5f833c29
|
修复生成代码测试里面的时间问题（buildBetweenTime方法） #228
|
2023-03-11 10:19:11 +08:00 |
|
YunaiV
|
4d14bdffad
|
默认配置下，本地 local 环境的定时任务是关闭的，避免控制台一直报错报错。
|
2023-03-05 22:37:26 +08:00 |
|
YunaiV
|
00064607b8
|
降低 local 环境的 RocketMQ 重连频率，因为可能本地没有启动。
|
2023-03-05 22:20:13 +08:00 |
|
YunaiV
|
27592b4f4a
|
Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud into feat/springdoc
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthMenuRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java
|
2023-03-04 21:48:23 +08:00 |
|
YunaiV
|
59c6963f7c
|
优化 Swagger 的版本依赖，避免冲突
|
2023-03-04 15:05:58 +08:00 |
|
YunaiV
|
220d727605
|
修复代码生成器的同步报错问题
|
2023-02-19 16:34:51 +08:00 |
|
yangkai
|
f34f61cc25
|
修复代码生成处infra_codegen_table插入未返回id导致报错问题
|
2023-02-14 14:15:19 +08:00 |
|
gaibu
|
e28d73a76c
|
feat: 临时提交
|
2023-02-10 15:42:01 +08:00 |
|
gaibu
|
708d7db320
|
Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud into feat/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
|
2023-02-10 10:46:45 +08:00 |
|
YunaiV
|
b0409fc779
|
新增报表设计器、大屏设计器
|
2023-02-08 23:20:11 +08:00 |
|
gaibu
|
65ee76a79f
|
Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud into feat/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
|
2023-02-05 21:28:49 +08:00 |
|
gaibu
|
8986299fea
|
feat: 修改剩余部分 swagger 注解
|
2023-02-04 23:59:25 +08:00 |
|
YunaiV
|
7ef6209c13
|
infra：完善 DatabaseTableServiceImpl 单元测试
|
2023-02-04 09:57:40 +08:00 |
|
YunaiV
|
d5bd499899
|
infra：标准化代码
|
2023-02-04 09:16:33 +08:00 |
|
YunaiV
|
dd1ed7b81e
|
infra：完善 logger 的单元测试
|
2023-02-04 09:10:18 +08:00 |
|
YunaiV
|
ee7cb5055c
|
infra：完善 file 的单元测试
|
2023-02-04 07:50:45 +08:00 |
|
YunaiV
|
ac661150d7
|
infra：完善 dataSource 的单元测试
|
2023-02-04 01:15:09 +08:00 |
|
YunaiV
|
f620bc3fec
|
infra：完善 config 的单元测试
|
2023-02-04 00:57:16 +08:00 |
|