diff --git a/plugins/AutoLoginPlugin/AutoLoginPlugin.cs b/plugins/AutoLoginPlugin/AutoLoginPlugin.cs index 57d6ab7c1..5aaacf74c 100644 --- a/plugins/AutoLoginPlugin/AutoLoginPlugin.cs +++ b/plugins/AutoLoginPlugin/AutoLoginPlugin.cs @@ -6,17 +6,16 @@ using Konata.Core; using Konata.Core.Events.Model; using Konata.Core.Interfaces.Api; -using QQBotHub.Sdk.IPlugins; using AutoLoginPlugin.Utils; using Konata.Core.Message.Model; using Konata.Core.Common; using System.Text; -using QQBotHub.Sdk; using Konata.Core.Message; using System.Collections.Generic; using Konata.Core.Interfaces; using System.IO; using PluginCore; +using KonataPlugin; namespace AutoLoginPlugin { @@ -46,9 +45,9 @@ public async Task ExecuteAsync() { SettingsModel settingsModel = PluginCore.PluginSettingsModelFactory.Create(nameof(AutoLoginPlugin)); string filePath = Path.Combine(PluginPathProvider.PluginsRootPath(), nameof(AutoLoginPlugin), "BotKeyStore.json"); - if (QQBotStore.Bot != null && QQBotStore.Bot.IsOnline() && QQBotStore.Bot.KeyStore != null) + if (KonataBotStore.Bot != null && KonataBotStore.Bot.IsOnline() && KonataBotStore.Bot.KeyStore != null) { - string jsonStr = QQBotHub.Sdk.Utils.JsonUtil.Obj2JsonStr(QQBotStore.Bot.KeyStore); + string jsonStr = KonataPlugin.Utils.JsonUtil.Obj2JsonStr(KonataBotStore.Bot.KeyStore); File.WriteAllText(filePath, contents: jsonStr, Encoding.UTF8); } // 取消: 发现这么调用, 会触发验证, 而直接 用 BotKeyStore new 一个, 就不会(好多次这样都没有验证) @@ -64,8 +63,8 @@ public async Task ExecuteAsync() { #region 重新 new string jsonStr = File.ReadAllText(filePath, Encoding.UTF8); - BotKeyStore botKeyStore = QQBotHub.Sdk.Utils.JsonUtil.JsonStr2Obj(jsonStr); - QQBotStore.Bot = BotFather.Create(BotConfig.Default(), BotDevice.Default(), botKeyStore); + BotKeyStore botKeyStore = KonataPlugin.Utils.JsonUtil.JsonStr2Obj(jsonStr); + KonataBotStore.Bot = BotFather.Create(BotConfig.Default(), BotDevice.Default(), botKeyStore); #endregion #region 重新登录 @@ -87,7 +86,7 @@ private static async Task Login(SettingsModel settingsModel) bool isLoginSuccess = false; try { - isLoginSuccess = await QQBotStore.Bot.Login(); + isLoginSuccess = await KonataBotStore.Bot.Login(); } catch (Exception ex) { @@ -98,7 +97,7 @@ private static async Task Login(SettingsModel settingsModel) { if (!string.IsNullOrEmpty(settingsModel.AdminQQ) && uint.TryParse(settingsModel.AdminQQ, out uint adminUin)) { - await QQBotStore.Bot.SendFriendMessage(friendUin: adminUin, "自动重新登录成功"); + await KonataBotStore.Bot.SendFriendMessage(friendUin: adminUin, "自动重新登录成功"); } } else diff --git a/plugins/AutoLoginPlugin/AutoLoginPlugin.csproj b/plugins/AutoLoginPlugin/AutoLoginPlugin.csproj index 0a28be5e2..4d969f59d 100644 --- a/plugins/AutoLoginPlugin/AutoLoginPlugin.csproj +++ b/plugins/AutoLoginPlugin/AutoLoginPlugin.csproj @@ -11,16 +11,7 @@ - - - - - - runtime - - - - + false runtime diff --git a/plugins/AutoLoginPlugin/info.json b/plugins/AutoLoginPlugin/info.json index 1f422dec3..2a2c51c56 100644 --- a/plugins/AutoLoginPlugin/info.json +++ b/plugins/AutoLoginPlugin/info.json @@ -3,6 +3,6 @@ "DisplayName": "自动重新登录插件", "Description": "出现异常离线后,自动重新登录", "Author": "yiyun", - "Version": "0.0.1", + "Version": "0.1.0", "SupportedVersions": [ "0.0.1" ] } \ No newline at end of file