#docker 支持#

liaozb · liaozb · commit 54e893eb7073 · 2018-08-16T18:15:01.000+08:00
diff --git a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj
@@ -4,10 +4,20 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Dockerfile" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Dockerfile">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="0.7.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
     <PackageReference Include="MySql.Data" Version="8.0.11" />
     <PackageReference Include="sqlSugarCore" Version="4.6.4.9" />
diff --git a/APIJSON.NET/APIJSON.NET/Dockerfile b/APIJSON.NET/APIJSON.NET/Dockerfile
@@ -0,0 +1,6 @@
+﻿FROM microsoft/aspnetcore:latest
+
+WORKDIR /app
+COPY . .
+
+ENTRYPOINT ["dotnet", "APIJSON.NET.dll"]
diff --git a/APIJSON.NET/APIJSON.NET/Services/IdentityService.cs b/APIJSON.NET/APIJSON.NET/Services/IdentityService.cs
@@ -32,7 +32,7 @@ public string GetUserRoleName()
         public Role GetRole()
         {
             var role = new Role();
-            if (string.IsNullOrEmpty(GetUserRoleName()))
+            if (string.IsNullOrEmpty(GetUserRoleName()))//没登录默认取第一个
             {
                 role = roles.FirstOrDefault();
 
diff --git a/APIJSON.NET/APIJSON.NET/wwwroot/index.html b/APIJSON.NET/APIJSON.NET/wwwroot/index.html
@@ -1,10 +1,10 @@
 ﻿<!DOCTYPE html>
 <html>
 <head>
-    <title>Json在线解析</title>
+    <title>APIJSON.NET</title>
     <meta charset="utf-8" />
-    <meta name="keywords" content="json,json在线解析,json格式化,json格式验证,json数组" />
-    <meta name="description" content="一款简洁优雅的在线json解析器，可能是目前最好用的json在线查看工具" />
+    <meta name="keywords" content="APIJSON.NET" />
+    <meta name="description" content="APIJSON.NET" />
     <link href="css/hint.min.css" rel="stylesheet">
     <!-- <link href="css/diffview.css" rel="stylesheet"> -->
     <link href="css/loading.css" rel="stylesheet">
@@ -18,11 +18,11 @@
                 <span class="on">APIJSON</span><span>.NET</span>
             </a>
             <span class="slogan">
-                「也许」是最好用的JSON格式化验证工具
+               
             </span>
 
             <div class="top-right">
-                <a href="https://github.com/bimohxh/jsonon" target="_blank">
+                <a href="https://github.com/liaozb/APIJSON.NET" target="_blank">
                     已开源在 GitHub 上
                 </a>
             </div>

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`