号码归属地

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -49,6 +49,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\CallCenterWeb\CallCenterWeb.UI\Bin\GetuiServerApiSDK.dll</HintPath>
     </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.11.45.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\HtmlAgilityPack.1.11.45\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
@@ -85,8 +88,17 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -112,11 +124,21 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Lib\Senparc.Weixin.MP.dll</HintPath>
     </Reference>
+    <Reference Include="StarkbankEcdsa, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b2e6337a5d77bfbc, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\starkbank-ecdsa.1.3.3\lib\net40\StarkbankEcdsa.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Security" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
@@ -307,6 +329,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="ExcelMod\CustomerList_Mod.xls" />
+    <Content Include="libman.json" />
     <None Include="Properties\PublishProfiles\1q.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Properties\PublishProfiles\my.pubxml" />
@@ -468,6 +491,11 @@
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/CallOutOptController.cs

@@ -1,4 +1,5 @@
-using CallCenter.Utility;
+
+using CallCenter.Utility;
 using CallCenterApi.Interface.Controllers.Base;
 using System;
 using System.Collections.Generic;
@@ -6,6 +7,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 
+
 namespace CallCenterApi.Interface.Controllers
 {
     public class CallOutOptController : BaseController
@@ -65,7 +67,7 @@ namespace CallCenterApi.Interface.Controllers
             }
             return NoToken("未知错误，请重新登录");
         }
-
+      
         /// <summary>
         /// 根据号码和区号判断号码是否为归属地号码
         /// 返回0为分机号或特殊号码
@@ -100,6 +102,37 @@ namespace CallCenterApi.Interface.Controllers
                             return 2;
                         }
                     }
+                    else
+                    {
+                       
+                        var PhoneNumber = tel.MobiledataController.GetDetails (phone.Substring(0, 7));
+                        if (PhoneNumber != null)
+                        {
+                            Model.T_Sys_MobileData dModel = new Model.T_Sys_MobileData();
+                            dModel.F_MobileNum = phone.Substring(0, 7);
+                            var model = new BLL.T_Sys_MobileData().GetList(1, "F_CityDes='" + PhoneNumber["省份"] + "-" + PhoneNumber["市区"] + "' and F_IsDelete=0", "F_Id desc  ");
+                            if (model != null)
+                                dModel.F_ZipCode = model.FirstOrDefault().F_ZipCode;
+                            dModel.F_CityDes = PhoneNumber["省份"] + "-" + PhoneNumber["市区"];
+                            dModel.F_CardDes = PhoneNumber["电信运营商"];
+                            dModel.F_IsDelete = 0;
+                            dModel.F_CreateUser = "8000";
+                            dModel.F_CreateTime = DateTime.Now;
+                            int t = new BLL.T_Sys_MobileData().Add(dModel);
+                            if (t > 0)
+                            {
+                                if (dModel.F_ZipCode.Equals(zipcode))
+                                {
+                                    return 1;
+                                }
+                                else
+                                {
+                                    return 2;
+                                }
+                            }
+
+                        }
+                    }
                 }
                 else
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -1,6 +1,5 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -10,10 +9,6 @@ using CallCenter.Utility;
 using CallCenterApi.Common;
 using CallCenterApi.DB;
 using System.IO;
-using NPOI.XSSF.UserModel;
-using NPOI.HSSF.UserModel;
-using NPOI.SS.UserModel;
-using Newtonsoft.Json;
 using System.Reflection;
 
 namespace CallCenterApi.Interface.Controllers.customer

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -436,13 +436,13 @@ namespace CallCenterApi.Interface.Controllers.report
                     user = usermodel.F_UserName;
 
             }
-            else if (DeptName == "山东" || DeptName == "华东"  )
+            else if (DeptName == "鲁西" || DeptName == "华东" || DeptName == "鲁东")
             {
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("8010");
                 if (usermodel != null)
                     user = usermodel.F_UserName;
             }
