Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java

@@ -288,7 +288,7 @@
         }

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("推送成功"));

      } catch (PushException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("推送失败"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("推送失败"));

         e.printStackTrace();

@@ -334,7 +334,7 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("推送成功"));

         

      } catch (PushException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("推送失败"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("推送失败"));

         e.printStackTrace();