Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -66,7 +66,7 @@
   

   

   @Override

   public void pushGoods(Long uid, String url, String title, String content, List<String> listIOS,

   public void pushGoods(Long uid,  String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException {

      String gids = url.split("id=")[1];

      String gid = gids.split("&")[0];

@@ -98,6 +98,7 @@
      

      

      PushRecord pushRecord = new PushRecord();

      pushRecord.setUid(uid);

      pushRecord.setState(1);

      pushRecord.setType(PushController.GOODS); // 都成功

      pushRecord.setUrl(url);

@@ -110,7 +111,7 @@


   

   @Override

   public void pushUrl(Long uid, String url, String title, String content, List<String> listIOS,

   public void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException {



      if (StringUtil.isNullOrEmpty(url))

@@ -142,6 +143,7 @@
      

      

      PushRecord pushRecord = new PushRecord();

      pushRecord.setUid(uid);

      pushRecord.setState(1);

      pushRecord.setType(PushController.URL);

      pushRecord.setUrl(url);