From 276b9920b2c61b73f4b7b6bd07f3131f7bf761f2 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Wed, 5 Nov 2025 09:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=9B=BE=E7=9A=84Server?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=9B=BE=E7=9A=84=E7=BD=91=E7=AB=99=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AxibugEmuOnline.Server/Manager/GameShareManager.cs | 4 ++-- .../Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +- AxibugEmuOnline.Web/Common/Helper.cs | 8 ++++++++ AxibugEmuOnline.Web/Controllers/ApiController.cs | 3 +++ .../Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +- ProtobufCore/proto/protobuf_AxibugEmuOnline.proto | 3 ++- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/AxibugEmuOnline.Server/Manager/GameShareManager.cs b/AxibugEmuOnline.Server/Manager/GameShareManager.cs index b6774a66..69963255 100644 --- a/AxibugEmuOnline.Server/Manager/GameShareManager.cs +++ b/AxibugEmuOnline.Server/Manager/GameShareManager.cs @@ -114,7 +114,7 @@ namespace AxibugEmuOnline.Server.Manager Protobuf_GameScreen_Img_Upload_RESP respData = new Protobuf_GameScreen_Img_Upload_RESP(); CheckRomHadCover(msg.RomID, out bool bhadGame, out bool bHadCover, out string coverPath); ErrorCode errCode = ErrorCode.ErrorOk; - if (!bhadGame || bHadCover) + if (!bhadGame || (_c.UID > 1 && bHadCover))//UID == 1允许连续上传 { errCode = ErrorCode.ErrorRomAlreadyHadCoverimg; } @@ -123,7 +123,7 @@ namespace AxibugEmuOnline.Server.Manager { Helper.FileDelete(Path.Combine(Config.cfg.wwwRootPath, coverPath)); byte[] ImgData = msg.SavImg.ToArray(); - string imgpath = Path.Combine("UpCover", $"{_c.UID}_{msg.RomID}.jpg"); + string imgpath = Path.Combine("UpCover", $"{_c.UID}_{msg.RomID}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.jpg"); ImgData = Helper.DecompressByteArray(ImgData); diff --git a/AxibugEmuOnline.Server/Properties/PublishProfiles/FolderProfile.pubxml.user b/AxibugEmuOnline.Server/Properties/PublishProfiles/FolderProfile.pubxml.user index 3fb23777..f7baca6c 100644 --- a/AxibugEmuOnline.Server/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/AxibugEmuOnline.Server/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2025-11-04T03:56:23.6612814Z||;True|2025-11-04T11:52:34.7320731+08:00||;True|2025-11-04T11:42:15.5651562+08:00||;True|2025-08-20T12:39:51.0978578+08:00||;True|2025-08-18T18:16:02.6095843+08:00||;True|2025-03-20T11:08:16.2733764+08:00||;True|2025-02-25T10:21:20.8779432+08:00||;False|2025-02-25T10:20:39.1249758+08:00||;False|2025-02-24T23:48:17.6638177+08:00||;True|2025-01-09T14:39:17.5797829+08:00||;True|2025-01-09T14:39:05.6042660+08:00||;True|2025-01-09T14:33:09.1944386+08:00||; + True|2025-11-04T04:58:22.8925985Z||;True|2025-11-04T12:50:22.1000015+08:00||;True|2025-11-04T12:43:05.7202674+08:00||;True|2025-11-04T11:56:23.6612814+08:00||;True|2025-11-04T11:52:34.7320731+08:00||;True|2025-11-04T11:42:15.5651562+08:00||;True|2025-08-20T12:39:51.0978578+08:00||;True|2025-08-18T18:16:02.6095843+08:00||;True|2025-03-20T11:08:16.2733764+08:00||;True|2025-02-25T10:21:20.8779432+08:00||;False|2025-02-25T10:20:39.1249758+08:00||;False|2025-02-24T23:48:17.6638177+08:00||;True|2025-01-09T14:39:17.5797829+08:00||;True|2025-01-09T14:39:05.6042660+08:00||;True|2025-01-09T14:33:09.1944386+08:00||; \ No newline at end of file diff --git a/AxibugEmuOnline.Web/Common/Helper.cs b/AxibugEmuOnline.Web/Common/Helper.cs index 6a1d956b..cf72577b 100644 --- a/AxibugEmuOnline.Web/Common/Helper.cs +++ b/AxibugEmuOnline.Web/Common/Helper.cs @@ -1,9 +1,17 @@ using AxibugProtobuf; +using static AxibugEmuOnline.Web.Controllers.ApiController; namespace AxibugEmuOnline.Web.Common { public class Helper { + const string NoImgUri = "images/NoImg.jpg"; + public static void CheckDefaultImg(Resp_RomInfo info) + { + if(string.IsNullOrEmpty(info.imgUrl)) + info.imgUrl = NoImgUri; + } + public static bool TryDecrypToken(string tokenStr, out Protobuf_Token_Struct tokenData) { if (string.IsNullOrEmpty(tokenStr) || string.IsNullOrEmpty(tokenStr.Trim())) diff --git a/AxibugEmuOnline.Web/Controllers/ApiController.cs b/AxibugEmuOnline.Web/Controllers/ApiController.cs index 23d91d62..58ae0c0b 100644 --- a/AxibugEmuOnline.Web/Controllers/ApiController.cs +++ b/AxibugEmuOnline.Web/Controllers/ApiController.cs @@ -129,6 +129,7 @@ namespace AxibugEmuOnline.Web.Controllers stars = reader.GetInt32(8), ptype = reader.GetInt32(9), }; + Helper.CheckDefaultImg(data); string parentsStr = !reader.IsDBNull(10) ? reader.GetString(10) : string.Empty; if (!string.IsNullOrEmpty(parentsStr)) { @@ -259,6 +260,7 @@ LIMIT ?offset, ?pageSize;"; stars = reader.GetInt32(8), ptype = reader.GetInt32(9), }; + Helper.CheckDefaultImg(data); string parentsStr = !reader.IsDBNull(10) ? reader.GetString(10) : string.Empty; if (!string.IsNullOrEmpty(parentsStr)) { @@ -326,6 +328,7 @@ LIMIT ?offset, ?pageSize;"; } } } + Helper.CheckDefaultImg(resp); if (UID > 0) { diff --git a/AxibugEmuOnline.Web/Properties/PublishProfiles/FolderProfile.pubxml.user b/AxibugEmuOnline.Web/Properties/PublishProfiles/FolderProfile.pubxml.user index b73682f8..a325bdfa 100644 --- a/AxibugEmuOnline.Web/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/AxibugEmuOnline.Web/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>G:\Sin365\AxibugEmuOnline\AxibugEmuOnline.Web\bin\Release\net8.0\publish\ - True|2025-08-20T03:32:29.2294907Z||;True|2025-03-20T11:46:45.2288963+08:00||;True|2025-02-25T10:10:20.1998665+08:00||;True|2025-02-25T10:06:10.7381658+08:00||;True|2025-02-24T20:17:30.7705009+08:00||;True|2025-02-24T20:17:22.8138039+08:00||;True|2025-02-24T20:04:18.6428884+08:00||;True|2025-02-24T20:03:59.5011548+08:00||;True|2025-02-24T19:53:21.4793388+08:00||;True|2025-02-05T11:59:16.6277678+08:00||;True|2025-02-05T11:57:28.8928988+08:00||;True|2025-01-23T14:10:54.0851574+08:00||;True|2025-01-23T13:21:13.2937446+08:00||;True|2025-01-23T13:15:40.1876887+08:00||;True|2025-01-13T15:57:42.8554189+08:00||;True|2025-01-13T15:56:16.9992929+08:00||;True|2025-01-09T15:00:13.8691822+08:00||;True|2025-01-09T14:47:16.4993283+08:00||;True|2025-01-09T14:47:09.3814423+08:00||;True|2025-01-09T14:38:36.2730244+08:00||;True|2025-01-08T13:35:26.6793825+08:00||;True|2025-01-07T10:37:18.6461694+08:00||;True|2024-09-12T14:18:38.6992653+08:00||;True|2024-09-12T14:08:58.4526827+08:00||;True|2024-08-22T14:13:06.3067002+08:00||;True|2024-08-14T10:33:10.9180984+08:00||;True|2024-08-13T18:28:27.5050523+08:00||;True|2024-08-13T18:25:47.6591234+08:00||;True|2024-08-13T18:25:17.5344107+08:00||;True|2024-08-13T17:46:23.4523329+08:00||; + True|2025-11-04T05:20:18.0176746Z||;True|2025-08-20T11:32:29.2294907+08:00||;True|2025-03-20T11:46:45.2288963+08:00||;True|2025-02-25T10:10:20.1998665+08:00||;True|2025-02-25T10:06:10.7381658+08:00||;True|2025-02-24T20:17:30.7705009+08:00||;True|2025-02-24T20:17:22.8138039+08:00||;True|2025-02-24T20:04:18.6428884+08:00||;True|2025-02-24T20:03:59.5011548+08:00||;True|2025-02-24T19:53:21.4793388+08:00||;True|2025-02-05T11:59:16.6277678+08:00||;True|2025-02-05T11:57:28.8928988+08:00||;True|2025-01-23T14:10:54.0851574+08:00||;True|2025-01-23T13:21:13.2937446+08:00||;True|2025-01-23T13:15:40.1876887+08:00||;True|2025-01-13T15:57:42.8554189+08:00||;True|2025-01-13T15:56:16.9992929+08:00||;True|2025-01-09T15:00:13.8691822+08:00||;True|2025-01-09T14:47:16.4993283+08:00||;True|2025-01-09T14:47:09.3814423+08:00||;True|2025-01-09T14:38:36.2730244+08:00||;True|2025-01-08T13:35:26.6793825+08:00||;True|2025-01-07T10:37:18.6461694+08:00||;True|2024-09-12T14:18:38.6992653+08:00||;True|2024-09-12T14:08:58.4526827+08:00||;True|2024-08-22T14:13:06.3067002+08:00||;True|2024-08-14T10:33:10.9180984+08:00||;True|2024-08-13T18:28:27.5050523+08:00||;True|2024-08-13T18:25:47.6591234+08:00||;True|2024-08-13T18:25:17.5344107+08:00||;True|2024-08-13T17:46:23.4523329+08:00||; \ No newline at end of file diff --git a/ProtobufCore/proto/protobuf_AxibugEmuOnline.proto b/ProtobufCore/proto/protobuf_AxibugEmuOnline.proto index 73f9dd5a..46d64824 100644 --- a/ProtobufCore/proto/protobuf_AxibugEmuOnline.proto +++ b/ProtobufCore/proto/protobuf_AxibugEmuOnline.proto @@ -87,9 +87,10 @@ enum ErrorCode ERROR_ROOM_CANT_DO_CURR_STATE =50;//当前房间状态不允许本操作 ERROR_ROM_DONT_HAD_SAVEDATA = 80;//即时存档不存在 - ERROR_ROM_FAIL_SAVEDATA = 81;//即时存档不存在 + ERROR_ROM_FAIL_SAVEDATA = 81;//处理即时存档失败 ERROR_ROM_ALREADY_HAD_COVERIMG =90;//该游戏已经有封面图 + ERROR_ROM_FAIL_COVERIMG = 91;//封面图处理失败 ERROR_ROM_ALREADY_HAD_STAR =403;//已经收藏 ERROR_ROM_DONT_HAD_STAR =404;//并没有收藏