-            else if ( DeptName == "川渝" || DeptName == "湘赣" || DeptName == "陕宁" || DeptName == "晋蒙" || DeptName == "华南")
+            else if ( DeptName == "川渝" || DeptName == "湖南" || DeptName == "陕宁" || DeptName == "晋蒙"  || DeptName == "闽赣" || DeptName == "广东" || DeptName == "广海")
             {
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("822353");
                 if (usermodel != null)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -1,4 +1,5 @@
-using CallCenter.Utility;
+
+using CallCenter.Utility;
 using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
@@ -10,6 +11,7 @@ using System.Text;
 using System.Web;
 using System.Web.Mvc;
 
+
 namespace CallCenterApi.Interface.Controllers.tel
 {
     public class CallInScreenController : BaseController
@@ -177,7 +179,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetPhoneLocation()
         {
-            
+
             if (Request.IsAuthenticated)
             {
                 string location = "未知";
@@ -195,17 +197,43 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                     else
                     {
-                        BLL.T_Sys_TelTitleData numbBll = new BLL.T_Sys_TelTitleData();
-                        List<Model.T_Sys_TelTitleData> mobileModel1 = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 4) + "'");
-                        if (mobileModel1 == null || mobileModel1.Count <= 0)
+
+                        var PhoneNumber = MobiledataController.GetDetails(tel.Substring(1, 7));
+                        if (PhoneNumber != null)
                         {
-                            mobileModel1 = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 3) + "'");
+                            Model.T_Sys_MobileData dModel = new Model.T_Sys_MobileData();
+                            dModel.F_MobileNum = tel.Substring(1, 7);
+                            var model = new BLL.T_Sys_MobileData().GetList(1, "F_CityDes='" + PhoneNumber["省份"] + "-" + PhoneNumber["市区"] + "' and F_IsDelete=0", "F_Id desc  ");
+                            if (model != null)
+                                dModel.F_ZipCode = model.FirstOrDefault().F_ZipCode;
+                            dModel.F_CityDes = PhoneNumber["省份"] + "-" + PhoneNumber["市区"];
+                            dModel.F_CardDes = PhoneNumber["电信运营商"];
+                            dModel.F_IsDelete = 0;
+                            dModel.F_CreateUser = "8000";
+                            dModel.F_CreateTime = DateTime.Now;
+                            int t = new BLL.T_Sys_MobileData().Add(dModel);
+                            if (t > 0)
+                            {
+                                location = dModel.F_CityDes + dModel.F_CardDes;
+                            }
+
                         }
-                        if (mobileModel1.Count > 0)
+                        else
                         {
-                            location = mobileModel1[0].F_TitleName;
+                            BLL.T_Sys_TelTitleData numbBll = new BLL.T_Sys_TelTitleData();
+                            List<Model.T_Sys_TelTitleData> mobileModel1 = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 4) + "'");
+                            if (mobileModel1 == null || mobileModel1.Count <= 0)
+                            {
+                                mobileModel1 = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 3) + "'");
+                            }
+                            if (mobileModel1.Count > 0)
+                            {
+                                location = mobileModel1[0].F_TitleName;
+                            }
+
                         }
                     }
+
                 }
                 else
                 {
@@ -218,6 +246,29 @@ namespace CallCenterApi.Interface.Controllers.tel
                         {
                             location = mobileModel.F_CityDes + mobileModel.F_CardDes;
                         }
+                        else
+                        {
+                            var PhoneNumber = MobiledataController .GetDetails (tel.Substring(0, 7));
+                            if (PhoneNumber != null)
+                            {
+                                Model.T_Sys_MobileData dModel = new Model.T_Sys_MobileData();
+                                dModel.F_MobileNum = tel.Substring(0, 7);
+                                var model = new BLL.T_Sys_MobileData().GetList(1, "F_CityDes='" + PhoneNumber["省份"] + "-" + PhoneNumber["市区"] + "' and F_IsDelete=0", "F_Id desc  ");
+                                if (model != null)
+                                    dModel.F_ZipCode = model.FirstOrDefault().F_ZipCode;
+                                dModel.F_CityDes = PhoneNumber["省份"] + "-" + PhoneNumber["市区"];
+                                dModel.F_CardDes = PhoneNumber["电信运营商"];
+                                dModel.F_IsDelete = 0;
+                                dModel.F_CreateUser = "8000";
+                                dModel.F_CreateTime = DateTime.Now;
+                                int t = new BLL.T_Sys_MobileData().Add(dModel);
+                                if (t > 0)
+                                {
+                                    location = dModel.F_CityDes + dModel.F_CardDes;
+                                }
+
+                            }
+                        }
                     }
                     else
                     {
@@ -236,12 +287,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                         }
                     }
                 }
-
                 return Success("归属地加载成功", location);
-
             }
-            return NoToken("未知错误，请重新登录");
-        }
+                return NoToken("未知错误，请重新登录");
+         }
 
         /// <summary>
         /// 历史记录列表

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/MobiledataController.cs

@@ -1,14 +1,19 @@
-using CallCenter.Utility;
-using CallCenterApi.Common;
+
+using CallCenter.Utility;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
+using HtmlAgilityPack;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using System.Web;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+using System.Text.RegularExpressions;
 using System.Web.Mvc;
 
