diff --git a/Infrastructure/ControlHelper.cs b/Infrastructure/ControlHelper.cs deleted file mode 100644 index d7d20d72..00000000 --- a/Infrastructure/ControlHelper.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Infrastructure -{ - public class ControlHelper - { - /// - /// 根据集合得到下拉框 - /// - /// 实体对象 - /// 实体集合 - /// 下拉框的id - /// 值 字段名 - /// 文本 字段名 - /// 需要选中的值 - /// 样式名称 - /// - public static string GetDropDownByList(List rList, string id, string valFiled, string nameFiled, string selected = "0", string css = "") - { - string str = " "; - return str; - } - - /// - /// 根据枚举得到下拉框 - /// - /// 枚举对象 - /// 下拉框的id - /// 需要选中的值 - /// 样式名称 - /// - public static string GetDropDownByEnum(Type type, string id, string selected = "", string css = "") - { - string str = " "; - return str; - } - } -} diff --git a/Infrastructure/CookieHelper.cs b/Infrastructure/CookieHelper.cs index d636042d..11ce0b82 100644 --- a/Infrastructure/CookieHelper.cs +++ b/Infrastructure/CookieHelper.cs @@ -13,7 +13,7 @@ using System; using System.Web; -namespace Infrastructure.Helper +namespace Infrastructure { /// /// Cookie帮助类 @@ -68,5 +68,45 @@ namespace Infrastructure.Helper } return ""; } + + /// + /// Get cookie expiry date that was set in the cookie value + /// + /// + /// + public static DateTime GetExpirationDate(HttpCookie cookie) + { + if (String.IsNullOrEmpty(cookie.Value)) + { + return DateTime.MinValue; + } + string strDateTime = cookie.Value.Substring(cookie.Value.IndexOf("|") + 1); + return Convert.ToDateTime(strDateTime); + } + + /// + /// Set cookie value using the token and the expiry date + /// + /// + /// + /// + public static string BuildCookueValue(string value, int minutes) + { + return String.Format("{0}|{1}", value, DateTime.Now.AddMinutes(minutes).ToString()); + } + + /// + /// Reads cookie value from the cookie + /// + /// + /// + public static string GetCookieValue(HttpCookie cookie) + { + if (String.IsNullOrEmpty(cookie.Value)) + { + return cookie.Value; + } + return cookie.Value.Substring(0, cookie.Value.IndexOf("|")); + } } } diff --git a/Infrastructure/GenerateId.cs b/Infrastructure/GenerateId.cs index ca73e230..c193b399 100644 --- a/Infrastructure/GenerateId.cs +++ b/Infrastructure/GenerateId.cs @@ -13,11 +13,17 @@ // *********************************************************************** using System; +using System.Security.Cryptography; namespace Infrastructure { public class GenerateId { + public static string GetGuidHash() + { + return Guid.NewGuid().ToString().GetHashCode().ToString("x"); + } + /// /// 生成一个长整型，可以转成19字节长的字符串 /// @@ -40,7 +46,16 @@ namespace Infrastructure i *= ((int)b + 1); } - return string.Format("{0:x}", i - DateTime.Now.Ticks); + return String.Format("{0:x}", i - DateTime.Now.Ticks); + } + + /// + /// 创建11位的英文与数字组合 + /// + /// System.String. + public static string ShortStr() + { + return Convert(GenerateLong()); } /// @@ -55,6 +70,8 @@ namespace Infrastructure return strDateTimeNumber + strRandomResult; } + #region private + /// /// 参考：msdn上的RNGCryptoServiceProvider例子 /// @@ -66,46 +83,44 @@ namespace Infrastructure // Create a byte array to hold the random value. byte[] randomNumber = new byte[length]; // Create a new instance of the RNGCryptoServiceProvider. - System.Security.Cryptography.RNGCryptoServiceProvider rng = new System.Security.Cryptography.RNGCryptoServiceProvider(); + RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider(); // Fill the array with a random value. rng.GetBytes(randomNumber); // Convert the byte to an uint value to make the modulus operation easier. uint randomResult = 0x0; for (int i = 0; i < length; i++) { - randomResult |= ((uint)randomNumber[i] << ((length - 1 - i) * 8)); + randomResult |= ((uint) randomNumber[i] << ((length - 1 - i)*8)); } - return (int)(randomResult % numSeeds) + 1; + return (int) (randomResult%numSeeds) + 1; } - /// - /// 创建11位的英文与数字组合 - /// - /// System.String. - public static string ShortStr() - { - return Convert(GenerateLong()); - } + static string Seq = "s9LFkgy5RovixI1aOf8UhdY3r4DMplQZJXPqebE0WSjBn7wVzmN2Gc6THCAKut"; + /// /// 10进制转换为62进制 /// /// /// - - private static string Convert(long id) + + private static string Convert(long id) { if (id < 62) { - return Seq[(int)id].ToString(); + return Seq[(int) id].ToString(); } - int y = (int)(id % 62); - long x = (long)(id / 62); + int y = (int) (id%62); + long x = (long) (id/62); return Convert(x) + Seq[y]; } + #endregion + + + } } \ No newline at end of file diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj index 6b721b56..174cf348 100644 --- a/Infrastructure/Infrastructure.csproj +++ b/Infrastructure/Infrastructure.csproj @@ -35,15 +35,29 @@ ..\packages\AutoMapper.4.1.0\lib\net45\AutoMapper.dll + + ..\packages\EnyimMemcached.2.12\lib\net35\Enyim.Caching.dll + True + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + False ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + True + @@ -53,12 +67,15 @@ - + + + + @@ -67,12 +84,14 @@ + + - + + + FileSystem + Release + Any CPU + + True + False + E:\测试学习\OpenAuth.Net\Release + False + + \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml index f23c776e..20e2f066 100644 --- a/OpenAuth.Mvc/Views/Home/Index.cshtml +++ b/OpenAuth.Mvc/Views/Home/Index.cshtml @@ -126,18 +126,21 @@
    - - @foreach (var module in Model) + @if (Model != null) { + foreach (var module in Model) + { -
  • @module.Name
    • +
  • @module.Name
    • + } } +
@@ -175,7 +178,7 @@