合并

dotnetcore · Nov 9, 2021 · fe548ee · fe548ee
2 parents 4f05968 + 4631c2d
commit fe548ee
Show file tree

Hide file tree

Showing 24 changed files with 182 additions and 63 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/.github/workflows/dotnet-core.yml → .github/workflows/master-ci.yml b/.github/workflows/dotnet-core.yml → .github/workflows/master-ci.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 6.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/.github/workflows/publish-dotnet.yml → .github/workflows/publish.yml b/.github/workflows/publish-dotnet.yml → .github/workflows/publish.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 6.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/.github/workflows/dotnet.yml → .github/workflows/release-xxx.yml b/.github/workflows/dotnet.yml → .github/workflows/release-xxx.yml
@@ -1,12 +1,12 @@
-name: release-xxx ci workflow
+name: v-xxx ci workflow , it will build dockerimage-v.xxx and create a release package
 
 on:
   push:
     paths-ignore: 
       - '**/*.md'
       - '**/*.yml'
     tags:        
-      - 'release-*'
+      - 'v-*'
 
 jobs:
   build-reactapp:
@@ -40,7 +40,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 6.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build
@@ -49,6 +49,17 @@ jobs:
       with:
         name: agileconfig-ui
         path: AgileConfig.Server.Apisite/wwwroot/ui
+    - name: build server release xxx
+      run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release
+    - uses: papeloto/action-zip@v1
+      with:
+        files: AgileConfig.Server.Apisite/bin/Release/net6.0/publish/
+        dest: agileconfig_server_deploy.zip
+    - name: create release
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: agileconfig_server_deploy.zip
+        token: ${{ secrets.GITHUB_TOKEN }}
     - name: Push to Docker hub release -xxx
       uses: docker/build-push-action@v1
       with:

diff --git a/Agile.Config.Protocol/Agile.Config.Protocol.csproj b/Agile.Config.Protocol/Agile.Config.Protocol.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyVersion>1.5.1.5</AssemblyVersion>
-    <Version>1.5.1.5</Version>
+    <AssemblyVersion>1.5.3</AssemblyVersion>
+    <Version>1.5.2</Version>
+    <PackageVersion>1.5.2</PackageVersion>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -22,12 +24,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.18" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
-    <PackageReference Include="NLog" Version="4.6.8" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+    <PackageReference Include="NLog" Version="4.7.12" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" />
   </ItemGroup>

diff --git a/AgileConfig.Server.Apisite/JWT.cs b/AgileConfig.Server.Apisite/JWT.cs
@@ -43,7 +43,7 @@ public static string GetToken(string userId, string userName, bool isAdmin)
             {
     new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
     new Claim("id", userId, ClaimValueTypes.String), // 用户id
-    new Claim("name", userName), // 用户名
+    new Claim("username", userName, ClaimValueTypes.String), // 用户名
     new Claim("admin", isAdmin.ToString() ,ClaimValueTypes.Boolean) // 是否是管理员
             };
             var key = Encoding.UTF8.GetBytes(JwtSetting.Instance.SecurityKey);

diff --git a/AgileConfig.Server.Apisite/Properties/launchSettings.json b/AgileConfig.Server.Apisite/Properties/launchSettings.json
@@ -1,8 +1,8 @@
-{
+{
   "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:54550",
       "sslPort": 0
@@ -21,10 +21,16 @@
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "home/index",
-      "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "http://localhost:5000"
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
+      "publishAllPorts": true
     }
   }
 }
diff --git a/AgileConfig.Server.Apisite/Startup.cs b/AgileConfig.Server.Apisite/Startup.cs
@@ -5,13 +5,10 @@
 using AgileConfig.Server.Apisite.Websocket;
 using AgileConfig.Server.Common;
 using AgileConfig.Server.Data.Freesql;
-using AgileConfig.Server.IService;
 using AgileConfig.Server.Service;
-using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -49,7 +46,7 @@ public void ConfigureServices(IServiceCollection services)
                           };
                       });
             services.AddCors();
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0).AddRazorRuntimeCompilation();
+            services.AddMvc().AddRazorRuntimeCompilation();
 
             if (Appsettings.IsPreviewMode)
             {
@@ -88,7 +85,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IService
             app.UseWebSockets(new WebSocketOptions()
             {
                 KeepAliveInterval = TimeSpan.FromSeconds(60),
-                ReceiveBufferSize = 2 * 1024
             });
             app.UseMiddleware<WebsocketHandlerMiddleware>();
             app.UseStaticFiles();

diff --git a/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj b/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="MySql.Data" Version="8.0.19" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />

diff --git a/AgileConfig.Server.Common/FunctionUtil.cs b/AgileConfig.Server.Common/FunctionUtil.cs
@@ -29,11 +29,11 @@ public static T TRY<T>(Func<T> func, int tryCount)
                     result = func();
                     break;
                 }
-                catch (Exception ex)
+                catch
                 {
                     if (i == (tryCount - 1))
                     {
-                        throw ex;
+                        throw;
                     }
                 }
             }
@@ -63,11 +63,11 @@ public static async Task<T> TRYAsync<T>(Func<Task<T>> func, int tryCount)
                     result = await func();
                     break;
                 }
-                catch (Exception ex)
+                catch 
                 {
                     if (i == (tryCount - 1))
                     {
-                        throw ex;
+                        throw;
                     }
                 }
             }
@@ -126,11 +126,11 @@ public static void TRY(Action act, int tryCount)
                     act();
                     break;
                 }
-                catch (Exception ex)
+                catch 
                 {
                     if (i == (tryCount - 1))
                     {
-                        throw ex;
+                        throw;
                     }
                 }
             }

diff --git a/AgileConfig.Server.Common/HttpExt.cs b/AgileConfig.Server.Common/HttpExt.cs
@@ -61,7 +61,7 @@ public static (string, string) GetUserNamePasswordFromBasicAuthorization(this Ht
 
         public static string GetUserNameFromClaim(this HttpContext httpContext)
         {
-            var name = httpContext.User?.FindFirst("name")?.Value;
+            var name = httpContext.User?.FindFirst("username")?.Value;
 
             return name;
         }

diff --git a/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj b/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj
@@ -1,16 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj b/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FreeSql" Version="2.5.200" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj b/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj b/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj b/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj b/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj
@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.14.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx b/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx
@@ -14,7 +14,7 @@ const LayoutFooter : React.FC =()=>{
           { getAppVer()}
           &nbsp;&nbsp;  
           <a title={'agileconfig ' + getAppVer()} href="https://github.com/kklldog/AgileConfig" style={{color:'#bfbfbf'}}><GithubOutlined/> </a>
-          &nbsp; Powered by .netcore3.1 ant-design-pro4
+          &nbsp; Powered by .netcore6.0 ant-design-pro4
         </div>
       )
 }