Skip to content

Commit b4db284

Browse files
huangxiangyaohuangxiangyao
committed
release 3.1.201.2513
1 parent f3d8e2b commit b4db284

File tree

2,918 files changed

+110
-5362
lines changed

Some content is hidden

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

2,918 files changed

+110
-5362
lines changed

‎src/Core/Demo.Data.Host/Views/Shared/_Layout.cshtml‎

Lines changed: 47 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,47 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>@ViewData["Title"] - Authentication.Demo</title>
7-
8-
<environment include="Development">
9-
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
10-
<link rel="stylesheet" href="~/css/site.css" />
11-
</environment>
12-
<environment exclude="Development">
13-
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
14-
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
15-
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
16-
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
17-
</environment>
18-
</head>
19-
<body>
20-
<nav class="navbar navbar-inverse navbar-fixed-top">
21-
<div class="container">
22-
<div class="navbar-header">
23-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
24-
<span class="sr-only">Toggle navigation</span>
25-
<span class="icon-bar"></span>
26-
<span class="icon-bar"></span>
27-
<span class="icon-bar"></span>
28-
</button>
29-
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">AspNetCore.WeixinOAuth.Demo</a>
30-
</div>
31-
<div class="navbar-collapse collapse">
32-
<ul class="nav navbar-nav">
33-
<li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
34-
<li><a asp-area="" asp-controller="Users" asp-action="Index">Users</a></li>
35-
<li><a asp-area="" asp-controller="Roles" asp-action="Index">Roles</a></li>
36-
</ul>
37-
@await Html.PartialAsync("_LoginPartial")
38-
</div>
39-
</div>
40-
</nav>
41-
<div class="container body-content">
42-
@RenderBody()
43-
<hr />
44-
<footer>
45-
<p>&copy; 2018 - Myvas.AspNetCore.Authentication.Demo</p>
46-
</footer>
47-
</div>
48-
49-
<environment include="Development">
50-
<script src="~/lib/jquery/dist/jquery.js"></script>
51-
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
52-
<script src="~/js/site.js" asp-append-version="true"></script>
53-
</environment>
54-
<environment exclude="Development">
55-
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
56-
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
57-
asp-fallback-test="window.jQuery"
58-
crossorigin="anonymous"
59-
integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
60-
</script>
61-
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
62-
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
63-
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
64-
crossorigin="anonymous"
65-
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
66-
</script>
67-
<script src="~/js/site.min.js" asp-append-version="true"></script>
68-
</environment>
69-
70-
@RenderSection("Scripts", required: false)
71-
</body>
72-
</html>
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<title>@ViewData["Title"] - Authentication.Demo</title>
7+
<base src="~/" />
8+
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
9+
<link rel="stylesheet" href="~/css/site.min.css" />
10+
</head>
11+
<body>
12+
<nav class="navbar navbar-inverse navbar-fixed-top">
13+
<div class="container">
14+
<div class="navbar-header">
15+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
16+
<span class="sr-only">Toggle navigation</span>
17+
<span class="icon-bar"></span>
18+
<span class="icon-bar"></span>
19+
<span class="icon-bar"></span>
20+
</button>
21+
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">AspNetCore.WeixinOAuth.Demo</a>
22+
</div>
23+
<div class="navbar-collapse collapse">
24+
<ul class="nav navbar-nav">
25+
<li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
26+
<li><a asp-area="" asp-controller="Users" asp-action="Index">Users</a></li>
27+
<li><a asp-area="" asp-controller="Roles" asp-action="Index">Roles</a></li>
28+
</ul>
29+
@await Html.PartialAsync("_LoginPartial")
30+
</div>
31+
</div>
32+
</nav>
33+
<div class="container body-content">
34+
@RenderBody()
35+
<hr />
36+
<footer>
37+
<p>&copy; 2018 - Myvas.AspNetCore.Authentication.Demo</p>
38+
</footer>
39+
</div>
40+
41+
<script src="~/lib/jquery/dist/jquery.min.js"></script>
42+
<script src="~/lib/bootstrap/dist/js/bootstrap.min.js"></script>
43+
<script src="~/js/site.min.js" asp-append-version="true"></script>
44+
45+
@RenderSection("Scripts", required: false)
46+
</body>
47+
</html>

