Merge branch 'develop' of http://192.168.1.222:3000/duhongyu/HeBi12345_API into develop

# Conflicts:
#	CallCenterCommon/CallCenter.QuartzService/QuartzWorker.cs

CallCenterApi/CallCenterApi.Common/CommonHelper.cs

@@ -6,6 +6,7 @@ using CallCenter.Utility;
 using System.Text.RegularExpressions;
 using System.Net;
 using System.IO;
+using System.Net.NetworkInformation;
 
 namespace CallCenterApi.Common
 {
@@ -299,5 +300,29 @@ namespace CallCenterApi.Common
             string signcode = EncryptHelper.MD5Encrypt(controller.ToLower() + "/" + action.ToLower() + "+" + EncryptHelper.SHA1Encrypt(sign + "+" + DateTime.Now.ToString("yyyyMMdd")));
             return signcode;
         }
+
+        /// <summary>
+        /// 判断IP是否被占用
+        /// </summary>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        public static bool PortInUse(int port)
+        {
+            bool inUse = false;
+
+            IPGlobalProperties ipProperties = IPGlobalProperties.GetIPGlobalProperties();
+            IPEndPoint[] ipEndPoints = ipProperties.GetActiveTcpListeners();
+
+            foreach (IPEndPoint endPoint in ipEndPoints)
+            {
+                if (endPoint.Port == port)
+                {
+                    inUse = true;
+                    break;
+                }
+            }
+
+            return inUse;
+        }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -131,4 +131,7 @@
   <add key="AREACODE" value="410600" />
 
 <add key="Affairs" value="0" />
+
+  <!-- 定时任务端口 -->
+  <add key="quartz_port" value="556" />
 </appSettings>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -1,10 +1,10 @@
 using CallCenter.QuartzService;
 using CallCenter.Utility;
 using CallCenterApi.Common;
-using CallCenterApi.Interface.Models.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
@@ -22,12 +22,33 @@ namespace CallCenterApi.Interface
             RouteConfig.RegisterRoutes(RouteTable.Routes);
             //clq 增加异常日志记录 自定义 HandleErrorAttribute
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
-            _worker = new QuartzWorker();
-            var PushWorkorder = new PushWorkorder();
-            _worker.AddWork(PushWorkorder);
-            _worker.Start();
+
+            int port = Int32.Parse(Configs.GetValue("quartz_port"));
+            Task.Run(() =>
+            {
+                //IIS直接更新dll有可能end事件晚于start事件，因此延迟1分钟启动定时任务
+                Task.Delay(TimeSpan.FromMinutes(1)).Wait();
+                if (!CommonHelper.PortInUse(port))
+                {
+                    _worker = new QuartzWorker(port);
+                    _worker.AddWork(new PushWorkorder());
+                    _worker.Start();
+                }
+
+            }).ContinueWith(p =>
+            {
+                System.Diagnostics.Debug.WriteLine(DateTime.Now);
+            });
         }
-     
+
+        protected void Application_End()
+        {
+            if (_worker != null)
+            {
+                _worker.Stop();
+            }
+        }
+
 
         protected void Application_AuthenticateRequest(object sender, EventArgs e)
         {

CallCenterCommon/CallCenter.QuartzService/QuartzWorker.cs

@@ -8,7 +8,7 @@ namespace CallCenter.QuartzService
     public class QuartzWorker
     {
         readonly IScheduler _scheduler;
-        public QuartzWorker()
+        public QuartzWorker(int port)
         {
             var properties = new NameValueCollection();
             //properties["quartz.scheduler.instanceName"] = "RemoteServerSchedulerClient";
@@ -19,7 +19,7 @@ namespace CallCenter.QuartzService
 
             // 远程输出配置
             properties["quartz.scheduler.exporter.type"] = "Quartz.Simpl.RemotingSchedulerExporter, Quartz";
-            properties["quartz.scheduler.exporter.port"] = "6764";
+            properties["quartz.scheduler.exporter.port"] = port.ToString();
             properties["quartz.scheduler.exporter.bindName"] = "QuartzScheduler";
             properties["quartz.scheduler.exporter.channelType"] = "tcp";