implement email client

cloupid · Apr 21, 2016 · a17e258 · a17e258
1 parent 2e131c6
commit a17e258
Show file tree

Hide file tree

Showing 8 changed files with 498 additions and 202 deletions.
diff --git a/src/Java2Dotnet.Spider.Common/EmailClient.cs b/src/Java2Dotnet.Spider.Common/EmailClient.cs
diff --git a/src/Java2Dotnet.Spider.Common/EmailUtil2.cs b/src/Java2Dotnet.Spider.Common/EmailUtil2.cs
diff --git a/src/Java2Dotnet.Spider.Common/net45/Java2Dotnet.Spider.Common.csproj b/src/Java2Dotnet.Spider.Common/net45/Java2Dotnet.Spider.Common.csproj
@@ -104,12 +104,12 @@
     <Compile Include="..\DirectoryExtensions.cs">
       <Link>DirectoryExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\EmailClient.cs">
+      <Link>EmailClient.cs</Link>
+    </Compile>
     <Compile Include="..\EmailUtil.cs">
       <Link>EmailUtil.cs</Link>
     </Compile>
-    <Compile Include="..\EmailUtil2.cs">
-      <Link>EmailUtil2.cs</Link>
-    </Compile>
     <Compile Include="..\Encrypt.cs">
       <Link>Encrypt.cs</Link>
     </Compile>

diff --git a/src/Java2Dotnet.Spider.Extension/Configuration/Json/JsonSpiderContext.cs b/src/Java2Dotnet.Spider.Extension/Configuration/Json/JsonSpiderContext.cs
@@ -61,19 +61,26 @@ private Validations GetValidations(JObject validations)
 			}
 
 			Validations result = new Validations();
-			var dataSource = validations.SelectToken("$.DataSource")?.ToObject<DataSource>();
-			var connectString = validations.SelectToken("$.ConnectString")?.ToString();
-			var reportTo = validations.SelectToken("$.ReportTo")?.ToString();
-			var corporation = validations.SelectToken("$.Corporation")?.ToString();
-			if (dataSource == null || string.IsNullOrEmpty(connectString) || string.IsNullOrEmpty(reportTo))
+			var source = validations.SelectToken("$.DataSource");
+			if (source == null)
 			{
 				return null;
 			}
-			result.Source = dataSource.Value;
-			result.ConnectString = connectString;
-			result.Corporation = corporation;
-			result.ReportTo = reportTo;
-
+			result.Source = source.ToObject<DataSource>();
+			result.ConnectString = validations.SelectToken("$.ConnectString")?.ToString();
+			result.EmailTo = validations.SelectToken("$.ReportTo")?.ToString();
+			result.Corporation = validations.SelectToken("$.Corporation")?.ToString();
+			result.EmailPassword = validations.SelectToken("$.EmailPassword")?.ToString();
+			var port = validations.SelectToken("$.EmailSmtpPort");
+			result.EmailSmtpPort = port == null ? 25 : int.Parse(port.ToString());
+			result.EmailSmtpServer = validations.SelectToken("$.EmailSmtpServer")?.ToString();
+			result.EmailUser = validations.SelectToken("$.EmailUser")?.ToString();
+
+			if (string.IsNullOrEmpty(result.ConnectString) || string.IsNullOrEmpty(result.EmailTo) || string.IsNullOrEmpty(result.EmailPassword) || string.IsNullOrEmpty(result.EmailSmtpServer) || string.IsNullOrEmpty(result.EmailUser))
+			{
+				return null;
+			}
+
 			foreach (var validation in validations.SelectTokens("$.Rules[*]"))
 			{
 				var type = validation.SelectToken("$.Type")?.ToObject<Validation.Types>();
@@ -329,7 +336,7 @@ private Downloader GetDownloader(JObject jobject)
 						break;
 #else
 						throw new SpiderExceptoin("UNSPORT WEBDRIVER DOWNLOADER.");
-#endif						
+#endif
 					}
 				case Configuration.Downloader.Types.HttpClientDownloader:
 					{

diff --git a/src/Java2Dotnet.Spider.Extension/Configuration/Validation.cs b/src/Java2Dotnet.Spider.Extension/Configuration/Validation.cs
@@ -8,13 +8,22 @@ namespace Java2Dotnet.Spider.Extension.Configuration
 	public class Validations
 	{
 		public string Corporation { get; set; }
+		public string EmailUser { get; set; }
+		public string EmailPassword { get; set; }
+		public string EmailSmtpServer { get; set; }
+		public int EmailSmtpPort { get; set; } = 25;
+		public string EmailTo { get; set; }
 		public string ConnectString { get; set; }
 		public DataSource Source { get; set; } = DataSource.MySql;
-		public string ReportTo { get; set; }
 		public List<Validation> Rules { get; set; }
 
 		internal List<IValidation> GetValidations()
 		{
+			if (string.IsNullOrEmpty(ConnectString) || string.IsNullOrEmpty(EmailTo) || string.IsNullOrEmpty(EmailPassword) || string.IsNullOrEmpty(EmailSmtpServer) || string.IsNullOrEmpty(EmailUser))
+			{
+				return null;
+			}
+
 			var conn = DataSourceUtil.GetConnection(Source, ConnectString);
 			List<IValidation> results = new List<IValidation>();
 			foreach (var rule in Rules)

diff --git a/src/Java2Dotnet.Spider.Extension/ContextSpider.cs b/src/Java2Dotnet.Spider.Extension/ContextSpider.cs
@@ -126,7 +126,10 @@ private void DoValidate()
 						}
 						string mailBody = builder.Build();
 
-						EmailUtil2.Send($"{Name} " + "validation report", _spiderContext.Validations.ReportTo, mailBody);
+						using (EmailClient client = new EmailClient(_spiderContext.Validations.EmailSmtpServer, _spiderContext.Validations.EmailUser, _spiderContext.Validations.EmailPassword, _spiderContext.Validations.EmailSmtpPort))
+						{
+							client.SendMail(new EmaillMessage($"{Name} " + "validation report", mailBody, _spiderContext.Validations.EmailTo) { IsHtml = true });
+						}
 					}
 				}
 				else

diff --git a/src/Java2Dotnet.Spider.Test/Program.cs b/src/Java2Dotnet.Spider.Test/Program.cs
@@ -28,10 +28,9 @@ public static void Main(string[] args)
 			//spider.Run(args);
 
 
-			Regex regex = new Regex(@"\d");
-			var m = regex.Match("6");
-
-			Console.WriteLine("OK");
+			EmailClient client = new EmailClient("smtp.163.com", "[email protected]", "zousong.88");
+			var msg = new EmaillMessage("test", "test", "[email protected]" );
+			client.SendMail(msg);
 		}
 
 		private static void TestStatusServer()

diff --git a/src/Java2Dotnet.Spider.Test/net45/app.conf b/src/Java2Dotnet.Spider.Test/net45/app.conf
@@ -3,4 +3,6 @@ redisPassword:#frAiI^MtFxh3Ks&swrnVyzAtRTq%w
 redialRedisHost:redis
 redialRedisPassword:#frAiI^MtFxh3Ks&swrnVyzAtRTq%w
 logserver:http://localhost:62823/api/log/uploadlog
-emailApiHost:http://localhost:62823/api/email?action=send
+emailUser:[email protected]
+emailPass:zousong.88
+emailHost:smtp.163.com