zhoufan 7 年 前
コミット
45cd32efb7

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/App_Start/OutActionFilter.cs

19
                 string outsigncode = Configs.GetValue("OutSignCode");
19
                 string outsigncode = Configs.GetValue("OutSignCode");
20
                 string controllercode = filterContext.ActionDescriptor.ControllerDescriptor.ControllerName.ToLower();
20
                 string controllercode = filterContext.ActionDescriptor.ControllerDescriptor.ControllerName.ToLower();
21
                 string actioncode = filterContext.ActionDescriptor.ActionName.ToLower();
21
                 string actioncode = filterContext.ActionDescriptor.ActionName.ToLower();
22
-                string signcode = EncryptHelper.MD5Encrypt(controllercode + "/" + actioncode + "+" + EncryptHelper.SHA256Encrypt(outsigncode + "+" + DateTime.Now.ToString("yyyyMMdd")));
22
+                string signcode = EncryptHelper.MD5Encrypt(controllercode + "/" + actioncode + "+" + EncryptHelper.SHA1Encrypt(outsigncode + "+" + DateTime.Now.ToString("yyyyMMdd")));
23
                 if (insigncode == signcode)
23
                 if (insigncode == signcode)
24
                 {
24
                 {
25
                     bl = false;
25
                     bl = false;

+ 2 - 46
CallCenterCommon/CallCenter.Utility/EncryptHelper.cs

263
         /// <returns></returns>
263
         /// <returns></returns>
264
         public static string MD5Encrypt(string normalTxt)
264
         public static string MD5Encrypt(string normalTxt)
265
         {
265
         {
266
-            var bytes = Encoding.Default.GetBytes(normalTxt);//求Byte[]数组  
267
-            var Md5 = new MD5CryptoServiceProvider().ComputeHash(bytes);//求哈希值  
268
-            return Convert.ToBase64String(Md5);//将Byte[]数组转为净荷明文(其实就是字符串)  
266
+            return System.Web.Security.FormsAuthentication.HashPasswordForStoringInConfigFile(normalTxt, "MD5").ToLower();
269
         }
267
         }
270
 
268
 
271
         /// <summary>
269
         /// <summary>
275
         /// <returns></returns>
273
         /// <returns></returns>
276
         public static string SHA1Encrypt(string normalTxt)
274
         public static string SHA1Encrypt(string normalTxt)
277
         {
275
         {
278
-            var bytes = Encoding.Default.GetBytes(normalTxt);
279
-            var SHA = new SHA1CryptoServiceProvider();
280
-            var encryptbytes = SHA.ComputeHash(bytes);
281
-            return Convert.ToBase64String(encryptbytes);
282
-        }
283
-
284
-        /// <summary>
285
-        /// sha256
286
-        /// </summary>
287
-        /// <param name="normalTxt"></param>
288
-        /// <returns></returns>
289
-        public static string SHA256Encrypt(string normalTxt)
290
-        {
291
-            var bytes = Encoding.Default.GetBytes(normalTxt);
292
-            var SHA256 = new SHA256CryptoServiceProvider();
293
-            var encryptbytes = SHA256.ComputeHash(bytes);
294
-            return Convert.ToBase64String(encryptbytes);
295
-        }
296
-
297
-        /// <summary>
298
-        /// sha384
299
-        /// </summary>
300
-        /// <param name="normalTxt"></param>
301
-        /// <returns></returns>
302
-        public static string SHA384Encrypt(string normalTxt)
303
-        {
304
-            var bytes = Encoding.Default.GetBytes(normalTxt);
305
-            var SHA384 = new SHA384CryptoServiceProvider();
306
-            var encryptbytes = SHA384.ComputeHash(bytes);
307
-            return Convert.ToBase64String(encryptbytes);
308
-        }
309
-
310
-        /// <summary>
311
-        /// sha512
312
-        /// </summary>
313
-        /// <param name="normalTxt"></param>
314
-        /// <returns></returns>
315
-        public static string SHA512Encrypt(string normalTxt)
316
-        {
317
-            var bytes = Encoding.Default.GetBytes(normalTxt);
318
-            var SHA512 = new SHA512CryptoServiceProvider();
319
-            var encryptbytes = SHA512.ComputeHash(bytes);
320
-            return Convert.ToBase64String(encryptbytes);
276
+            return System.Web.Security.FormsAuthentication.HashPasswordForStoringInConfigFile(normalTxt, "SHA1").ToLower();
321
         }
277
         }
322
     }
278
     }
323
 }
279
 }