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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

 fanli/src/main/java/com/yeshi/fanli/util/cmq/DouYinDeviceActiveCMQManager.java

@@ -41,10 +41,10 @@
      cmqUtil.sendMsg(DOUYIN_DEVICE_ACTIVE, new Gson().toJson(dto));

   }



   public void addAdActive(String aid) {

      if (StringUtil.isNullOrEmpty(aid))

   public void addAdActive(String callback) {

      if (StringUtil.isNullOrEmpty(callback))

         return;

      DouYinDeviceActiveQueueDTO dto = new DouYinDeviceActiveQueueDTO(DouYinDeviceActiveQueueDTO.TYPE_AD, aid);

      DouYinDeviceActiveQueueDTO dto = new DouYinDeviceActiveQueueDTO(DouYinDeviceActiveQueueDTO.TYPE_AD, callback);

      cmqUtil.sendMsg(DOUYIN_DEVICE_ACTIVE, new Gson().toJson(dto));

   }