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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -12,16 +12,15 @@
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;

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

import com.yeshi.fanli.job.IPUpdateJob.IPTime;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

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

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



@Component

//@Component

public class IPUpdateJob {



   @Resource

@@ -66,7 +65,7 @@
         };

         if (list.size() > 0) {

            Collections.sort(list, cm);

            Config conf = configService.getConfig("taobao_proxy_ip");

            Config conf = configService.getConfig(ConfigKeyEnum.taobaoProxyIP.getKey());

            conf.setValue(list.get(0).ip.trim());

            configService.update(conf);

         }