Skip to content

Commit 8d53433

Browse files
ren8179ren8179
committed
合并Account项目，添加Sqlite项目，暂时删除Web项目
1 parent 15e74f3 commit 8d53433

File tree

64 files changed

+98511
-1192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+98511
-1192
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@
1717
/_Core/QrF.Framework/obj/Debug
1818
*.suo
1919
*.pdb
20+
/Account/QrF.Account/obj
21+
/Account/QrF.Account/bin/Release
22+
/Sqlite/QrF.Sqlite/bin/Debug
23+
/Sqlite/QrF.Sqlite/obj/Debug

‎Account/QrF.Account.BLL/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎Account/QrF.Account.Contract/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎Account/QrF.Account.Contract/QrF.Account.Contract.csproj

-60
This file was deleted.

‎Account/QrF.Account.DAL/packages.config

-4
This file was deleted.

‎Account/QrF.Account.DAL/App.config ‎Account/QrF.Account/App.config

+12-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<configSections>
4-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
7-
<entityFramework>
8-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
9-
<providers>
10-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
11-
</providers>
12-
</entityFramework>
13-
<runtime>
14-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
15-
<dependentAssembly>
16-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
17-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
18-
</dependentAssembly>
19-
</assemblyBinding>
20-
</runtime>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
7+
<entityFramework>
8+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
9+
<providers>
10+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
11+
</providers>
12+
</entityFramework>
2113
</configuration>

‎Account/QrF.Account/Contract/AdminMenuConfig.cs

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Xml.Serialization;
4+
5+
namespace QrF.Account.Contract
6+
{
7+
[Serializable]
8+
public class AdminMenuConfig
9+
{
10+
public AdminMenuGroup[] AdminMenuGroups { get; set; }
11+
}
12+
13+
[Serializable]
14+
public class AdminMenuGroup
15+
{
16+
public List<AdminMenu> AdminMenuArray { get; set; }
17+
[XmlAttribute("id")]
18+
public string Id { get; set; }
19+
20+
[XmlAttribute("name")]
21+
public string Name { get; set; }
22+
23+
[XmlAttribute("url")]
24+
public string Url { get; set; }
25+
26+
[XmlAttribute("icon")]
27+
public string Icon { get; set; }
28+
29+
[XmlAttribute("code")]
30+
public string Code { get; set; }
31+
32+
[XmlAttribute("permission")]
33+
public string Permission { get; set; }
34+
35+
[XmlAttribute("info")]
36+
public string Info { get; set; }
37+
}
38+
39+
[Serializable]
40+
public class AdminMenu
41+
{
42+
[XmlAttribute("id")]
43+
public string Id { get; set; }
44+
45+
[XmlAttribute("name")]
46+
public string Name { get; set; }
47+
48+
[XmlAttribute("url")]
49+
public string Url { get; set; }
50+
public string Icon { get; set; }
51+
52+
[XmlAttribute("info")]
53+
public string Info { get; set; }
54+
55+
[XmlAttribute("code")]
56+
public string Code { get; set; }
57+
58+
[XmlAttribute("permission")]
59+
public string Permission { get; set; }
60+
}
61+
}

‎Account/QrF.Account.Contract/Model/LoginInfo.cs ‎Account/QrF.Account/Contract/LoginInfo.cs

+72-67
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,72 @@
1-
using QrF.Framework.Contract;
2-
using QrF.Framework.Utility;
3-
using System;
4-
using System.Collections.Generic;
5-
using System.ComponentModel.DataAnnotations.Schema;
6-
using System.Linq;
7-
8-
namespace QrF.Account.Contract
9-
{
10-
[Serializable]
11-
[Table("LoginInfo")]
12-
public class LoginInfo : ModelBase
13-
{
14-
public LoginInfo()
15-
{
16-
LastAccessTime = DateTime.Now;
17-
LoginToken = Guid.NewGuid();
18-
}
19-
20-
public LoginInfo(int userID, string loginName)
21-
{
22-
LastAccessTime = DateTime.Now;
23-
LoginToken = Guid.NewGuid();
24-
25-
UserID = userID;
26-
LoginName = loginName;
27-
}
28-
29-
public Guid LoginToken { get; set; }
30-
public DateTime LastAccessTime { get; set; }
31-
public int UserID { get; set; }
32-
public string LoginName { get; set; }
33-
public string ClientIP { get; set; }
34-
35-
public int EnumLoginAccountType { get; set; }
36-
37-
public string BusinessPermissionString { get; set; }
38-
39-
[NotMapped]
40-
public List<int> BusinessPermissionList
41-
{
42-
get
43-
{
44-
if (string.IsNullOrEmpty(BusinessPermissionString))
45-
return new List<int>();
46-
else
47-
return BusinessPermissionString.Split(",".ToCharArray()).Select(p => int.Parse(p)).ToList();
48-
}
49-
set
50-
{
51-
BusinessPermissionString = string.Join(",", value.Select(p => (int)p));
52-
}
53-
}
54-
}
55-
56-
[Flags]
57-
public enum EnumLoginAccountType
58-
{
59-
[EnumTitle("[无]", IsDisplay = false)]
60-
Guest = 0,
61-
/// <summary>
62-
/// 管理员
63-
/// </summary>
64-
[EnumTitle("管理员")]
65-
Administrator = 1,
66-
}
67-
}
1+
using QrF.Framework.Contract;
2+
using QrF.Framework.Utility;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.ComponentModel.DataAnnotations;
6+
using System.ComponentModel.DataAnnotations.Schema;
7+
using System.Linq;
8+
9+
namespace QrF.Account.Contract
10+
{
11+
[Serializable]
12+
[Table("LoginInfo")]
13+
public class LoginInfo : ModelBase
14+
{
15+
public LoginInfo()
16+
{
17+
LastAccessTime = DateTime.Now;
18+
LoginToken = Guid.NewGuid();
19+
}
20+
21+
public LoginInfo(int userID, string loginName)
22+
{
23+
LastAccessTime = DateTime.Now;
24+
LoginToken = Guid.NewGuid();
25+
26+
UserID = userID;
27+
LoginName = loginName;
28+
}
29+
30+
public Guid LoginToken { get; set; }
31+
public DateTime LastAccessTime { get; set; }
32+
public int UserID { get; set; }
33+
[StringLength(30)]
34+
public string LoginName { get; set; }
35+
[StringLength(90)]
36+
public string ClientIP { get; set; }
37+
38+
public int EnumLoginAccountType { get; set; }
39+
40+
public string BusinessPermissionString { get; set; }
41+
42+
public string ProtectedTicket { get; set; }
43+
44+
[NotMapped]
45+
public List<int> BusinessPermissionList
46+
{
47+
get
48+
{
49+
if (string.IsNullOrEmpty(BusinessPermissionString))
50+
return new List<int>();
51+
else
52+
return BusinessPermissionString.Split(",".ToCharArray()).Select(p => int.Parse(p)).ToList();
53+
}
54+
set
55+
{
56+
BusinessPermissionString = string.Join(",", value.Select(p => (int)p));
57+
}
58+
}
59+
}
60+
61+
[Flags]
62+
public enum EnumLoginAccountType
63+
{
64+
[EnumTitle("[无]", IsDisplay = false)]
65+
Guest = 0,
66+
/// <summary>
67+
/// 管理员
68+
/// </summary>
69+
[EnumTitle("管理员")]
70+
Administrator = 1,
71+
}
72+
}

0 commit comments

Comments
 (0)