diff --git a/.gitignore b/.gitignore
index 3eb2c9b..af12aac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -240,3 +240,4 @@ Information
/Avatars
/GitCandy.Web/Content/Site.css
/DLL
+/GitCandy.Web/Content/images/logo
diff --git a/GitCandy.Web/Content/Cube.css b/GitCandy.Web/Content/Cube.css
index f877754..1e3477e 100644
--- a/GitCandy.Web/Content/Cube.css
+++ b/GitCandy.Web/Content/Cube.css
@@ -60,3 +60,13 @@
.cube-login .main-checkbox input[type=checkbox]:checked + label:after { opacity: 1; }
.cube-login .text { float: left; margin-left: 7px; line-height: 20px; padding-top: 5px; text-transform: capitalize; }
.cube-login .btn { float: right; font-size: 14px; color: #fff; background: #00b4ef; border-radius: 30px; padding: 8px 50px; border: none; text-transform: capitalize; transition: all 0.5s ease 0s; }
+
+/* 2019-03-15 表格禁止折行，避免拥挤 */
+.table-responsive > .table > tbody > tr > td,
+.table-responsive > .table > tbody > tr > th,
+.table-responsive > .table > tfoot > tr > td,
+.table-responsive > .table > tfoot > tr > th,
+.table-responsive > .table > thead > tr > td,
+.table-responsive > .table > thead > tr > th {
+ white-space: nowrap
+}
diff --git a/GitCandy.Web/GitCandy.Web.csproj b/GitCandy.Web/GitCandy.Web.csproj
index 4b1ae8f..83428be 100644
--- a/GitCandy.Web/GitCandy.Web.csproj
+++ b/GitCandy.Web/GitCandy.Web.csproj
@@ -44,26 +44,31 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
- <Reference Include="NewLife.Core, Version=7.3.6755.22250, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.7.3.6755.22250\lib\net45\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.4.7252.1562, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.4.2019.1109\lib\net45\NewLife.Core.dll</HintPath>
</Reference>
- <Reference Include="NewLife.Cube, Version=2.3.6722.41209, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Cube.2.3.6722.41209\lib\net45\NewLife.Cube.dll</HintPath>
+ <Reference Include="NewLife.Cube, Version=2.8.7253.589, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Cube.2.8.7253.589\lib\net45\NewLife.Cube.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
+ <Reference Include="System.Data" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
+ <Reference Include="System.Management" />
<Reference Include="System.Numerics" />
<Reference Include="System.Security" />
+ <Reference Include="System.ServiceProcess" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
+ <Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference>
@@ -82,9 +87,10 @@
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
+ <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="XCode, Version=9.8.6755.22252, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.8.6755.22252\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.14.7252.1601, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.14.2019.1109\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/GitCandy.Web/packages.config b/GitCandy.Web/packages.config
index 0d4ca7e..128dd88 100644
--- a/GitCandy.Web/packages.config
+++ b/GitCandy.Web/packages.config
@@ -11,7 +11,7 @@
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.6" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
- <package id="NewLife.Core" version="7.3.6755.22250" targetFramework="net45" />
- <package id="NewLife.Cube" version="2.3.6722.41209" targetFramework="net45" />
- <package id="NewLife.XCode" version="9.8.6755.22252" targetFramework="net45" />
+ <package id="NewLife.Core" version="8.4.2019.1109" targetFramework="net45" />
+ <package id="NewLife.Cube" version="2.8.7253.589" targetFramework="net45" />
+ <package id="NewLife.XCode" version="9.14.2019.1109" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git "a/GitCandy/Entity/Entity/\347\224\250\346\210\267.Biz.cs" "b/GitCandy/Entity/Entity/\347\224\250\346\210\267.Biz.cs"
index 932ce78..89dfab9 100644
--- "a/GitCandy/Entity/Entity/\347\224\250\346\210\267.Biz.cs"
+++ "b/GitCandy/Entity/Entity/\347\224\250\346\210\267.Biz.cs"
@@ -23,6 +23,13 @@ namespace NewLife.GitCandy.Entity
public partial class User : LogEntity<User>, IManageUser, IIdentity
{
#region 对象操作
+ static User()
+ {
+ Meta.Modules.Add<UserModule>();
+ Meta.Modules.Add<TimeModule>();
+ Meta.Modules.Add<IPModule>();
+ }
+
/// <summary>首次连接数据库时初始化数据，仅用于实体类重载，用户不应该调用该方法</summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override void InitData()
@@ -71,7 +78,7 @@ namespace NewLife.GitCandy.Entity
{
get
{
- if (_Teams == null && !Dirtys.ContainsKey("Teams"))
+ if (_Teams == null && !Dirtys["Teams"])
{
_Teams = UserTeam.FindAllByUserID(ID);
@@ -90,7 +97,7 @@ namespace NewLife.GitCandy.Entity
{
get
{
- if (_Repositories == null && !Dirtys.ContainsKey("Repositories"))
+ if (_Repositories == null && !Dirtys["Repositories"])
{
_Repositories = UserRepository.FindAllByUserID(ID);
@@ -255,7 +262,7 @@ namespace NewLife.GitCandy.Entity
user.Logins++;
user.LastLogin = DateTime.Now;
- user.LastLoginIP = WebHelper.UserHost;
+ //user.LastLoginIP = WebHelper.UserHost;
user.Save();
return true;
diff --git a/GitCandy/GitCandy.csproj b/GitCandy/GitCandy.csproj
index 524a00a..93d8a61 100644
--- a/GitCandy/GitCandy.csproj
+++ b/GitCandy/GitCandy.csproj
@@ -32,23 +32,22 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NewLife.Core, Version=7.3.6755.22250, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.7.3.6755.22250\lib\net45\NewLife.Core.dll</HintPath>
- </Reference>
+ <Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
+ <Reference Include="System.Management" />
<Reference Include="System.Numerics" />
+ <Reference Include="System.ServiceProcess" />
<Reference Include="System.Web" />
+ <Reference Include="System.Web.Extensions" />
+ <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="XCode, Version=9.8.6755.22252, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.8.6755.22252\lib\net45\XCode.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Base\FileHelper.cs" />
@@ -84,11 +83,24 @@
<DesignTime>True</DesignTime>
<DependentUpon>生成实体类.tt</DependentUpon>
</None>
- <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="LibGit2Sharp">
+ <Version>0.22.0</Version>
+ </PackageReference>
+ <PackageReference Include="LibGit2Sharp.NativeBinaries">
+ <Version>1.0.129</Version>
+ </PackageReference>
+ <PackageReference Include="NewLife.Core">
+ <Version>8.4.2019.1109</Version>
+ </PackageReference>
+ <PackageReference Include="NewLife.XCode">
+ <Version>9.14.2019.1109</Version>
+ </PackageReference>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.