Merge branch 'master' of http://39.108.190.163:3000/lg/55128.cn_kjh.55128.cn_m.55128.cn

CP55128/CB.Common/BlackIpModule.cs

@@ -12,6 +12,7 @@ using System.Collections;
 using System.Web.Caching;
 using System.Configuration;
 using System.Web.UI;
+using Common;
 
 namespace CB.Common
 {
@@ -43,7 +44,7 @@ namespace CB.Common
             {
                 return;
             }
-            var task = new Task(() =>
+            try
             {
                 var request = application.Context.Request;
                 if (ConfigurationManager.AppSettings["IsOpenIntercept"] == "true")
@@ -66,9 +67,12 @@ namespace CB.Common
                     var ip = GetWebClientIp(request);
                     VisitIPDAL.AddActionFilterLog(request.Url.ToString(), ip);
                 }
-            });
+            }
+            catch (Exception ex)
+            {
 
-            task.Start();
+                LogHelper.Error(typeof(BlackIpHttpModule), ex.Message);
+            }
         }
 
         public static string IPAddress

CP55128/CB.Web.Kjh/CB.Web.Kjh.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <UseIISExpress>false</UseIISExpress>
     <NameOfLastUsedPublishProfile>kjh.55128</NameOfLastUsedPublishProfile>
     <Use64BitIISExpress />

CP55128/CB.Web.Kjh/Properties/PublishProfiles/kjh.55128.pubxml.user

@@ -9,10 +9,10 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/CB.Cache.dll">
-      <publishTime>03/15/2019 11:08:45</publishTime>
+      <publishTime>03/25/2019 09:11:56</publishTime>
     </File>
     <File Include="bin/CB.Cache.pdb">
-      <publishTime>03/15/2019 11:08:45</publishTime>
+      <publishTime>03/25/2019 09:11:56</publishTime>
     </File>
     <File Include="bin/CB.Cache.Redis.dll">
       <publishTime>03/15/2019 11:08:43</publishTime>
@@ -21,40 +21,40 @@
       <publishTime>03/15/2019 11:08:43</publishTime>
     </File>
     <File Include="bin/CB.Cache.WebCache.dll">
-      <publishTime>03/15/2019 11:08:44</publishTime>
+      <publishTime>03/25/2019 09:11:56</publishTime>
     </File>
     <File Include="bin/CB.Cache.WebCache.pdb">
-      <publishTime>03/15/2019 11:08:44</publishTime>
+      <publishTime>03/25/2019 09:11:56</publishTime>
     </File>
     <File Include="bin/CB.Common.dll">
-      <publishTime>03/15/2019 11:08:42</publishTime>
+      <publishTime>03/25/2019 09:11:55</publishTime>
     </File>
     <File Include="bin/CB.Common.pdb">
-      <publishTime>03/15/2019 11:08:42</publishTime>
+      <publishTime>03/25/2019 09:11:55</publishTime>
     </File>
     <File Include="bin/CB.Config.dll">
-      <publishTime>03/15/2019 11:08:43</publishTime>
+      <publishTime>03/25/2019 09:11:55</publishTime>
     </File>
     <File Include="bin/CB.Config.dll.config">
       <publishTime>10/23/2018 09:56:49</publishTime>
     </File>
     <File Include="bin/CB.Config.pdb">
-      <publishTime>03/15/2019 11:08:43</publishTime>
+      <publishTime>03/25/2019 09:11:55</publishTime>
     </File>
     <File Include="bin/CB.Config.XmlSerializers.dll">
-      <publishTime>03/15/2019 11:08:44</publishTime>
+      <publishTime>03/25/2019 09:11:56</publishTime>
     </File>
     <File Include="bin/CB.Data.dll">
-      <publishTime>03/15/2019 11:08:45</publishTime>
+      <publishTime>03/25/2019 09:11:57</publishTime>
     </File>
     <File Include="bin/CB.Data.pdb">
-      <publishTime>03/15/2019 11:08:45</publishTime>
+      <publishTime>03/25/2019 09:11:57</publishTime>
     </File>
     <File Include="bin/CB.Data.SqlServer.dll">