‎src/MvcDemo/Demo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<UserSecretsId>Myvas.AspNetCore.Authentication.Demo</UserSecretsId>
66
<RootNamespace>Demo</RootNamespace>
77
<AssemblyName>Demo</AssemblyName>
8-
<Version>3.1.201.2512</Version>
8+
<Version>3.1.201.2513</Version>
99
<LangVersion>8.0</LangVersion>
1010
</PropertyGroup>
1111

‎src/MvcDemo/Views/Home/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@
7171
<dd>检测微信客户端：在Account/Login中检测客户端，如果是微信客户端则直接使用WeixinAuth身份验证，否则触发标准Identity登录网页。</dd>
7272
</dl>
7373

74-
<footer class="border-top card-footer text-muted">
75-
<div class="container">&copy; 2004-2020 我的虚拟应用服务网 <a href="http://www.beian.miit.gov.cn/" target="_blank" rel="nofollow" class="text-muted">粤ICP备17119791号</a></div>
74+
<footer class="footer">
75+
<div class="text-muted">Copyright &copy; 2004-2020 广州市境迁咨询服务有限公司 <a href="http://beian.miit.gov.cn/" target="_blank" rel="nofollow" class="text-muted">粤ICP备17119791号</a></div>
7676
</footer>

‎src/MvcDemo/libman.json‎

Lines changed: 60 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,61 @@
1-
{
2-
"version": "1.0",
3-
"defaultProvider": "unpkg",
4-
"libraries": [
5-
{
6-
"library": "bootstrap@4.3.1",
7-
"destination": "wwwroot/lib/bootstrap/"
8-
},
9-
{
10-
"provider": "cdnjs",
11-
"library": "jquery@3.4.1",
12-
"destination": "wwwroot/lib/jquery/"
13-
},
14-
{
15-
"provider": "cdnjs",
16-
"library": "jquery-validation-unobtrusive@3.2.11",
17-
"destination": "wwwroot/lib/jquery-validation-unobtrusive/"
18-
},
19-
{
20-
"provider": "cdnjs",
21-
"library": "open-iconic@1.1.1",
22-
"destination": "wwwroot/lib/open-iconic/"
23-
},
24-
{
25-
"library": "jquery-validation@1.19.1",
26-
"destination": "wwwroot/lib/jquery-validation/"
27-
},
28-
{
29-
"library": "jquery-qrcode2@1.0.0",
30-
"destination": "wwwroot/lib/jquery-qrcode2/"
31-
}
32-
]
1+
{
2+
"version": "1.0",
3+
"defaultProvider": "unpkg",
4+
"libraries": [
5+
{
6+
"library": "bootstrap@4.3.1",
7+
"destination": "wwwroot/lib/bootstrap/",
8+
"files": [
9+
"dist/css/bootstrap.min.css",
10+
"dist/css/bootstrap-grid.min.css.map",
11+
"dist/js/bootstrap.bundle.min.js",
12+
"dist/js/bootstrap.bundle.min.js.map"
13+
]
14+
},
15+
{
16+
"provider": "cdnjs",
17+
"library": "jquery@3.4.1",
18+
"destination": "wwwroot/lib/jquery/",
19+
"files": [
20+
"jquery.min.js",
21+
"jquery.min.map"
22+
]
23+
},
24+
{
25+
"provider": "cdnjs",
26+
"library": "jquery-validation-unobtrusive@3.2.11",
27+
"destination": "wwwroot/lib/jquery-validation-unobtrusive/",
28+
"files": [
29+
"jquery.validate.unobtrusive.min.js"
30+
]
31+
},
32+
{
33+
"provider": "cdnjs",
34+
"library": "open-iconic@1.1.1",
35+
"destination": "wwwroot/lib/open-iconic/",
36+
"files": [
37+
"font/css/open-iconic-bootstrap.min.css",
38+
"font/css/open-iconic.min.css",
39+
"font/fonts/open-iconic.eot",
40+
"font/fonts/open-iconic.svg",
41+
"font/fonts/open-iconic.ttf",
42+
"font/fonts/open-iconic.otf",
43+
"font/fonts/open-iconic.woff"
44+
]
45+
},
46+
{
47+
"library": "jquery-validation@1.19.1",
48+
"destination": "wwwroot/lib/jquery-validation/",
49+
"files": [
50+
"dist/jquery.validate.min.js"
51+
]
52+
},
53+
{
54+
"library": "jquery-qrcode2@1.0.0",
55+
"destination": "wwwroot/lib/jquery-qrcode2/",
56+
"files": [
57+
"dist/jquery-qrcode.min.js"
58+
]
59+
}
60+
]
3361
}

0 commit comments

Comments
 (0)