合并主线

648540858

2022-10-17 f6320c7dd3dfd25e98bb63f41d79a33af5009a93

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java

@@ -56,23 +56,7 @@
    private IVideoManagerStorage storager;

    @Autowired
    private DeferredResultHolder deferredResultHolder;

    @Autowired
    private CatalogDataCatch catalogDataCatch;

    @Autowired
    private SipConfig config;

    @Autowired
    private EventPublisher publisher;

    //by brewswang
    @Autowired
    private UserSetting userSetting;

    @Autowired
    private IRedisCatchStorage redisCatchStorage;

    @Qualifier("taskExecutor")
    @Autowired
@@ -153,6 +137,7 @@

                    }
                }
                taskQueueHandlerRun = false;
            });
        }