Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c6e9ca3
index
zhating Mar 3, 2017
4cd67f7
合并
zhating Mar 3, 2017
f1a6727
试试
zhating Mar 9, 2017
5c8bc2a
数据库更新
Dearkano Mar 10, 2017
6cb3fea
Merge branch '首页' of https://github.com/sgjsakura/CC98.Software.git
Dearkano Mar 10, 2017
2fb8754
数据库迁移
Dearkano Mar 10, 2017
4c03d2e
new
zhating Mar 10, 2017
718d676
下载界面 和 搜索结果界面
yfangdengyu4x Mar 10, 2017
a2fb63b
new
zhating Mar 10, 2017
6c2b442
test
yfangdengyu4x Mar 10, 2017
7b7498e
搜索部分
wonderjeo Mar 10, 2017
658c249
下载页
yfangdengyu4x Mar 10, 2017
e51f406
合并
yfangdengyu4x Mar 10, 2017
30b7db9
后台管理界面更新 以及 数据库更新 主页更新
Dearkano Mar 10, 2017
46dcdd1
Merge branch '首页' of https://github.com/sgjsakura/CC98.Software.git
Dearkano Mar 10, 2017
b06cf33
shoujian
yfangdengyu4x Mar 24, 2017
06c3c87
hebing
yfangdengyu4x Mar 24, 2017
3b6a533
收件箱
yfangdengyu4x Mar 24, 2017
9eaca01
那天晚上做的
yfangdengyu4x Mar 27, 2017
535cdc1
更新website
Dearkano Mar 31, 2017
429f098
Merge branch '首页' into Website
Dearkano Mar 31, 2017
92206a2
website更新 合并首页master
Dearkano Mar 31, 2017
624844c
mm
yfangdengyu4x Mar 31, 2017
31de7e0
111
Dearkano Mar 31, 2017
d8be5e0
2
yfangdengyu4x Mar 31, 2017
49fb963
333
yfangdengyu4x Mar 31, 2017
3383e4f
vc分页完成 detail list index网页c#的加入 新控制器testdb
Dearkano Apr 1, 2017
a3ad26a
4,7
Dearkano Apr 7, 2017
76de233
合并搜索
Dearkano Apr 7, 2017
a226548
搜索分页
Dearkano Apr 7, 2017
798b330
更改错误内容
Dearkano Apr 7, 2017
ba87975
partial更改
Dearkano Apr 10, 2017
7d110a8
主页加入响应式
MoLan1980 Apr 17, 2017
78df4b6
4.21 并没有什么更改
yfangdengyu4x Apr 21, 2017
7d46820
没什么用的合并
yfangdengyu4x Apr 21, 2017
c40cac9
list修改
yfangdengyu4x Apr 21, 2017
b57a3ba
加入身份审核 同步改异步
Dearkano Apr 21, 2017
0712527
4.28
yfangdengyu4x Apr 28, 2017
035348e
4.28
yfangdengyu4x Apr 28, 2017
30d0f44
下载上传功能重写+测试 数据库需要更新
Dearkano Apr 28, 2017
e8bbe11
更新为y方的list
Dearkano Apr 28, 2017
707b7da
信箱功能重写 测试完毕
Dearkano Apr 28, 2017
0b6e798
5.1 前段
yfangdengyu4x May 1, 2017
eb75db2
5.3 box in detial & details
yfangdengyu4x May 3, 2017
3c42bb3
更正上方菜单搜索框垂直居中问题。
MoLan1980 May 4, 2017
bae127a
增加注销 修复翻页 改进数据库名字
Dearkano May 5, 2017
88a7465
加入新的包之后的翻页功能,搜索 信箱重构 ,分类翻页重写
Dearkano May 5, 2017
2cc8757
上传界面样式修改
MoLan1980 May 6, 2017
3a80c3c
界面优化1.0
MoLan1980 May 9, 2017
07f8453
上传界面
MoLan1980 May 22, 2017
3487198
挖坟
Dearkano Apr 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions CC98.Software/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
261 changes: 261 additions & 0 deletions CC98.Software/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
#*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
5 changes: 1 addition & 4 deletions CC98.Software/CC98.Software.sln
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.9
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6486DE3E-291E-49EE-86ED-F06F820F9F6F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EB4C55BA-B694-4CDB-A9FD-722BCBE306E8}"
ProjectSection(SolutionItems) = preProject
nuget.config = nuget.config
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CC98.Software", "src\CC98.Software\CC98.Software.csproj", "{BDA5FAB8-0415-46C6-9658-41CA99135A7C}"
EndProject
Expand Down
12 changes: 10 additions & 2 deletions CC98.Software/src/CC98.Software/CC98.Software.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
<PackageReference Include="Sakura.AspNetCore.Authentication.ExternalCookie" Version="2.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="10.2.1" />
<PackageReference Include="Sakura.AspNetCore.Authentication.ExternalCookie" Version="2.0.2" />
<PackageReference Include="Sakura.AspNetCore.Mvc.PagedList" Version="2.0.12" />
<PackageReference Include="Sakura.AspNetCore.PagedList" Version="2.0.2" />
<PackageReference Include="Sakura.AspNetCore.PagedList.Abstractions" Version="2.0.1" />
<PackageReference Include="Sakura.AspNetCore.PagedList.Async" Version="1.0.0" />
</ItemGroup>

<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
Expand All @@ -51,4 +55,8 @@
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="Views\Home\AfterUploading.cshtml" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,11 @@ private IActionResult ReturnToLocal(string returnUrl)
return Redirect(returnUrl);
}

public async Task<IActionResult> LogOut()
{
await ExternalSignInManager.SignOutAsync();
return RedirectToAction("Index","Home");
}

}
}
Loading