+
 namespace CallCenterApi.Interface.Controllers.tel
 {
     public class MobiledataController : BaseController
@@ -93,18 +98,97 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                     else
                     {
-                        return Error("获取号码归属地失败");
-                    }
-                }
+                        var PhoneNumber = GetDetails(mobileNum.Trim());
+                        if (PhoneNumber != null)
+                        {
+                            dModel = new Model.T_Sys_MobileData();
+                            dModel.F_MobileNum = mobileNum.Trim();
+                            var model = new BLL.T_Sys_MobileData().GetList(1, "F_CityDes='" + PhoneNumber["省份"] + "-" + PhoneNumber["市区"]  + "' and F_IsDelete=0", "F_Id desc  ");
+                            if (model != null)
+                                dModel.F_ZipCode = model.FirstOrDefault().F_ZipCode;
+                            dModel.F_CityDes = PhoneNumber["省份"] + "-" + PhoneNumber["市区"];
+                            dModel.F_CardDes = PhoneNumber["电信运营商"];
+                            dModel.F_IsDelete = 0;
+                            dModel.F_CreateUser = "8000";
+                            dModel.F_CreateTime = DateTime.Now;
+                            int n = new BLL.T_Sys_MobileData().Add(dModel);
+                            if (n > 0)
+                            {
+                                dModel.F_Id = n;
+                                return Success("获取号码归属地成功", dModel);
+                            }
+                            else
+                            {
+                                return Error("获取号码归属地失败");
+                            }
+
+
+
+                               }
+
+                               return Error("获取号码归属地失败");
+                            }
+                        }
                 else
                 {
                     return Error("获取参数失败");
                 }
 
-            }
+           }
             return NoToken("未知错误，请重新登录");
         }
+        static HtmlDocument GetDocument(string url)
+        {
+           
+            HtmlWeb web = new HtmlWeb();
+            ServicePointManager.Expect100Continue = true;
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+            ServicePointManager.ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true;
+            HtmlDocument doc = web.Load(url);
+            return doc;
+        }
 
+        //private static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
+        //{
+        //    return true; //总是接受  
+        //}
+
+        public  static  Dictionary<string, string> GetDetails(string moblie)
+        {
+            string url = "https://www.chahaoba.com/" + moblie;
+            HtmlDocument document = GetDocument(url);
+            var priceXPath = @"//*[@id='mw-content-text']";
+            var Node = document.DocumentNode.SelectSingleNode(priceXPath);
+            List<string> InnerText = new List<string>();
+            foreach (HtmlNode table in Node.SelectNodes("//table"))
+            {
+                foreach (HtmlNode row in table.SelectNodes(".//tr"))
+                {
+                    foreach (HtmlNode cell in row.SelectNodes("th|td"))
+                    {
+                        InnerText.Add(cell.InnerText );
+                    }
+                }
+            }
+            Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+            if (InnerText != null )
+            {
+               for (int i=0;i< InnerText.Count;i ++)
+                {
+                    if(InnerText[i ]== "归属省份地区")
+                    {
+                        keyValuePairs.Add("市区", InnerText[i + 1].Split('、')[0]);
+                        keyValuePairs.Add("省份", InnerText[i + 1].Split('、')[1]);
+                    }
+                    else if (InnerText[i] == "电信运营商")
+                    {
+                        keyValuePairs.Add("电信运营商", InnerText[i + 1]);
+                    }
+                }
+            }
+            return keyValuePairs;
+
+        }
         //添加/编辑号码归属地
         public ActionResult AddMobiledata(string mobileNum, string zipCode, string cityDes, string cardDes, int id = 0)
         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="HtmlAgilityPack" version="1.11.45" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.6" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.2.0" targetFramework="net45" />
@@ -13,7 +14,13 @@
   <package id="Microsoft.AspNet.Razor.zh-Hans" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
+  <package id="starkbank-ecdsa" version="1.3.3" targetFramework="net45" />
 </packages>

codegit/CallCenterCommon/CallCenter.QuartzService/CallCenter.QuartzService.csproj

@@ -45,9 +45,8 @@
     <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Quartz, Version=2.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Quartz.2.5.0\lib\net40\Quartz.dll</HintPath>

codegit/CallCenterCommon/CallCenter.QuartzService/SMSService.cs

@@ -1,18 +1,6 @@
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.Collections.Generic;
 using System.Configuration;
-using System.Data;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
 using System.ServiceProcess;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CallCenter.QuartzService
 {

codegit/CallCenterCommon/CallCenter.QuartzService/SMSTask.cs

@@ -1,11 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CallCenter.QuartzService
 {

codegit/CallCenterCommon/CallCenter.QuartzService/packages.config

@@ -3,6 +3,6 @@
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
   <package id="log4net" version="2.0.7" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
   <package id="Quartz" version="2.5.0" targetFramework="net45" />
 </packages>

codegit/CallCenterCommon/CallCenter.Utility/CallCenter.Utility.csproj

@@ -34,9 +34,8 @@
       <HintPath>..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NPOI.2.3.0\lib\net40\NPOI.dll</HintPath>

codegit/CallCenterCommon/CallCenter.Utility/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.7" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
   <package id="NPOI" version="2.3.0" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />