Merge branch 'master' into div

yujian

2019-07-12 e2741d692b5d2e382ae3159a131d54a9ca75aa6f

 fanli/src/main/java/com/yeshi/fanli/job/IPUpdateJob.java

@@ -12,7 +12,6 @@
import org.jsoup.nodes.Document;

import org.jsoup.select.Elements;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.yeshi.utils.entity.ProxyIP;



import com.yeshi.fanli.entity.common.Config;

@@ -20,7 +19,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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



@Component

//@Component

public class IPUpdateJob {



   @Resource