合并

dotnetcore · Sep 11, 2023 · 4383f66 · 4383f66
2 parents 974515e + d2241fe
commit 4383f66
Show file tree

Hide file tree

Showing 673 changed files with 119,617 additions and 346 deletions.
diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: AgileConfig.Server.UI/react-ui-antd
+        working-directory: src/AgileConfig.Server.UI/react-ui-antd
     strategy:
       matrix:
         node-version: [16.x]
@@ -31,7 +31,7 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: agileconfig-ui
-        path: AgileConfig.Server.UI/react-ui-antd/dist/
+        path: src/AgileConfig.Server.UI/react-ui-antd/dist/
   build-dotnet:
     needs: build-reactapp
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
     - uses: actions/download-artifact@v2
       with:
         name: agileconfig-ui
-        path: AgileConfig.Server.Apisite/wwwroot/ui
+        path: src/AgileConfig.Server.Apisite/wwwroot/ui
     - name: Push to Docker Hub
       uses: docker/build-push-action@v1
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: AgileConfig.Server.UI/react-ui-antd
+        working-directory: src/AgileConfig.Server.UI/react-ui-antd
     strategy:
       matrix:
         node-version: [16.x]
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: agileconfig-ui
-        path: AgileConfig.Server.UI/react-ui-antd/dist/
+        path: src/AgileConfig.Server.UI/react-ui-antd/dist/
   build-dotnet:
     needs: build-reactapp
     runs-on: ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
     - uses: actions/download-artifact@v2
       with:
         name: agileconfig-ui
-        path: AgileConfig.Server.Apisite/wwwroot/ui
+        path: src/AgileConfig.Server.Apisite/wwwroot/ui
     - name: Push to Docker Hub
       uses: docker/build-push-action@v1
       with:

diff --git a/.github/workflows/release-xxx.yml b/.github/workflows/release-xxx.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: AgileConfig.Server.UI/react-ui-antd
+        working-directory: src/AgileConfig.Server.UI/react-ui-antd
     strategy:
       matrix:
         node-version: [16.x]
@@ -30,7 +30,7 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: agileconfig-ui
-        path: AgileConfig.Server.UI/react-ui-antd/dist/
+        path: src/AgileConfig.Server.UI/react-ui-antd/dist/
   build-dotnet:
     needs: build-reactapp
     runs-on: ubuntu-latest
@@ -48,7 +48,7 @@ jobs:
     - uses: actions/download-artifact@v2
       with:
         name: agileconfig-ui
-        path: AgileConfig.Server.Apisite/wwwroot/ui
+        path: src/AgileConfig.Server.Apisite/wwwroot/ui
     - name: build server release xxx
       run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release
     - uses: vimtor/action-zip@v1

