Commit Graph

348 Commits

Author SHA1 Message Date
YunaiV
b2ec898932 🔥 2.0.0 版本发布准备~ 2024-01-26 20:36:38 +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
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
efc9649fa5 增加 sms/tenant/senstiveword 模块的单测覆盖率 2023-12-04 13:14:25 +08:00
YunaiV
49aee82b6a 增加 social 模块的单测覆盖率 2023-12-04 09:54:56 +08:00
YunaiV
af41069b50 增加 permission 模块的单测覆盖率 2023-12-03 21:55:25 +08:00
YunaiV
18785550da 增加 dept 模块的单测覆盖率 2023-12-03 21:26:51 +08:00
YunaiV
f806995de3 增加 dict 模块的单测覆盖率 2023-12-03 21:15:01 +08:00
YunaiV
b93ed9efbb 🔧 简化 user 模块的 VO 2023-12-03 01:03:07 +08:00
YunaiV
5cce6a510e 🔧 简化 tenant 模块的 VO 2023-12-02 23:43:04 +08:00
YunaiV
066ba7ece8 🔧 简化 social 模块的 VO 2023-12-02 23:01:20 +08:00
YunaiV
2014af1c0b 🔧 简化 sms 模块的 VO 2023-12-02 22:39:42 +08:00
YunaiV
5c50b5ff13 🔧 简化 sensitiveWord 模块的 VO 2023-12-02 21:59:22 +08:00
YunaiV
df2bcb267d 🔧 简化 permission 模块的 VO 2023-12-02 21:47:07 +08:00
YunaiV
70bd92bcb4 🔧 简化 oauth2 模块的 VO 2023-12-02 20:48:57 +08:00
YunaiV
2ba43bede8 🔧 简化 notify 模块的 VO 2023-12-02 20:25:19 +08:00
YunaiV
27710435b2 🔧 简化 notice 模块的 VO 2023-12-02 20:07:50 +08:00
YunaiV
ce42bf7826 🔧 简化 mail 模块的 VO 2023-12-02 19:55:10 +08:00
YunaiV
80afe88dad 🔧 简化 loginLog 和 operateLog 模块的 VO 2023-12-02 19:25:32 +08:00
YunaiV
417f7cd877 🔧 简化 errorCode 模块的 VO 2023-12-02 18:40:51 +08:00
YunaiV
7b97d1a3e4 🔧 简化 dictType 和 dictData 模块的 VO 2023-12-02 18:21:33 +08:00
YunaiV
2802b77148 🔧 简化 post 和 dept 模块的 VO 2023-12-02 10:19:11 +08:00
YunaiV
f8991ba134 同步 ruoyi-vue-pro 差异代码 2023-11-30 21:23:26 +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
芋道源码
28d3356467
!68 #I83A66 修复MP配置文件错误
Merge pull request !68 from 胡庆春/master3
2023-11-25 14:39:48 +00:00
芋道源码
50817cec45
!69 fix(system): 修复更新账号时岗位为空时发生的空指针异常
Merge pull request !69 from oc/master
2023-11-25 14:23:44 +00:00
YunaiV
2d9aa7a94a websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2023-11-25 20:44:42 +08:00
oc
fb479d7d79 fix(system): 修复更新账号时岗位为空时发生的空指针异常 2023-11-25 18:25:03 +08:00
huqingchun
d047424b98 #I83A66 修复MP配置文件错误
原因:类型别名路径配置错误,导致根据类型别名获取类型失败
解决方案:统一修改类型别名配置路径,均基于当前模块基础包匹配别名包
2023-11-25 12:25:45 +08:00
YunaiV
562f82580e sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装 2023-11-21 23:32:26 +08:00
YunaiV
e0bac57c14 代码生成:优化前端模版的 package 路径 2023-11-18 17:42:24 +08:00
YunaiV
ae14ff2f95 代码生成:主子表、树形表的实现 2023-11-17 20:46:02 +08:00
YunaiV
0837f9adbc 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 21:24:45 +08:00
YunaiV
77e98bbb2d 三方登录:支持 saas 多租户配置 2023-11-04 22:10:58 +08:00
YunaiV
78869a9004 mq:增加 redis、rocketmq、rabbitmq、kafka 配置项 2023-11-02 19:37:53 +08:00
YunaiV
2450d7afdc mq:移除默认的 spring cloud stream 和 bus,使用原生的 spring-rocketmq、spring-kafka、spring-rabbitmq 替代,降低学习成本,提升使用灵活性。 2023-11-02 13:06:05 +08:00
YunaiV
02693836b2 mq:默认使用 event 替代 spring cloud stream 2023-11-02 12:57:25 +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
e850e39e80 统一 boot 和 cloud 代码 2023-10-24 14:17:50 +08:00
YunaiV
6d5b066ae6 统一 boot 和 cloud 代码 2023-10-24 14:07: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
b133cfa2a8 mall:完善 cloud 的 api 调用 2023-10-24 12:24:02 +08:00
YunaiV
110b3476a8 bpm:跟进最新功能(驳回、加减签) 2023-10-24 08:40:34 +08:00
YunaiV
9fc31ac2ae 修复单元测试的报错 2023-10-24 00:02:18 +08:00
YunaiV
08c5248757 cloud:完善 system、infra、bpm 的 api swagger 注解 2023-10-22 14:30:50 +08:00
YunaiV
625e62ef9d system:同步多租户下,微信小程序、微信公众号,允许每个租户独立配置 2023-10-22 11:33:28 +08:00
芋道源码
e4b55590fc
!59 bug 修复1.82版本升级导致的短信模板无法修改问题
Merge pull request !59 from Fanjc/N/A
2023-10-19 16:30:58 +00:00
YunaiV
0db6a80044 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/665/ 修复 2023-10-19 23:28:57 +08:00
Fanjc
9341c1891f
bug 修复1.82版本升级导致的短信模板无法修改问题
Signed-off-by: Fanjc <271366833@qq.com>
2023-10-19 03:13:36 +00:00
YunaiV
aadea6d1ff 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/636/files 2023-10-14 17:54:42 +08:00
YunaiV
9cba937fe7 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:37 +08:00
xingyu
4ce1280686 fix: 多次引入 Schema 2023-09-25 18:43:20 +08:00
YunaiV
8eb482024d 1.8.2 发版 2023-09-24 23:35:03 +08:00
YunaiV
3af88326f9 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 23:46:36 +08:00
YunaiV
f0897cb435 sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 23:37:08 +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
a4c2061113 优化多租户 Job 的实现,保持和 boot 版本尽量一致 2023-09-16 14:17:25 +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
633c277228 同步 https://github.com/YunaiV/ruoyi-vue-pro/pull/342 2023-09-09 10:15:16 +08:00
YunaiV
f2b7c0483c 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2023-09-06 20:42:01 +08:00
YunaiV
8bd2f64024 同步 v1.8.1 SQL 脚本 2023-09-03 19:15:05 +08:00
YunaiV
f82a323508 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/586/ 2023-08-27 11:19:27 +08:00
YunaiV
f9c0f76ada 修复租户套餐修改时,查询角色报错问题 2023-08-11 22:24:11 +08:00
YunaiV
2201a3ad0f !557 修改创建菜单时permission为空,缓存KEY 为空的BUG 2023-08-11 19:32:40 +08:00
YunaiV
f1924a003a fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-05 14:49:28 +08:00
芋道源码
eeeac1a627
!49 修复MailAccountService 更新/删除缓存未清空
Merge pull request !49 from ZJY/fix_redisCache
2023-08-05 06:42:25 +00:00
芋道源码
dbcfab3bd8
!47 对齐ruoyi-vue-pro彩色日志,修复菜单ids为空时select查询菜单列表报错
Merge pull request !47 from babylazsss/master
2023-08-05 06:42:13 +00:00
zhangjiayu
2b5bb4e121 fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-03 18:13:59 +08:00
jhaol
591242c76c feat: 添加docker-compose.yml、添加system、infra模块健康检查接口 2023-08-03 11:55:16 +08:00
babylazsss
59450a4656 fix: 修复菜单ids为空时select查询菜单列表报错 2023-08-02 21:44:22 +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
91e0af0944 短信渠道的本地缓存,使用 Job 轮询,替代 MQ 广播 2023-07-29 08:59:15 +08:00
YunaiV
e205129943 敏感词的本地缓存,使用 Job 轮询,替代 MQ 广播 2023-07-29 07:32:06 +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
9ba06ec07e 对齐 boot 与 cloud 的代码 2023-07-27 13:59:20 +08:00
YunaiV
0feb865ef0 对齐 boot 与 cloud 的代码 2023-07-27 13:01:17 +08:00
YunaiV
93c123633e 对齐 boot 与 cloud 的代码 2023-07-26 23:57:22 +08:00
YunaiV
c03c32d01b 对齐 boot 与 cloud 的代码 2023-07-26 23:56:06 +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
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
bd7fee0a88 #540 修复部分问题,升级依赖 2023-07-25 19:51:44 +08:00
YunaiV
60d5d942c6 修复单元测试报错 2023-07-24 07:03:19 +08:00
YunaiV
0145b5abee 修复头像上传不支持 PUT 类型的方法 2023-06-17 14:47:05 +08:00
芋道源码
0930c1ff73
!35 头像上传,VUE3后端界面中使用的是request.upload,对应的方法是post
Merge pull request !35 from 让无线电飞BG8GLR/N/A
2023-06-17 06:25:08 +00:00
YunaiV
fb60881aa7 Merge branch 'master' of https://github.com/YunaiV/yudao-cloud 2023-06-17 14:21:29 +08:00
YunaiV
20cb26fb05 !513 优化代码生成498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题 2023-06-17 12:36:05 +08:00
liujianliang
518dd30fb2 修复发送时间sendTime字段类型错误 2023-06-04 23:46:10 +08:00
让无线电飞BG8GLR
0ef82437ca
头像上传,VUE3后端界面中使用的是request.upload,对应的方法是post
头像上传,VUE3后端界面中使用的是request.upload,对应的方法是post

