Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrderRefundsService.java

 package com.liquidnet.service.dragon.service;
 
 public interface IDragonOrderRefundsService {
+
+    void sendRedisQueue();
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/pom.xml

@@ -18,12 +18,6 @@
             <artifactId>liquidnet-common-cache-redis</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- other -->
         <dependency>
             <groupId>com.liquidnet</groupId>

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/config/DragonWebMvcConfig.java

-package com.liquidnet.service.dragon.config;
-
-import com.liquidnet.common.web.config.WebMvcConfig;
-import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-
-@Configuration
-public class DragonWebMvcConfig extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
-
-    @Override
-    protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
-        super.addInterceptors(registry);
-    }
-}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/config/RedisStreamConfig.java

+package com.liquidnet.service.dragon.config;
+
+import com.liquidnet.service.dragon.receiver.RedisReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+@Configuration
+public class RedisStreamConfig {
+
+    @Autowired
+    private RedisReceiver redisReceiver;
+
+    @Bean
+    public Subscription subscription(RedisConnectionFactory factory){
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofSeconds(1))
+                .build();
+        var listenerContainer = StreamMessageListenerContainer.create(factory,options);
+        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon","dragon_pay"),
+                StreamOffset.create("dragon", ReadOffset.lastConsumed()),redisReceiver);
+        listenerContainer.start();
+        return subscription;
+    }
+}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/RefundController.java

 package com.liquidnet.service.dragon.controller;
 
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.service.IDragonOrderRefundsService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("refund")
 public class RefundController {
+
+    @Autowired
+    IDragonOrderRefundsService orderRefundsService;
+
+    @PostMapping("pre")
+    @ApiOperation("发送测试redis")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> checkCanOrder() {
+        orderRefundsService.sendRedisQueue();
+        return ResponseDto.success();
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/receiver/RedisReceiver.java

+package com.liquidnet.service.dragon.receiver;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.data.redis.stream.StreamListener;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class RedisReceiver implements StreamListener<String, MapRecord<String, String, String>> {
+//    @Override
+//    public void onMessage(Message message, byte[] pattern) {
+//        RedisSerializer serializer = new JdkSerializationRedisSerializer();
+//        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+//        //接收的topic
+//        String channel = stringRedisSerializer.deserialize(message.getChannel());
+//        System.out.println("INFO CHANNEL => "+channel);
+//        //消息的POJO
+//        Object o = serializer.deserialize(message.getBody());
+//        System.out.println("INFO MESSAGE => "+o);
+//    }
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.info("接受到来自redis的消息");
+        System.out.println("message id "+message.getId());
+        System.out.println("stream "+message.getStream());
+        System.out.println("body "+message.getValue());
+    }
+}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

 package com.liquidnet.service.dragon.service.impl;
 
 import com.liquidnet.service.dragon.service.IDragonOrderRefundsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+
+@Service
 public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService {
+
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+    @Override
+    public void sendRedisQueue() {
+        try {
+            stringRedisTemplate.convertAndSend("msg2", "测试 redis 订阅信息2");
+
+            HashMap<String ,String> map = new HashMap<>();
+            map.put("message","测试 redis 订阅信息1");
+            MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey("dragon");
+            stringRedisTemplate.opsForStream().add(record);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }