diff --git a/QQBotHub.sln b/QQBotHub.sln index e36081789..730d92c03 100644 --- a/QQBotHub.sln +++ b/QQBotHub.sln @@ -27,6 +27,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginCore", "src\PluginCor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginCore.IPlugins", "src\PluginCore\src\PluginCore.IPlugins\PluginCore.IPlugins.csproj", "{3F1C9ACE-0EC3-45FE-B382-97216429086E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginCore.AspNetCore", "src\PluginCore\src\PluginCore.AspNetCore\PluginCore.AspNetCore.csproj", "{F0B0E0DF-4490-478A-9C60-C80F0E290FC2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginCore.IPlugins.AspNetCore", "src\PluginCore\src\PluginCore.IPlugins.AspNetCore\PluginCore.IPlugins.AspNetCore.csproj", "{61F02E99-EB5C-4E9E-95D7-A2F7CEAFE077}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -69,6 +73,14 @@ Global {3F1C9ACE-0EC3-45FE-B382-97216429086E}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F1C9ACE-0EC3-45FE-B382-97216429086E}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F1C9ACE-0EC3-45FE-B382-97216429086E}.Release|Any CPU.Build.0 = Release|Any CPU + {F0B0E0DF-4490-478A-9C60-C80F0E290FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0B0E0DF-4490-478A-9C60-C80F0E290FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0B0E0DF-4490-478A-9C60-C80F0E290FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0B0E0DF-4490-478A-9C60-C80F0E290FC2}.Release|Any CPU.Build.0 = Release|Any CPU + {61F02E99-EB5C-4E9E-95D7-A2F7CEAFE077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61F02E99-EB5C-4E9E-95D7-A2F7CEAFE077}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61F02E99-EB5C-4E9E-95D7-A2F7CEAFE077}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61F02E99-EB5C-4E9E-95D7-A2F7CEAFE077}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -82,6 +94,8 @@ Global {F6087CC7-5239-42E3-92D6-51F25F6E3EE8} = {4B4BFBBE-8CE4-453C-B05A-EAFE933B79C9} {AE51E530-8545-40F5-9070-8314E722FEF9} = {BDFD03E4-0A99-49A3-95A7-F7132EC4FF00} {3F1C9ACE-0EC3-45FE-B382-97216429086E} = {BDFD03E4-0A99-49A3-95A7-F7132EC4FF00} + {F0B0E0DF-4490-478A-9C60-C80F0E290FC2} = {BDFD03E4-0A99-49A3-95A7-F7132EC4FF00} + {61F02E99-EB5C-4E9E-95D7-A2F7CEAFE077} = {BDFD03E4-0A99-49A3-95A7-F7132EC4FF00} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3F1D77E3-11F8-4B5B-BEED-EE2816D57A86} diff --git a/plugins/QQHelloWorldPlugin/Controllers/HomeController.cs b/plugins/QQHelloWorldPlugin/Controllers/HomeController.cs index e7899072d..f1b046977 100644 --- a/plugins/QQHelloWorldPlugin/Controllers/HomeController.cs +++ b/plugins/QQHelloWorldPlugin/Controllers/HomeController.cs @@ -15,12 +15,12 @@ namespace QQHelloWorldPlugin.Controllers /// 若 wwwroot 下有其它需要访问的文件, 如何 css, js, 而你又不想每次新增 action 指定返回, 则 Route 必须 Plugins/{PluginId}, /// 这样访问 Plugins/HelloWorldPlugin/css/main.css 就会访问到你插件下的 wwwroot/css/main.css /// - [Route("Plugins/HelloWorldPlugin")] + [Route($"Plugins/{nameof(QQHelloWorldPlugin)}")] public class HomeController : Controller { public async Task Get() { - string indexFilePath = System.IO.Path.Combine(PluginPathProvider.PluginWwwRootDir("HelloWorldPlugin"), "index.html"); + string indexFilePath = System.IO.Path.Combine(PluginPathProvider.PluginWwwRootDir(nameof(QQHelloWorldPlugin)), "index.html"); return PhysicalFile(indexFilePath, "text/html"); } diff --git a/plugins/QQHelloWorldPlugin/QQHelloWorldPlugin.cs b/plugins/QQHelloWorldPlugin/QQHelloWorldPlugin.cs index 195308599..ef9804799 100644 --- a/plugins/QQHelloWorldPlugin/QQHelloWorldPlugin.cs +++ b/plugins/QQHelloWorldPlugin/QQHelloWorldPlugin.cs @@ -11,17 +11,17 @@ namespace QQHelloWorldPlugin { - public class HelloWorldPlugin : BasePlugin, IStartupXPlugin, IWidgetPlugin, IQQBotPlugin + public class QQHelloWorldPlugin : BasePlugin, IStartupXPlugin, IWidgetPlugin, IQQBotPlugin { public override (bool IsSuccess, string Message) AfterEnable() { - Console.WriteLine($"{nameof(HelloWorldPlugin)}: {nameof(AfterEnable)}"); + Console.WriteLine($"{nameof(QQHelloWorldPlugin)}: {nameof(AfterEnable)}"); return base.AfterEnable(); } public override (bool IsSuccess, string Message) BeforeDisable() { - Console.WriteLine($"{nameof(HelloWorldPlugin)}: {nameof(BeforeDisable)}"); + Console.WriteLine($"{nameof(QQHelloWorldPlugin)}: {nameof(BeforeDisable)}"); return base.BeforeDisable(); } diff --git a/plugins/QQHelloWorldPlugin/README.md b/plugins/QQHelloWorldPlugin/README.md index 0f0045606..39e4f1790 100644 --- a/plugins/QQHelloWorldPlugin/README.md +++ b/plugins/QQHelloWorldPlugin/README.md @@ -13,7 +13,7 @@ ## 前端视图 -- [/Plugins/HelloWorldPlugin](/Plugins/QQHelloWorldPlugin) +- [/Plugins/QQHelloWorldPlugin](/Plugins/QQHelloWorldPlugin) ## 挂件 diff --git a/plugins/QQHelloWorldPlugin/wwwroot/index.html b/plugins/QQHelloWorldPlugin/wwwroot/index.html index 9bb783d23..182c46cfc 100644 --- a/plugins/QQHelloWorldPlugin/wwwroot/index.html +++ b/plugins/QQHelloWorldPlugin/wwwroot/index.html @@ -4,12 +4,12 @@ HelloWorldPlugin - - + +
-

HelloWorldPlugin!

+

QQHelloWorldPlugin!

插件的前端文件应当放在 wwwroot 文件夹下

diff --git a/plugins/QQStatPlugin/Controllers/HomeController.cs b/plugins/QQStatPlugin/Controllers/HomeController.cs index 8aaf2dc1c..3b7807dfb 100644 --- a/plugins/QQStatPlugin/Controllers/HomeController.cs +++ b/plugins/QQStatPlugin/Controllers/HomeController.cs @@ -27,7 +27,7 @@ public async Task Get() } [Route(nameof(Download))] - [Authorize("PluginCoreAdmin")] + [Authorize("PluginCore.Admin")] public async Task Download() { string dbFilePath = DbContext.DbFilePath; diff --git a/src/QQBotHub.Sdk/QQBotHub.Sdk.csproj b/src/QQBotHub.Sdk/QQBotHub.Sdk.csproj index 82170b66b..e2de195a3 100644 --- a/src/QQBotHub.Sdk/QQBotHub.Sdk.csproj +++ b/src/QQBotHub.Sdk/QQBotHub.Sdk.csproj @@ -22,10 +22,10 @@ - + - + diff --git a/src/QQBotHub.Web/Controllers/HomeController.cs b/src/QQBotHub.Web/Controllers/HomeController.cs index c086640a2..ea098b6ab 100644 --- a/src/QQBotHub.Web/Controllers/HomeController.cs +++ b/src/QQBotHub.Web/Controllers/HomeController.cs @@ -16,7 +16,7 @@ namespace QQBotHub.Web.Controllers { [Route("api/[action]")] - [Authorize("PluginCoreAdmin")] + [Authorize("PluginCore.Admin")] [ApiController] public class HomeController : ControllerBase { diff --git a/src/QQBotHub.Web/Program.cs b/src/QQBotHub.Web/Program.cs index c28845de3..5c3ed81fd 100644 --- a/src/QQBotHub.Web/Program.cs +++ b/src/QQBotHub.Web/Program.cs @@ -1,4 +1,4 @@ -using PluginCore.Extensions; +using PluginCore.AspNetCore.Extensions; var builder = WebApplication.CreateBuilder(args); diff --git a/src/QQBotHub.Web/QQBotHub.Web.csproj b/src/QQBotHub.Web/QQBotHub.Web.csproj index 95bda20c6..f1e21c651 100644 --- a/src/QQBotHub.Web/QQBotHub.Web.csproj +++ b/src/QQBotHub.Web/QQBotHub.Web.csproj @@ -17,10 +17,10 @@ - + - +