-      <publishTime>03/15/2019 11:08:47</publishTime>
+      <publishTime>03/25/2019 09:11:57</publishTime>
     </File>
     <File Include="bin/CB.Data.SqlServer.pdb">
-      <publishTime>03/15/2019 11:08:47</publishTime>
+      <publishTime>03/25/2019 09:11:57</publishTime>
     </File>
     <File Include="bin/CB.Entity.dll">
       <publishTime>03/15/2019 11:08:41</publishTime>
@@ -63,10 +63,10 @@
       <publishTime>03/15/2019 11:08:41</publishTime>
     </File>
     <File Include="bin/CB.Framework.dll">
-      <publishTime>03/15/2019 11:08:48</publishTime>
+      <publishTime>03/25/2019 09:11:58</publishTime>
     </File>
     <File Include="bin/CB.Framework.pdb">
-      <publishTime>03/15/2019 11:08:48</publishTime>
+      <publishTime>03/25/2019 09:11:58</publishTime>
     </File>
     <File Include="bin/CB.Interface.dll">
       <publishTime>03/15/2019 11:08:41</publishTime>
@@ -75,22 +75,22 @@
       <publishTime>03/15/2019 11:08:41</publishTime>
     </File>
     <File Include="bin/CB.TrendChart.dll">
-      <publishTime>03/15/2019 11:08:47</publishTime>
+      <publishTime>03/25/2019 09:11:58</publishTime>
     </File>
     <File Include="bin/CB.TrendChart.pdb">
-      <publishTime>03/15/2019 11:08:47</publishTime>
+      <publishTime>03/25/2019 09:11:58</publishTime>
     </File>
     <File Include="bin/CB.TrendMiss.dll">
-      <publishTime>03/15/2019 11:08:46</publishTime>
+      <publishTime>03/25/2019 09:11:58</publishTime>
     </File>
     <File Include="bin/CB.TrendMiss.pdb">
-      <publishTime>03/15/2019 11:08:46</publishTime>
+      <publishTime>03/25/2019 09:11:58</publishTime>
     </File>
     <File Include="bin/CB.Web.Kjh.dll">
-      <publishTime>03/15/2019 11:11:38</publishTime>
+      <publishTime>03/25/2019 09:11:59</publishTime>
     </File>
     <File Include="bin/CB.Web.Kjh.pdb">
-      <publishTime>03/15/2019 11:11:38</publishTime>
+      <publishTime>03/25/2019 09:11:59</publishTime>
     </File>
     <File Include="bin/Core.Net.dll">
       <publishTime>10/23/2018 09:56:51</publishTime>
@@ -98,6 +98,9 @@
     <File Include="bin/Dapper.dll">
       <publishTime>07/01/2016 18:38:16</publishTime>
     </File>
+    <File Include="bin/log4net.dll">
+      <publishTime>03/08/2017 19:26:22</publishTime>
+    </File>
     <File Include="bin/Nancy.ViewEngines.Razor.dll">
       <publishTime>10/23/2018 09:56:51</publishTime>
     </File>
@@ -281,6 +284,9 @@
     <File Include="kjzb/ssq.aspx">
       <publishTime>10/23/2018 09:56:51</publishTime>
     </File>
+    <File Include="log4net.config">
+      <publishTime>03/20/2019 10:01:22</publishTime>
+    </File>
     <File Include="packages.config">
       <publishTime>03/14/2019 13:18:06</publishTime>
     </File>
@@ -393,7 +399,7 @@
       <publishTime>10/23/2018 09:56:50</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>03/15/2019 11:08:49</publishTime>
+      <publishTime>03/20/2019 10:05:12</publishTime>
     </File>
     <File Include="WebServices/datasafe.asmx">
       <publishTime>10/23/2018 09:56:50</publishTime>

CP55128/CB.Web.Kjh/index.aspx.cs

@@ -32,7 +32,6 @@ namespace CB.Web.Kjh
             //lock (_lock)
             //{
             //}
-            LogHelper.Error(typeof(index), "我是一堆翔");
             InitData();
         }