diff --git a/OshimaServers/OshimaServer.cs b/OshimaServers/OshimaServer.cs index 169691b..3571b92 100644 --- a/OshimaServers/OshimaServer.cs +++ b/OshimaServers/OshimaServer.cs @@ -44,18 +44,8 @@ namespace Oshima.FunGame.OshimaServers } public void AfterOpenStoreEvent(object sender, GeneralEventArgs e) - { - - } - - public void SucceedOpenStoreEvent(object sender, GeneralEventArgs e) { if (e.EventMsg != "") Controller.WriteLine(e.EventMsg, Milimoe.FunGame.Core.Library.Constant.LogLevel.Debug); } - - public void FailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - - } } } diff --git a/OshimaWebAPI/Controllers/FunGameController.cs b/OshimaWebAPI/Controllers/FunGameController.cs index ba4208a..155a120 100644 --- a/OshimaWebAPI/Controllers/FunGameController.cs +++ b/OshimaWebAPI/Controllers/FunGameController.cs @@ -4900,7 +4900,7 @@ namespace Oshima.FunGame.WebAPI.Controllers pc.SaveConfig(); e.EventMsg = $"{user.Username}访问每日商店成功"; - FunGameService.ServerPluginLoader?.OnSucceedOpenStoreEvent(user, e); + FunGameService.ServerPluginLoader?.OnAfterOpenStoreEvent(user, e); return NetworkUtility.JsonSerialize(msg); } diff --git a/OshimaWebAPI/Controllers/QQBotController.cs b/OshimaWebAPI/Controllers/QQBotController.cs index 45d99e2..ea54e2f 100644 --- a/OshimaWebAPI/Controllers/QQBotController.cs +++ b/OshimaWebAPI/Controllers/QQBotController.cs @@ -129,7 +129,7 @@ namespace Oshima.FunGame.WebAPI.Controllers //{ // _logger.LogError("上传图片失败:{error}", error); //} - TaskUtility.NewTask(async () => await FungameService.Handler(c2c: c2cMessage)); + TaskUtility.NewTask(async () => await FungameService.Handler(c2cMessage)); } else { @@ -150,7 +150,7 @@ namespace Oshima.FunGame.WebAPI.Controllers Logger.LogInformation("收到来自群组 {groupAtMessage.GroupOpenId} 的消息:{groupAtMessage.Content}", groupAtMessage.GroupOpenId, groupAtMessage.Content); // 回复消息 //await _service.SendGroupMessageAsync(groupAtMessage.GroupOpenId, $"你发送的消息是:{groupAtMessage.Content}", msgId: groupAtMessage.Id); - TaskUtility.NewTask(async () => await FungameService.Handler(groupAt: groupAtMessage)); + TaskUtility.NewTask(async () => await FungameService.Handler(groupAtMessage)); } else { @@ -178,37 +178,18 @@ namespace Oshima.FunGame.WebAPI.Controllers [Authorize(AuthenticationSchemes = "CustomBearer")] [HttpPost("thirdparty")] - public async Task ThirdParty([FromBody] ThirdPartyMessage? msg = null) + public async Task ThirdParty([FromBody] ThirdPartyMessage? msg = null) { - if (msg is null) return ""; + if (msg is null) return Ok(""); - bool result = true; - string error = ""; - TaskUtility.NewTask(async () => result = await FungameService.Handler(third: msg)).OnError(e => error = e.ToString()); + bool result = await FungameService.Handler(msg); - int time = 0; - int timeout = 8 * 1000; - while (true) + if (!result || msg.IsCompleted) { - await Task.Delay(200); - time += 200; - if (time >= timeout) - { - break; - } - if (!result || msg.IsCompleted) - { - break; - } + return Ok(msg.Result); } - if (error != "") - { - if (msg.Result != "") msg.Result += "\r\n"; - msg.Result += error; - } - - return NetworkUtility.JsonSerialize(msg.Result); + return Ok(""); } } } diff --git a/OshimaWebAPI/Services/RainBOTService.cs b/OshimaWebAPI/Services/RainBOTService.cs index 914c6a5..df7dca7 100644 --- a/OshimaWebAPI/Services/RainBOTService.cs +++ b/OshimaWebAPI/Services/RainBOTService.cs @@ -43,26 +43,13 @@ namespace Oshima.FunGame.WebAPI.Services } } - public async Task Handler(GroupAtMessage? groupAt = null, C2CMessage? c2c = null, ThirdPartyMessage? third = null) + public async Task Handler(IBotMessage e) { bool result = true; try { - IBotMessage? e = null; string openid = ""; long uid = 0; - if (groupAt != null) - { - e = groupAt; - } - else if (c2c != null) - { - e = c2c; - } - else if (third != null) - { - e = third; - } if (e is null) { @@ -2017,9 +2004,9 @@ namespace Oshima.FunGame.WebAPI.Services return result; } } - catch (Exception e) + catch (Exception ex) { - Logger.LogError("Error: {e}", e); + Logger.LogError("Error: {ex}", ex); } return false;