修正.NET Core版本的Bug

Masuit.Tools.Core/Html/HtmlTools.cs

@@ -1468,22 +1468,18 @@ ReCatch:
         /// <exception cref="Exception"> </exception>
         public static List<KeyValuePair<int, string>> GetHtmlByUrlList(List<KeyValuePair<int, string>> listUrl, string sCoding)
         {
-            int iTimeOut = int.Parse(System.Configuration.ConfigurationManager.AppSettings["SocketTimeOut"]);
+            int iTimeOut = 120000;
             StringBuilder sbHtml = new StringBuilder();
             List<KeyValuePair<int, string>> listResult = new List<KeyValuePair<int, string>>();
-            int nBytes = 0;
             Socket sock = null;
-            IPHostEntry ipHostInfo = null;
             try
             {
                 // 初始化				
                 Uri site = new Uri(listUrl[0].Value);
-                ipHostInfo = System.Net.Dns.GetHostEntry(site.Host);
+                var ipHostInfo = Dns.GetHostEntry(site.Host);
                 IPAddress ipAddress = ipHostInfo.AddressList[0];
                 IPEndPoint remoteEP = new IPEndPoint(ipAddress, site.Port);
-                sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-                sock.SendTimeout = iTimeOut;
-                sock.ReceiveTimeout = iTimeOut;
+                sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { SendTimeout = iTimeOut, ReceiveTimeout = iTimeOut };
                 sock.Connect(remoteEP);
                 foreach (KeyValuePair<int, string> kvUrl in listUrl)
                 {
@@ -1496,6 +1492,7 @@ ReCatch:
                         "Host: " + site.Host + "\r\n\r\n" + '\0';
                     // 发送
                     byte[] msg = Encoding.GetEncoding(sCoding).GetBytes(sendMsg);
+                    int nBytes;
                     if ((nBytes = sock.Send(msg)) == 0)
                     {
                         sock.Shutdown(SocketShutdown.Both);

Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -82,10 +82,4 @@ Windows.ClearMemorySilent();
     <PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Configuration">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7\System.Configuration.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

Masuit.Tools.Core/NoSQL/RedisConnectionHelp.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Configuration;
 using StackExchange.Redis;
 
 namespace Masuit.Tools.NoSQL
@@ -11,17 +10,12 @@ namespace Masuit.Tools.NoSQL
     public static class RedisConnectionHelp
     {
         /// <summary>
-        /// 系统自定义Key前缀
-        /// </summary>
-        public static readonly string SysCustomKey = ConfigurationManager.AppSettings["redisKey"] ?? "";
-
-        /// <summary>
-        /// Redis服务器连接字符串，在config配置文件中的ConnectionStrings节下配置，name固定为RedisHosts，值的格式：127.0.0.1:6379,allowadmin=true，如：<br/>
+        /// Redis服务器连接字符串，默认为：127.0.0.1:6379,allowadmin=true，如：<br/>
         /// &lt;connectionStrings&gt;<br/>
         ///      &lt;add name = "RedisHosts" connectionString="127.0.0.1:6379,allowadmin=true"/&gt;<br/>
         /// &lt;/connectionStrings&gt;
         /// </summary>
-        public static readonly string RedisConnectionString = ConfigurationManager.ConnectionStrings["RedisHosts"]?.ConnectionString ?? "127.0.0.1:6379,allowadmin=true";
+        public static string RedisConnectionString => "127.0.0.1:6379,allowadmin=true";
 
         private static readonly object Locker = new object();
         private static ConnectionMultiplexer _instance;

Masuit.Tools.Core/NoSQL/RedisHelper.cs

@@ -949,7 +949,7 @@ namespace Masuit.Tools.NoSQL
 
         private string AddSysCustomKey(string oldKey)
         {
-            var prefixKey = CustomKey ?? RedisConnectionHelp.SysCustomKey;
+            var prefixKey = CustomKey ?? String.Empty;
             return prefixKey + oldKey;
         }
 

Masuit.Tools.Core/Security/Encrypt.cs

@@ -14,9 +14,9 @@ namespace Masuit.Tools.Security
     {
         #region DES对称加密解密
         /// <summary>
-        /// 加密密钥，需要在config配置文件中AppSettings节点中配置desSecret值，若未配置，默认取“masuit”的MD5值
+        /// 加密密钥，需要在config配置文件中配置desSecret值，若未配置，默认取“masuit”的MD5值
         /// </summary>
-        public static string DEFAULT_ENCRYPT_KEY = ConfigurationManager.AppSettings["desSecret"] ?? "masuit".MDString2();
+        public static string DEFAULT_ENCRYPT_KEY = "masuit".MDString2();
 
         /// <summary>
         /// 使用默认加密

Masuit.Tools/Html/HtmlTools.cs

@@ -1468,17 +1468,15 @@ ReCatch:
         /// <exception cref="Exception"> </exception>
         public static List<KeyValuePair<int, string>> GetHtmlByUrlList(List<KeyValuePair<int, string>> listUrl, string sCoding)
         {
-            int iTimeOut = int.Parse(System.Configuration.ConfigurationManager.AppSettings["SocketTimeOut"]);
+            int iTimeOut = 120000;
             StringBuilder sbHtml = new StringBuilder();
             List<KeyValuePair<int, string>> listResult = new List<KeyValuePair<int, string>>();
-            int nBytes = 0;
             Socket sock = null;
-            IPHostEntry ipHostInfo = null;
             try
             {
                 // 初始化				
                 Uri site = new Uri(listUrl[0].Value);
-                ipHostInfo = System.Net.Dns.GetHostEntry(site.Host);
+                var ipHostInfo = Dns.GetHostEntry(site.Host);
                 IPAddress ipAddress = ipHostInfo.AddressList[0];
                 IPEndPoint remoteEP = new IPEndPoint(ipAddress, site.Port);
                 sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
@@ -1496,6 +1494,7 @@ ReCatch:
                         "Host: " + site.Host + "\r\n\r\n" + '\0';
                     // 发送
                     byte[] msg = Encoding.GetEncoding(sCoding).GetBytes(sendMsg);
+                    int nBytes;
                     if ((nBytes = sock.Send(msg)) == 0)
                     {
                         sock.Shutdown(SocketShutdown.Both);

Masuit.Tools/NoSQL/RedisConnectionHelp.cs

@@ -10,11 +10,6 @@ namespace Masuit.Tools.NoSQL
     /// </summary>
     public static class RedisConnectionHelp
     {
-        /// <summary>
-        /// 系统自定义Key前缀
-        /// </summary>
-        public static readonly string SysCustomKey = ConfigurationManager.AppSettings["redisKey"] ?? "";
-
         /// <summary>
         /// Redis服务器连接字符串，在config配置文件中的ConnectionStrings节下配置，name固定为RedisHosts，值的格式：127.0.0.1:6379,allowadmin=true，如：<br/>
         /// &lt;connectionStrings&gt;<br/>

Masuit.Tools/NoSQL/RedisHelper.cs

@@ -22,10 +22,7 @@ namespace Masuit.Tools.NoSQL
         #region 构造函数
 
         /// <summary>
-        /// 构造函数，使用该构造函数需要先在config中配置链接字符串，连接字符串在config配置文件中的ConnectionStrings节下配置，name固定为RedisHosts，值的格式：127.0.0.1:6379,allowadmin=true，若未正确配置，将按默认值“127.0.0.1:6379,allowadmin=true”进行操作，如：<br/>
-        /// &lt;connectionStrings&gt;<br/>
-        ///      &lt;add name = "RedisHosts" connectionString="127.0.0.1:6379,allowadmin=true"/&gt;<br/>
-        /// &lt;/connectionStrings&gt;
+        /// 构造函数，使用该构造函数需要先配置链接字符串，连接字符串通过RedisConnectionHelp.RedisConnectionString属性进行获取，若未正确配置，将按默认值“127.0.0.1:6379,allowadmin=true”进行操作<br/>
         /// </summary>
         /// <param name="dbNum">数据库编号</param>
         public RedisHelper(int dbNum = 0) : this(dbNum, null)
@@ -949,7 +946,7 @@ namespace Masuit.Tools.NoSQL
 
         private string AddSysCustomKey(string oldKey)
         {
-            var prefixKey = CustomKey ?? RedisConnectionHelp.SysCustomKey;
+            var prefixKey = CustomKey ?? String.Empty;
             return prefixKey + oldKey;
         }