删除邮件，添加代理

pom.xml

@@ -63,11 +63,6 @@
 			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.zhiwei</groupId>
-			<artifactId>sendmail</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
 		
 		<dependency>
 			 <groupId>com.zhiwei.middleware</groupId>

src/main/java/com/zhiwei/crawler/soubao/SouBaoCrawlerThread.java

 package com.zhiwei.crawler.soubao;
 
 import java.net.Proxy;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 
 import org.apache.logging.log4j.LogManager;
@@ -33,7 +30,7 @@ public class SouBaoCrawlerThread extends Thread{
 		while(wordsQueue!=null && wordsQueue.size()>0){
 			try {
 				String word = wordsQueue.take();
-				Proxy proxy = ProxyClientUtil.getProxy();
+				Proxy proxy = ProxyClientUtil.getNATProxy();
 				/***开始采集**/
 				logger.info("开始采集：{}搜报网关键词,目前未采集的关键词为:{}", word, wordsQueue.size());
 				long s = System.currentTimeMillis();

src/main/java/com/zhiwei/crawler/util/ProxyClientUtil.java

@@ -2,21 +2,31 @@ package com.zhiwei.crawler.util;
 
 import java.net.Proxy;
 
+import com.zhiwei.crawler.config.ProxyConfig;
+import com.zhiwei.proxy.common.Definition.GroupType;
 import com.zhiwei.proxy.core.ProxyClient;
 import com.zhiwei.proxy.core.ProxyClientFactory;
-import com.zhiwei.rsid.common.Definition.GroupType;
 
-public class ProxyClientUtil {
-	
-//	private static String registry = "zookeeper://202.107.192.94:2181";
-//	private static String group = "local";
-	
-	private static String registry = "zookeeper://192.168.0.203:2181";
-	private static String group = "hangzhou";
-	private static ProxyClient client = ProxyClientFactory.build(registry, group, GroupType.PROVIDER);
 
+public class ProxyClientUtil {
 	
-	public static Proxy getProxy(){
+	private static volatile ProxyClient client;
+	
+	/**
+	 * @Title: getNATProxy 
+	 * @author hero 
+	 * @Description: 获取NAT机代理IP 
+	 * @param @return 设定文件 
+	 * @return Proxy 返回类型
+	 */
+	public static Proxy getNATProxy(){
+		if(client==null) {
+			synchronized (ProxyClientUtil.class) {
+				if(client==null) {
+					client = ProxyClientFactory.build(ProxyConfig.registry, ProxyConfig.group, GroupType.PROVIDER);
+				}
+			}			
+		}
 		return client.getNATProxy();
 	}
 

src/main/java/com/zhiwei/crawler/util/SendMailTVCloud.java

-package com.zhiwei.crawler.util;
-
-import com.zhiwei.sendmail.SendMail;
-import com.zhiwei.sendmail.bean.MailInfo;
-
-public class SendMailTVCloud  {
-	
-	
-	/**
-	 * @Title: sendMail 
-	 * @Description: TODO(发送邮件) 
-	 * @param @param mailContent
-	 * @param @param email
-	 * @param @return 设定文件 
-	 * @return boolean 返回类型
-	 */
-	public static boolean sendMail(String mailContent,String email){
-		
-		//这个类主要是设置邮件   
-		 String mailServerHost = "smtp.ym.163.com";
-		 String mailServerPort = "25";
-		 String fromAddress = "zhangzhiwei@zhiweidata.com"; 
-		 String toAddress = email; 
-		 String userName = "zhangzhiwei@zhiweidata.com";
-		 String password = "olp1437z.."; 
-		 boolean validate = true; 
-		 String subject = "监测系统天脉云采集程序"; 
-		 String content = mailContent;
-		
-	      MailInfo mailInfo = new MailInfo(mailServerHost, mailServerPort, fromAddress, toAddress, userName, password, validate, subject, content,null);    
-	      
-	     boolean f=false;
-		 //这个类主要来发送邮件   
-		 f = SendMail.sendMailByHtml(mailInfo);//发送文体格式    
-	     return f;
-	}
-	
-	
-	
-	
-	
-	/**
-	 * 测试发送邮件
-	 */
-//	public static void main(String[] args) {
-//		SendMailDaoImpl sendMail=new SendMailDaoImpl();
-//		String mailSubject="国家核电重点规则追踪提醒";
-//		String mailContent="消息内容：考或不考，成功的路就在那里，冥冥之中就会有一双手帮你。但如果只是为了一纸文凭，奉劝大家不要将有限的生命投入到无限的为考试而考之中。如果真的发自内心想要学英语，一定是会说会用，才算会英语！<br/><br/>地址：www.baidu.com<br/><br/> 本消息由国家核电舆情系统发送（请勿回复）";
-//		String[] email={"859548429@qq.com"};
-//		sendMail.SendMail(mailContent, email);
-//		
-//	}
-
-}