diff --git a/Ocelot.Provider.Nacos.sln b/Ocelot.Provider.Nacos.sln index 65ff3e8..ee1e7a2 100644 --- a/Ocelot.Provider.Nacos.sln +++ b/Ocelot.Provider.Nacos.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B76348CD-F496-4B6E-A915-82A342AA5150}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Nacos", "Ocelot.Provider.Nacos\Ocelot.Provider.Nacos.csproj", "{284367EA-EC93-4060-ABE7-3EF93A5A888C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Nacos", "src\Ocelot.Provider.Nacos\Ocelot.Provider.Nacos.csproj", "{284367EA-EC93-4060-ABE7-3EF93A5A888C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D7B862B3-BB35-4D94-AE3D-C78B537B5E2F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{7A2BFC89-057F-4F8D-ADB7-C7D122B160EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGatewayDemo", "ApiGatewayDemo\ApiGatewayDemo.csproj", "{F26F410A-1282-4756-931E-D56AC128C2FD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Nacos.Test", "test\Ocelot.Provider.Nacos.Test\Ocelot.Provider.Nacos.Test.csproj", "{4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductApi", "ProductApi\ProductApi.csproj", "{412DE300-5740-4EEE-9592-A48FF549BADF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGatewayDemo", "demo\ApiGatewayDemo\ApiGatewayDemo.csproj", "{179D0A0F-AAC3-4322-92DE-008F91554389}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Nacos.Test", "Ocelot.Provider.Nacos.Test\Ocelot.Provider.Nacos.Test.csproj", "{4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductApi", "demo\ProductApi\ProductApi.csproj", "{F1AA9A81-CBB6-4D8E-9FC4-45C7355AF8CA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,23 +25,23 @@ Global {284367EA-EC93-4060-ABE7-3EF93A5A888C}.Debug|Any CPU.Build.0 = Debug|Any CPU {284367EA-EC93-4060-ABE7-3EF93A5A888C}.Release|Any CPU.ActiveCfg = Release|Any CPU {284367EA-EC93-4060-ABE7-3EF93A5A888C}.Release|Any CPU.Build.0 = Release|Any CPU - {F26F410A-1282-4756-931E-D56AC128C2FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F26F410A-1282-4756-931E-D56AC128C2FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F26F410A-1282-4756-931E-D56AC128C2FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F26F410A-1282-4756-931E-D56AC128C2FD}.Release|Any CPU.Build.0 = Release|Any CPU - {412DE300-5740-4EEE-9592-A48FF549BADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {412DE300-5740-4EEE-9592-A48FF549BADF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {412DE300-5740-4EEE-9592-A48FF549BADF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {412DE300-5740-4EEE-9592-A48FF549BADF}.Release|Any CPU.Build.0 = Release|Any CPU {4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79}.Release|Any CPU.Build.0 = Release|Any CPU + {179D0A0F-AAC3-4322-92DE-008F91554389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {179D0A0F-AAC3-4322-92DE-008F91554389}.Debug|Any CPU.Build.0 = Debug|Any CPU + {179D0A0F-AAC3-4322-92DE-008F91554389}.Release|Any CPU.ActiveCfg = Release|Any CPU + {179D0A0F-AAC3-4322-92DE-008F91554389}.Release|Any CPU.Build.0 = Release|Any CPU + {F1AA9A81-CBB6-4D8E-9FC4-45C7355AF8CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1AA9A81-CBB6-4D8E-9FC4-45C7355AF8CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1AA9A81-CBB6-4D8E-9FC4-45C7355AF8CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1AA9A81-CBB6-4D8E-9FC4-45C7355AF8CA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {284367EA-EC93-4060-ABE7-3EF93A5A888C} = {B76348CD-F496-4B6E-A915-82A342AA5150} - {F26F410A-1282-4756-931E-D56AC128C2FD} = {7A2BFC89-057F-4F8D-ADB7-C7D122B160EF} - {412DE300-5740-4EEE-9592-A48FF549BADF} = {7A2BFC89-057F-4F8D-ADB7-C7D122B160EF} {4E1CC9B8-BD07-40CB-BF0C-9F0EE1FCBC79} = {D7B862B3-BB35-4D94-AE3D-C78B537B5E2F} + {179D0A0F-AAC3-4322-92DE-008F91554389} = {7A2BFC89-057F-4F8D-ADB7-C7D122B160EF} + {F1AA9A81-CBB6-4D8E-9FC4-45C7355AF8CA} = {7A2BFC89-057F-4F8D-ADB7-C7D122B160EF} EndGlobalSection EndGlobal diff --git a/ApiGatewayDemo/ApiGatewayDemo.csproj b/demo/ApiGatewayDemo/ApiGatewayDemo.csproj similarity index 85% rename from ApiGatewayDemo/ApiGatewayDemo.csproj rename to demo/ApiGatewayDemo/ApiGatewayDemo.csproj index 09f3f94..ba17c85 100644 --- a/ApiGatewayDemo/ApiGatewayDemo.csproj +++ b/demo/ApiGatewayDemo/ApiGatewayDemo.csproj @@ -8,11 +8,6 @@ - - - - - Always @@ -21,4 +16,9 @@ Always + + + + + diff --git a/ApiGatewayDemo/Program.cs b/demo/ApiGatewayDemo/Program.cs similarity index 100% rename from ApiGatewayDemo/Program.cs rename to demo/ApiGatewayDemo/Program.cs diff --git a/ApiGatewayDemo/Properties/launchSettings.json b/demo/ApiGatewayDemo/Properties/launchSettings.json similarity index 100% rename from ApiGatewayDemo/Properties/launchSettings.json rename to demo/ApiGatewayDemo/Properties/launchSettings.json diff --git a/ApiGatewayDemo/Startup.cs b/demo/ApiGatewayDemo/Startup.cs similarity index 100% rename from ApiGatewayDemo/Startup.cs rename to demo/ApiGatewayDemo/Startup.cs diff --git a/ApiGatewayDemo/appsettings.Development.json b/demo/ApiGatewayDemo/appsettings.Development.json similarity index 100% rename from ApiGatewayDemo/appsettings.Development.json rename to demo/ApiGatewayDemo/appsettings.Development.json diff --git a/ApiGatewayDemo/appsettings.json b/demo/ApiGatewayDemo/appsettings.json similarity index 100% rename from ApiGatewayDemo/appsettings.json rename to demo/ApiGatewayDemo/appsettings.json diff --git a/ApiGatewayDemo/ocelotconfig.json b/demo/ApiGatewayDemo/ocelotconfig.json similarity index 100% rename from ApiGatewayDemo/ocelotconfig.json rename to demo/ApiGatewayDemo/ocelotconfig.json diff --git a/ProductApi/Controllers/ProductController.cs b/demo/ProductApi/Controllers/ProductController.cs similarity index 100% rename from ProductApi/Controllers/ProductController.cs rename to demo/ProductApi/Controllers/ProductController.cs diff --git a/ProductApi/Models/ProductDto.cs b/demo/ProductApi/Models/ProductDto.cs similarity index 100% rename from ProductApi/Models/ProductDto.cs rename to demo/ProductApi/Models/ProductDto.cs diff --git a/ProductApi/ProductApi.csproj b/demo/ProductApi/ProductApi.csproj similarity index 100% rename from ProductApi/ProductApi.csproj rename to demo/ProductApi/ProductApi.csproj diff --git a/ProductApi/Program.cs b/demo/ProductApi/Program.cs similarity index 100% rename from ProductApi/Program.cs rename to demo/ProductApi/Program.cs diff --git a/ProductApi/Properties/launchSettings.json b/demo/ProductApi/Properties/launchSettings.json similarity index 100% rename from ProductApi/Properties/launchSettings.json rename to demo/ProductApi/Properties/launchSettings.json diff --git a/ProductApi/Startup.cs b/demo/ProductApi/Startup.cs similarity index 100% rename from ProductApi/Startup.cs rename to demo/ProductApi/Startup.cs diff --git a/ProductApi/appsettings.Development.json b/demo/ProductApi/appsettings.Development.json similarity index 100% rename from ProductApi/appsettings.Development.json rename to demo/ProductApi/appsettings.Development.json diff --git a/ProductApi/appsettings.json b/demo/ProductApi/appsettings.json similarity index 100% rename from ProductApi/appsettings.json rename to demo/ProductApi/appsettings.json diff --git a/Ocelot.Provider.Nacos/Nacos.cs b/src/Ocelot.Provider.Nacos/Nacos.cs similarity index 100% rename from Ocelot.Provider.Nacos/Nacos.cs rename to src/Ocelot.Provider.Nacos/Nacos.cs diff --git a/Ocelot.Provider.Nacos/NacosClient/INacosServerManager.cs b/src/Ocelot.Provider.Nacos/NacosClient/INacosServerManager.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosClient/INacosServerManager.cs rename to src/Ocelot.Provider.Nacos/NacosClient/INacosServerManager.cs diff --git a/Ocelot.Provider.Nacos/NacosClient/NacosAspNetCoreOptions.cs b/src/Ocelot.Provider.Nacos/NacosClient/NacosAspNetCoreOptions.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosClient/NacosAspNetCoreOptions.cs rename to src/Ocelot.Provider.Nacos/NacosClient/NacosAspNetCoreOptions.cs diff --git a/Ocelot.Provider.Nacos/NacosClient/NacosServer.cs b/src/Ocelot.Provider.Nacos/NacosClient/NacosServer.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosClient/NacosServer.cs rename to src/Ocelot.Provider.Nacos/NacosClient/NacosServer.cs diff --git a/Ocelot.Provider.Nacos/NacosClient/NacosServerManager.cs b/src/Ocelot.Provider.Nacos/NacosClient/NacosServerManager.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosClient/NacosServerManager.cs rename to src/Ocelot.Provider.Nacos/NacosClient/NacosServerManager.cs diff --git a/Ocelot.Provider.Nacos/NacosClient/ServiceCollectionExtensions.cs b/src/Ocelot.Provider.Nacos/NacosClient/ServiceCollectionExtensions.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosClient/ServiceCollectionExtensions.cs rename to src/Ocelot.Provider.Nacos/NacosClient/ServiceCollectionExtensions.cs diff --git a/Ocelot.Provider.Nacos/NacosClient/StatusReportBgTask.cs b/src/Ocelot.Provider.Nacos/NacosClient/StatusReportBgTask.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosClient/StatusReportBgTask.cs rename to src/Ocelot.Provider.Nacos/NacosClient/StatusReportBgTask.cs diff --git a/Ocelot.Provider.Nacos/NacosMiddlewareConfigurationProvider.cs b/src/Ocelot.Provider.Nacos/NacosMiddlewareConfigurationProvider.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosMiddlewareConfigurationProvider.cs rename to src/Ocelot.Provider.Nacos/NacosMiddlewareConfigurationProvider.cs diff --git a/Ocelot.Provider.Nacos/NacosProviderFactory.cs b/src/Ocelot.Provider.Nacos/NacosProviderFactory.cs similarity index 100% rename from Ocelot.Provider.Nacos/NacosProviderFactory.cs rename to src/Ocelot.Provider.Nacos/NacosProviderFactory.cs diff --git a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj b/src/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj similarity index 100% rename from Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj rename to src/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj diff --git a/Ocelot.Provider.Nacos/OcelotBuilderExtensions.cs b/src/Ocelot.Provider.Nacos/OcelotBuilderExtensions.cs similarity index 100% rename from Ocelot.Provider.Nacos/OcelotBuilderExtensions.cs rename to src/Ocelot.Provider.Nacos/OcelotBuilderExtensions.cs diff --git a/Ocelot.Provider.Nacos.Test/NacosClientTest.cs b/test/Ocelot.Provider.Nacos.Test/NacosClientTest.cs similarity index 100% rename from Ocelot.Provider.Nacos.Test/NacosClientTest.cs rename to test/Ocelot.Provider.Nacos.Test/NacosClientTest.cs diff --git a/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj b/test/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj similarity index 88% rename from Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj rename to test/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj index aee3909..cdb6824 100644 --- a/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj +++ b/test/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj @@ -14,9 +14,6 @@ - - - @@ -27,4 +24,7 @@ Always + + + diff --git a/Ocelot.Provider.Nacos.Test/appsettings.json b/test/Ocelot.Provider.Nacos.Test/appsettings.json similarity index 100% rename from Ocelot.Provider.Nacos.Test/appsettings.json rename to test/Ocelot.Provider.Nacos.Test/appsettings.json