Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java

@@ -15,14 +15,14 @@
import org.apache.commons.io.IOUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import org.yeshi.utils.annotation.MapUtil;



import com.alibaba.fastjson.JSONObject;

import com.yeshi.fanli.entity.config.push.HWPushConfig;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import org.yeshi.utils.annotation.MapUtil;



import net.sf.json.JSONArray;



@@ -32,12 +32,12 @@
   private static HWPushUtil hWPushUtil;



   @Autowired

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @PostConstruct

   public void init() {

      hWPushUtil = this;

      hWPushUtil.systemService = this.systemService;

      hWPushUtil.businessSystemService = this.businessSystemService;

   }



   private static String appSecret = "";