Signed-off-by: 让无线电飞BG8GLR <atuchina@sina.com>
2023-06-01 04:58:32 +00:00
YunaiV
6d13b43593 修复邮件日志 sendTime 类型不一致(应该为 LocalDateTime) 2023-05-29 22:24:22 +08:00
YunaiV
5d0a1a6fb5 修复邮件日志 sendTime 类型不一致(应该为 LocalDateTime) 2023-05-29 00:04:39 +08:00
YunaiV
2d160aeacd 修复 mail 邮件发送模块代码与配置文件不一致 2023-05-21 23:51:19 +08:00
YunaiV
dc4f17cb4f !485 发送邮件逻辑优化,邮件标题支持模版参数 2023-05-21 23:37:38 +08:00
YunaiV
9832947dfa !457 【轻量级 PR】:解决敏感词导出和字典数据编辑保存的两个BUG 2023-04-15 09:41:07 +08:00
YunaiV
ec5007c3b9 !454 vben 版本代码生成器 2023-04-14 23:01:38 +08:00
YunaiV
c5b6a2a53d 移除多余的 Spring Boot Admin 配置 2023-04-09 17:26:15 +08:00
YunaiV
83d2e79f96 修复租户名的重复问题 + 配合周建进行测试所提bug的后端修改 2023-04-09 11:03:33 +08:00
YunaiV
984e9e7d27 优化 bootstrap-local.yaml 的注释说明 2023-04-02 19:05:39 +08:00
芋道源码
4e0bb86b68
!28 fix system-server package,可直接运行
Merge pull request !28 from lovezhike/master
2023-04-02 05:26:12 +00:00
YunaiV
dbf9591b3b !438 fix: 短信验证码登录问题 2023-04-02 12:09:51 +08:00
lovezhike
d3461f58bc 修改system-server连接NACOS的配置,创建namespace需要是指定命名空间ID为dev 2023-03-21 17:48:17 +08:00
lovezhike
b2e9637587 修改system-server连接NACOS的配置,namespace需要是具体命名空间ID,不能是名称 2023-03-21 17:37:49 +08:00
lovezhike
527b217557 修复 system server 直接运行 2023-03-14 22:36:46 +08:00
YunaiV
5f96b50bad 默认配置下,本地 local 环境的定时任务是关闭的,避免控制台一直报错报错。 2023-03-05 22:38:04 +08:00
YunaiV
00064607b8 降低 local 环境的 RocketMQ 重连频率,因为可能本地没有启动。 2023-03-05 22:20:13 +08:00
YunaiV
00c95e33b3 #416 用户详情不显示所属部门部门 2023-03-05 14:59:02 +08:00
YunaiV
5016b76b04 合并最新 master 代码 2023-03-04 21:51:09 +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
a58dc7b543 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	sql/mysql/optional/vue3-menu.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceTest.java
2023-02-10 23:01:08 +08:00
YunaiV
90224975fc 菜单新增 alwaysShow 总是展示、componentName 组件名 2023-02-10 23:00:12 +08:00
gaibu
e28d73a76c feat: 临时提交 2023-02-10 15:42:01 +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
f620bc3fec infra:完善 config 的单元测试 2023-02-04 00:57:16 +08:00
YunaiV
df65b88fe9 system:简化 mapper 的实现 2023-02-04 00:34:03 +08:00
YunaiV
f6d259b620 system:将 biz 的方法名的负数都换成 List 2023-02-04 00:26:53 +08:00
gaibu
6f3e026f4c feat: 修改部分 swagger 注解 2023-02-04 00:19:40 +08:00
YunaiV
d5fe4a3c89 system:将 api 的方法名的负数都换成 List 2023-02-04 00:15:32 +08:00
YunaiV
85aae8587e system:将 check 方法,统一成 validate 方法 2023-02-04 00:12:26 +08:00
YunaiV
bd5706bfa1 完善 notify 单元测试 2023-02-04 00:02:46 +08:00
YunaiV
4d42b8834b 完善 mail 单元测试 2023-02-03 23:39:38 +08:00
YunaiV
5619441f61 完善 AdminUserServiceImpl 单元测试 2023-02-03 22:09:55 +08:00
YunaiV
6474fba923 完善 TenantServiceImpl 单元测试 2023-02-02 23:47:25 +08:00
YunaiV
9c216e5b7d 完善 TenantPackageServiceImpl 单元测试 2023-02-02 23:36:03 +08:00
YunaiV
ac25dbe286 完善 SmsCodeServiceImpl 单元测试 2023-02-02 23:16:43 +08:00
YunaiV
5a18223bc3 完善 SmsSendServiceImpl 单元测试 2023-02-02 21:15:31 +08:00
YunaiV
0d81431541 完善 SmsLogServiceImpl 单元测试 2023-02-02 21:08:40 +08:00
YunaiV
36c8448ed5 完善 SmsChannelServiceImpl 单元测试 2023-02-02 21:05:42 +08:00
YunaiV
458a042701 完善 SensitiveWordServiceImpl 单元测试 2023-02-02 21:03:00 +08:00
YunaiV
9185e5d2a0 完善 RoleServiceImpl 单元测试 2023-02-02 09:13:43 +08:00
YunaiV
71550a3c0e 完善 MenuServiceImplTest 单元测试 2023-02-01 23:33:44 +08:00