diff --git a/.gitignore b/.gitignore
@@ -259,9 +259,11 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
-/AgileConfig.Server.Apisite/agile_config.db
-/AgileConfig.Server.Apisite/logs/internal-nlog.txt
-/AgileConfig.Server.Apisite/Properties/PublishProfiles/FolderProfile.pubxml
-/AgileConfig.Server.Apisite/agile_config.db-wal
-/AgileConfig.Server.Apisite/agile_config.db-shm
-/AgileConfig.Server.Apisite/agile_config_TEST.db
+/src/src/AgileConfig.Server.Apisite/agile_config.db
+/src/AgileConfig.Server.Apisite/logs/internal-nlog.txt
+/src/AgileConfig.Server.Apisite/Properties/PublishProfiles/FolderProfile.pubxml
+/src/AgileConfig.Server.Apisite/agile_config.db-wal
+/src/AgileConfig.Server.Apisite/agile_config.db-shm
+/src/AgileConfig.Server.Apisite/agile_config_TEST.db
+/src/AgileConfig.Server.Apisite/wwwroot/ui/
+/src/AgileConfig.Server.Apisite/agile_config.db
diff --git a/AgileConfig.Client b/AgileConfig.Client
diff --git a/AgileConfig.Server.Apisite/appsettings.json b/AgileConfig.Server.Apisite/appsettings.json
diff --git a/AgileConfig.Server.UI/react-ui-antd/src/pages/User/initPassword/index.tsx b/AgileConfig.Server.UI/react-ui-antd/src/pages/User/initPassword/index.tsx
diff --git a/AgileConfig.sln b/AgileConfig.sln
@@ -1,40 +1,42 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33801.468
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Apisite", "AgileConfig.Server.Apisite\AgileConfig.Server.Apisite.csproj", "{55EE475A-6F4E-44AF-85C6-9CF6037BA6EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Apisite", "src\AgileConfig.Server.Apisite\AgileConfig.Server.Apisite.csproj", "{55EE475A-6F4E-44AF-85C6-9CF6037BA6EE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E3E3A07-0DAA-4054-ADBB-18AD50AFB0EF}"
 	ProjectSection(SolutionItems) = preProject
+		docker-compose.yml = docker-compose.yml
 		Dockerfile = Dockerfile
 		License.txt = License.txt
-		docker-compose.yml = docker-compose.yml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.IService", "AgileConfig.Server.IService\AgileConfig.Server.IService.csproj", "{5BE6420C-5798-4E06-8119-A0E9889B32BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.IService", "src\AgileConfig.Server.IService\AgileConfig.Server.IService.csproj", "{5BE6420C-5798-4E06-8119-A0E9889B32BA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Service", "AgileConfig.Server.Service\AgileConfig.Server.Service.csproj", "{10FE686F-AE1A-4FE6-9CC1-7AE2097FD165}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Service", "src\AgileConfig.Server.Service\AgileConfig.Server.Service.csproj", "{10FE686F-AE1A-4FE6-9CC1-7AE2097FD165}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Entity", "AgileConfig.Server.Data.Entity\AgileConfig.Server.Data.Entity.csproj", "{DAEA55BA-B79B-44CE-BCB4-6A69B83D55CB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Entity", "src\AgileConfig.Server.Data.Entity\AgileConfig.Server.Data.Entity.csproj", "{DAEA55BA-B79B-44CE-BCB4-6A69B83D55CB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Common", "AgileConfig.Server.Common\AgileConfig.Server.Common.csproj", "{52BFD5C6-B473-433C-A698-A2D3B6823B12}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Common", "src\AgileConfig.Server.Common\AgileConfig.Server.Common.csproj", "{52BFD5C6-B473-433C-A698-A2D3B6823B12}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "protocol", "protocol", "{1902AB89-1E27-44C0-8286-3147CC039FF6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agile.Config.Protocol", "Agile.Config.Protocol\Agile.Config.Protocol.csproj", "{1B01F2FF-0A07-45AD-BB8D-6DCAEF9381E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agile.Config.Protocol", "src\Agile.Config.Protocol\Agile.Config.Protocol.csproj", "{1B01F2FF-0A07-45AD-BB8D-6DCAEF9381E1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_test", "_test", "{F277EC27-8C0E-4490-9645-F5F3244F9246}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiSiteTests", "ApiSiteTests\ApiSiteTests.csproj", "{EA462A1A-03CB-4FF0-AA1E-0988021E8711}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiSiteTests", "test\ApiSiteTests\ApiSiteTests.csproj", "{EA462A1A-03CB-4FF0-AA1E-0988021E8711}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Freesql", "src\AgileConfig.Server.Data.Freesql\AgileConfig.Server.Data.Freesql.csproj", "{1EBE3129-A926-497A-801E-FDC29F998272}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Freesql", "AgileConfig.Server.Data.Freesql\AgileConfig.Server.Data.Freesql.csproj", "{1EBE3129-A926-497A-801E-FDC29F998272}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.ServiceTests", "test\AgileConfig.Server.ServiceTests\AgileConfig.Server.ServiceTests.csproj", "{8CE2DB53-3A35-4991-A419-0EC12B001F59}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.ServiceTests", "AgileConfig.Server.ServiceTests\AgileConfig.Server.ServiceTests.csproj", "{8CE2DB53-3A35-4991-A419-0EC12B001F59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.CommonTests", "test\AgileConfig.Server.CommonTests\AgileConfig.Server.CommonTests.csproj", "{70724B0E-7D81-412C-BDA7-747F4845E990}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgileConfig.Server.CommonTests", "AgileConfig.Server.CommonTests\AgileConfig.Server.CommonTests.csproj", "{70724B0E-7D81-412C-BDA7-747F4845E990}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgileConfig.Server.OIDC", "src\AgileConfig.Server.OIDC\AgileConfig.Server.OIDC.csproj", "{E49A2006-6D07-4434-AEC1-27E356A767AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -82,6 +84,10 @@ Global
 		{70724B0E-7D81-412C-BDA7-747F4845E990}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70724B0E-7D81-412C-BDA7-747F4845E990}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70724B0E-7D81-412C-BDA7-747F4845E990}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,6 +103,7 @@ Global
 		{1EBE3129-A926-497A-801E-FDC29F998272} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
 		{8CE2DB53-3A35-4991-A419-0EC12B001F59} = {F277EC27-8C0E-4490-9645-F5F3244F9246}
 		{70724B0E-7D81-412C-BDA7-747F4845E990} = {F277EC27-8C0E-4490-9645-F5F3244F9246}
+		{E49A2006-6D07-4434-AEC1-27E356A767AE} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7F10DB58-5B6F-4EAC-994F-14E8046B306F}

diff --git a/ApiSiteTests/ApiSiteTests.csproj b/ApiSiteTests/ApiSiteTests.csproj