diff --git a/.gitignore b/.gitignore index 5dba3fab..6ab26e09 100644 --- a/.gitignore +++ b/.gitignore @@ -289,3 +289,4 @@ __pycache__/ /App_Data /Bot.WebStarter/App_Data/bot-rasa.db /Bot.WebStarter/App_Data/DbInitializer/Agents/Dialogflow/VirtualAssistant +/BotSharp.WebStarter/App_Data/DbInitializer/Agents/Dialogflow/VirtualAssistant diff --git a/Bot.WebStarter/settings.bot.json b/Bot.WebStarter/settings.bot.json deleted file mode 100644 index 30f3bb06..00000000 --- a/Bot.WebStarter/settings.bot.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Rasa": { - "Host": "http://gtx.local:5000" - } -} diff --git a/Bot.WebStarter/settings.json b/Bot.WebStarter/settings.json deleted file mode 100644 index e69de29b..00000000 diff --git a/BotSharp.RestApi/BotSharp.RestApi.csproj b/BotSharp.RestApi/BotSharp.RestApi.csproj index 9139d1e9..d8802ebc 100644 --- a/BotSharp.RestApi/BotSharp.RestApi.csproj +++ b/BotSharp.RestApi/BotSharp.RestApi.csproj @@ -4,6 +4,10 @@ netcoreapp2.0 + + bin\Debug\netcoreapp2.0\BotSharp.RestApi.xml + + diff --git a/BotSharp.UnitTest/BotSharp.UnitTest.csproj b/BotSharp.UnitTest/BotSharp.UnitTest.csproj index 5d65ea16..57562107 100644 --- a/BotSharp.UnitTest/BotSharp.UnitTest.csproj +++ b/BotSharp.UnitTest/BotSharp.UnitTest.csproj @@ -18,4 +18,8 @@ + + + + diff --git a/BotSharp.UnitTest/TestEssential.cs b/BotSharp.UnitTest/TestEssential.cs index 49f3c5f5..ba69ddde 100644 --- a/BotSharp.UnitTest/TestEssential.cs +++ b/BotSharp.UnitTest/TestEssential.cs @@ -23,7 +23,7 @@ namespace BotSharp.UnitTest contentRoot = $"{Directory.GetCurrentDirectory()}\\..\\..\\..\\..\\Bot.WebStarter"; ConfigurationBuilder configurationBuilder = new ConfigurationBuilder(); - var settings = Directory.GetFiles(contentRoot, "settings.*.json"); + var settings = Directory.GetFiles(contentRoot + "/Settings/", "*.json"); settings.ToList().ForEach(setting => { configurationBuilder.AddJsonFile(setting, optional: false, reloadOnChange: true); diff --git a/Bot.WebStarter/App_Data/DbInitializer/Agents/Rasa/2b6a288e-d891-40c6-96ce-6a0cf324545c.json b/BotSharp.WebStarter/App_Data/DbInitializer/Agents/Rasa/2b6a288e-d891-40c6-96ce-6a0cf324545c.json similarity index 100% rename from Bot.WebStarter/App_Data/DbInitializer/Agents/Rasa/2b6a288e-d891-40c6-96ce-6a0cf324545c.json rename to BotSharp.WebStarter/App_Data/DbInitializer/Agents/Rasa/2b6a288e-d891-40c6-96ce-6a0cf324545c.json diff --git a/Bot.WebStarter/Bot.WebStarter.csproj b/BotSharp.WebStarter/BotSharp.WebStarter.csproj similarity index 100% rename from Bot.WebStarter/Bot.WebStarter.csproj rename to BotSharp.WebStarter/BotSharp.WebStarter.csproj diff --git a/Bot.WebStarter/Program.cs b/BotSharp.WebStarter/Program.cs similarity index 90% rename from Bot.WebStarter/Program.cs rename to BotSharp.WebStarter/Program.cs index 0e164648..d823220c 100644 --- a/Bot.WebStarter/Program.cs +++ b/BotSharp.WebStarter/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace Bot.WebStarter +namespace BotSharp.WebStarter { public class Program { @@ -22,7 +22,7 @@ namespace Bot.WebStarter .ConfigureAppConfiguration((hostingContext, config) => { var env = hostingContext.HostingEnvironment; - var settings = Directory.GetFiles("./", "settings.*.json"); + var settings = Directory.GetFiles("./Settings/", "*.json"); settings.ToList().ForEach(setting => { config.AddJsonFile(setting, optional: false, reloadOnChange: true); diff --git a/Bot.WebStarter/settings.app.json b/BotSharp.WebStarter/Settings/settings.app.json similarity index 100% rename from Bot.WebStarter/settings.app.json rename to BotSharp.WebStarter/Settings/settings.app.json diff --git a/Bot.WebStarter/settings.auth.json b/BotSharp.WebStarter/Settings/settings.auth.json similarity index 82% rename from Bot.WebStarter/settings.auth.json rename to BotSharp.WebStarter/Settings/settings.auth.json index 875a3f1a..c8d08264 100644 --- a/Bot.WebStarter/settings.auth.json +++ b/BotSharp.WebStarter/Settings/settings.auth.json @@ -1,6 +1,6 @@ { "TokenAuthentication": { - "SecretKey": "", + "SecretKey": "QEMYOjgkNEq/krV1Ouzz8w==", "Subject": "OpenBotKit", "Issuer": "Haiping Chen", "Audience": "Haiping Chen", diff --git a/Bot.WebStarter/settings.aws.json b/BotSharp.WebStarter/Settings/settings.aws.json similarity index 100% rename from Bot.WebStarter/settings.aws.json rename to BotSharp.WebStarter/Settings/settings.aws.json diff --git a/BotSharp.WebStarter/Settings/settings.bot.json b/BotSharp.WebStarter/Settings/settings.bot.json new file mode 100644 index 00000000..dc0dffa1 --- /dev/null +++ b/BotSharp.WebStarter/Settings/settings.bot.json @@ -0,0 +1,5 @@ +{ + "Rasa": { + "Host": "http://bot.local:5000" + } +} diff --git a/Bot.WebStarter/settings.db.json b/BotSharp.WebStarter/Settings/settings.db.json similarity index 100% rename from Bot.WebStarter/settings.db.json rename to BotSharp.WebStarter/Settings/settings.db.json diff --git a/Bot.WebStarter/settings.swagger.json b/BotSharp.WebStarter/Settings/settings.swagger.json similarity index 86% rename from Bot.WebStarter/settings.swagger.json rename to BotSharp.WebStarter/Settings/settings.swagger.json index 732f537f..a1a35359 100644 --- a/Bot.WebStarter/settings.swagger.json +++ b/BotSharp.WebStarter/Settings/settings.swagger.json @@ -1,7 +1,7 @@ { "Swagger": { "Version": "v1", - "Title": "OpenBotKit API", + "Title": "Open Chatbot Kit", "Description": "OpenBotKit API", "TermsOfService": "MIT", "Contact": { diff --git a/Bot.WebStarter/Startup.cs b/BotSharp.WebStarter/Startup.cs similarity index 97% rename from Bot.WebStarter/Startup.cs rename to BotSharp.WebStarter/Startup.cs index a052058c..d66f6a00 100644 --- a/Bot.WebStarter/Startup.cs +++ b/BotSharp.WebStarter/Startup.cs @@ -15,7 +15,7 @@ using Microsoft.Extensions.PlatformAbstractions; using Newtonsoft.Json.Serialization; using Swashbuckle.AspNetCore.Swagger; -namespace Bot.WebStarter +namespace BotSharp.WebStarter { public class Startup { @@ -81,7 +81,7 @@ namespace Bot.WebStarter app.UseAuthentication(); app.UseMvc(); - app.UseEntityDbContext(Configuration, env.ContentRootPath, new String[] { "BotSharp.Core." }); + app.UseEntityDbContext(Configuration, env.ContentRootPath, new String[] { "BotSharp.Core" }); app.UseInitLoader(); } } diff --git a/BotSharp.sln b/BotSharp.sln index a8cf7971..0f013937 100644 --- a/BotSharp.sln +++ b/BotSharp.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bot.WebStarter", "Bot.WebStarter\Bot.WebStarter.csproj", "{ACBEB546-00AB-4EB7-8DBF-4BFF722FC9EA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.UnitTest", "BotSharp.UnitTest\BotSharp.UnitTest.csproj", "{1C883AA3-9182-469A-A17E-697DCAAB0121}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.UnitTest", "BotSharp.UnitTest\BotSharp.UnitTest.csproj", "{1C883AA3-9182-469A-A17E-697DCAAB0121}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Core", "BotSharp.Core\BotSharp.Core.csproj", "{95780673-2A1A-4953-962F-C46CBFDD07FF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Core", "BotSharp.Core\BotSharp.Core.csproj", "{95780673-2A1A-4953-962F-C46CBFDD07FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.RestApi", "BotSharp.RestApi\BotSharp.RestApi.csproj", "{A1DDFCE9-10A1-45AF-8F1C-DE0A9145BA48}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.RestApi", "BotSharp.RestApi\BotSharp.RestApi.csproj", "{A1DDFCE9-10A1-45AF-8F1C-DE0A9145BA48}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.WebStarter", "BotSharp.WebStarter\BotSharp.WebStarter.csproj", "{C1B91383-D548-4906-BEB8-FED7E320731B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ACBEB546-00AB-4EB7-8DBF-4BFF722FC9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACBEB546-00AB-4EB7-8DBF-4BFF722FC9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACBEB546-00AB-4EB7-8DBF-4BFF722FC9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACBEB546-00AB-4EB7-8DBF-4BFF722FC9EA}.Release|Any CPU.Build.0 = Release|Any CPU {1C883AA3-9182-469A-A17E-697DCAAB0121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C883AA3-9182-469A-A17E-697DCAAB0121}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C883AA3-9182-469A-A17E-697DCAAB0121}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -33,6 +29,10 @@ Global {A1DDFCE9-10A1-45AF-8F1C-DE0A9145BA48}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1DDFCE9-10A1-45AF-8F1C-DE0A9145BA48}.Release|Any CPU.ActiveCfg = Release|Any CPU {A1DDFCE9-10A1-45AF-8F1C-DE0A9145BA48}.Release|Any CPU.Build.0 = Release|Any CPU + {C1B91383-D548-4906-BEB8-FED7E320731B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1B91383-D548-4906-BEB8-FED7E320731B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C1B91383-D548-4906-BEB8-FED7E320731B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C1B91383-D548-4906-BEB8-FED7E320731B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE