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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 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));

   }