From 8f392cc88b0768b74efca3b68785cf5aa1c38e70 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 06 十一月 2024 14:28:20 +0800
Subject: [PATCH] 代码更新

---
 wcs-server-hbf/WIDESEA_WCS/Jobs/JobBase.cs |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/wcs-server-hbf/WIDESEA_WCS/Jobs/JobBase.cs b/wcs-server-hbf/WIDESEA_WCS/Jobs/JobBase.cs
index 73dc720..b67e767 100644
--- a/wcs-server-hbf/WIDESEA_WCS/Jobs/JobBase.cs
+++ b/wcs-server-hbf/WIDESEA_WCS/Jobs/JobBase.cs
@@ -21,7 +21,7 @@
             //JOB缁勫悕
             string groupName = context.JobDetail.Key.Group;
             //鏃ュ織
-            string jobHistory = $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屽紑濮嬨�戙�怚d锛歿jobid}锛岀粍鍒細{groupName}銆�";
+            string jobHistory = $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屽紑濮嬨�戙�怚d锛歿jobid}锛岀粍鍒細{groupName}銆憑Environment.NewLine}";
             //鑰楁椂
             double taskSeconds = 0;
             try
@@ -29,19 +29,20 @@
                 stopwatch.Start();
                 func();//鎵ц浠诲姟
                 stopwatch.Stop();
-                jobHistory += $"锛屻�恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屾垚鍔熴��";
+                jobHistory += $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屾垚鍔熴�憑Environment.NewLine}";
             }
             catch (Exception ex)
             {
                 JobExecutionException e2 = new JobExecutionException(ex);
                 //true  鏄珛鍗抽噸鏂版墽琛屼换鍔� 
                 e2.RefireImmediately = true;
-                jobHistory += $"锛屻�恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屽け璐�:{ex.Message}銆�";
+                jobHistory += $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屽け璐�:{ex.Message}銆憑Environment.NewLine}";
             }
             finally
             {
                 taskSeconds = Math.Round(stopwatch.Elapsed.TotalSeconds, 3);
-                jobHistory += $"锛屻�恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛岀粨鏉熴��(鑰楁椂:{taskSeconds}绉�)";
+                jobHistory += $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛岀粨鏉熴��(鑰楁椂:{taskSeconds}绉�){Environment.NewLine}{Environment.NewLine}{Environment.NewLine}";
+                WriteLog.GetLog().Write(jobHistory, jobid + "鎵ц璁板綍");
             }
 
             return jobHistory;
@@ -56,7 +57,7 @@
             //JOB缁勫悕
             string groupName = context.JobDetail.Key.Group;
             //鏃ュ織
-            string jobHistory = $"銆愮粍鍒細{groupName}銆�";
+            string jobHistory = $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屽紑濮嬨�戙�怚d锛歿jobid}锛岀粍鍒細{groupName}銆憑Environment.NewLine}";
             //鑰楁椂
             double taskSeconds = 0;
             try
@@ -64,16 +65,16 @@
                 stopwatch.Start();
                 action(context);//鎵ц浠诲姟
                 stopwatch.Stop();
-                jobHistory += $",銆愭墽琛屾垚鍔熴��";
+                jobHistory += $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屾垚鍔熴�憑Environment.NewLine}";
             }
             catch (Exception ex)
             {
-                jobHistory += $",銆愭墽琛屽け璐�:{ex.Message}銆�";
+                jobHistory += $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛屽け璐�:{ex.Message}銆憑Environment.NewLine}";
             }
             finally
             {
                 taskSeconds = Math.Round(stopwatch.Elapsed.TotalSeconds, 3);
-                jobHistory += $"(鑰楁椂:{taskSeconds}绉�)";
+                jobHistory += $"銆恵DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}銆戙�愭墽琛岀粨鏉熴��(鑰楁椂:{taskSeconds}绉�){Environment.NewLine}{Environment.NewLine}{Environment.NewLine}";
 
                 WriteLog.GetLog().Write(jobHistory, jobid + "鎵ц璁板綍");
             }

--
Gitblit v1.9.3