Commit 54e893e

committed

#docker 支持#

1 parent 74a845f commit 54e893eCopy full SHA for 54e893e

File tree

+23

-7

lines changed

+23

-7

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,20 @@`
`4`	`4`	`<TargetFramework>netcoreapp2.1</TargetFramework>`
`5`	`5`	`</PropertyGroup>`
`6`	`6`
	`7`	`+ <ItemGroup>`
	`8`	`+ <None Remove="Dockerfile" />`
	`9`	`+ </ItemGroup>`
	`10`	`+`
	`11`	`+ <ItemGroup>`
	`12`	`+ <Content Include="Dockerfile">`
	`13`	`+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>`
	`14`	`+ </Content>`
	`15`	`+ </ItemGroup>`
	`16`	`+`
`7`	`17`	`<ItemGroup>`
`8`	`18`	`<PackageReference Include="AspectCore.Extensions.Reflection" Version="0.7.0" />`
`9`	`19`	`<PackageReference Include="Microsoft.AspNetCore.App" />`
`10`		`- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />`
	`20`	`+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.1" />`
`11`	`21`	`<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />`
`12`	`22`	`<PackageReference Include="MySql.Data" Version="8.0.11" />`
`13`	`23`	`<PackageReference Include="sqlSugarCore" Version="4.6.4.9" />`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+FROM microsoft/aspnetcore:latest`
	`2`	`+`
	`3`	`+WORKDIR /app`
	`4`	`+COPY . .`
	`5`	`+`
	`6`	`+ENTRYPOINT ["dotnet", "APIJSON.NET.dll"]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public string GetUserRoleName()`
`32`	`32`	`public Role GetRole()`
`33`	`33`	`{`
`34`	`34`	`var role = new Role();`
`35`		`- if (string.IsNullOrEmpty(GetUserRoleName()))`
	`35`	`+ if (string.IsNullOrEmpty(GetUserRoleName()))//没登录默认取第一个`
`36`	`36`	`{`
`37`	`37`	`role = roles.FirstOrDefault();`
`38`	`38`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`<!DOCTYPE html>`
`2`	`2`	`<html>`
`3`	`3`	`<head>`
`4`		`- <title>Json在线解析</title>`
	`4`	`+ <title>APIJSON.NET</title>`
`5`	`5`	`<meta charset="utf-8" />`
`6`		`- <meta name="keywords" content="json,json在线解析,json格式化,json格式验证,json数组" />`
`7`		`- <meta name="description" content="一款简洁优雅的在线json解析器,可能是目前最好用的json在线查看工具" />`
	`6`	`+ <meta name="keywords" content="APIJSON.NET" />`
	`7`	`+ <meta name="description" content="APIJSON.NET" />`
`8`	`8`	`<link href="css/hint.min.css" rel="stylesheet">`
`9`	`9`	`<!-- <link href="css/diffview.css" rel="stylesheet"> -->`
`10`	`10`	`<link href="css/loading.css" rel="stylesheet">`
`@@ -18,11 +18,11 @@`
`18`	`18`	`<span class="on">APIJSON</span><span>.NET</span>`
`19`	`19`	`</a>`
`20`	`20`	`<span class="slogan">`
`21`		`- 「也许」是最好用的JSON格式化验证工具`
	`21`	`+`
`22`	`22`	`</span>`
`23`	`23`
`24`	`24`	`<div class="top-right">`
`25`		`- <a href="https://github.com/bimohxh/jsonon" target="_blank">`
	`25`	`+ <a href="https://github.com/liaozb/APIJSON.NET" target="_blank">`
`26`	`26`	`已开源在 GitHub 上`
`27`	`27`	`</a>`
`28`	`28`	`</div>`

Comments

(0)