Browse Source

Merge remote-tracking branch 'origin/master' into feature/vue3

xingyu4j 2 years ago
parent
commit
144488cb74

+ 0 - 1
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/config/YudaoMQAutoConfiguration.java

@@ -78,7 +78,6 @@ public class YudaoMQAutoConfiguration {
      * Redis Stream 的 xreadgroup 命令:https://www.geek-book.com/src/docs/redis/redis/redis.io/commands/xreadgroup.html
      * Redis Stream 的 xreadgroup 命令:https://www.geek-book.com/src/docs/redis/redis/redis.io/commands/xreadgroup.html
      */
      */
     @Bean(initMethod = "start", destroyMethod = "stop")
     @Bean(initMethod = "start", destroyMethod = "stop")
-    @Async // 异步化,可降低 5 秒左右的启动时间
     public StreamMessageListenerContainer<String, ObjectRecord<String, String>> redisStreamMessageListenerContainer(
     public StreamMessageListenerContainer<String, ObjectRecord<String, String>> redisStreamMessageListenerContainer(
             RedisMQTemplate redisMQTemplate, List<AbstractStreamMessageListener<?>> listeners) {
             RedisMQTemplate redisMQTemplate, List<AbstractStreamMessageListener<?>> listeners) {
         RedisTemplate<String, ?> redisTemplate = redisMQTemplate.getRedisTemplate();
         RedisTemplate<String, ?> redisTemplate = redisMQTemplate.getRedisTemplate();

+ 1 - 1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/TradeCartController.java

@@ -60,7 +60,7 @@ public class TradeCartController {
 
 
     @DeleteMapping("/delete")
     @DeleteMapping("/delete")
     @ApiOperation("删除购物车商品")
     @ApiOperation("删除购物车商品")
-    @ApiImplicitParam(name = "skuId", value = "商品 SKU 编号的数组", required = true, example = "1024,2048", dataTypeClass = List.class)
+    @ApiImplicitParam(name = "skuIds", value = "商品 SKU 编号的数组", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthenticated
     @PreAuthenticated
     public CommonResult<Boolean> deleteCartItem(@RequestParam("skuIds") List<Long> skuIds) {
     public CommonResult<Boolean> deleteCartItem(@RequestParam("skuIds") List<Long> skuIds) {
         cartService.deleteCartItems(getLoginUserId(), skuIds);
         cartService.deleteCartItems(getLoginUserId(), skuIds);