Skip to content

Commit e3ce8f1

Browse files
AlianBlankAlianBlank
committed
[修改]1. 修改请求的响应值的处理
1 parent 9ef42b3 commit e3ce8f1

7 files changed

+288
-357
lines changed

‎GameFrameX.Client.Api/Controllers/GameAppVersionController.cs

Lines changed: 85 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,102 @@
1-
using GameFrameX.Application.Api.GameApplicationVersion;
2-
using GameFrameX.Client.Api.Result;
3-
using GameFrameX.Entity.Client;
4-
using Microsoft.AspNetCore.Mvc;
5-
using Newtonsoft.Json;
1+
// GameFrameX 组织下的以及组织衍生的项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
2+
//
3+
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE 文件。
4+
//
5+
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
66

7-
namespace GameFrameX.Client.Api.Controllers
7+
using GameFrameX.Application.Client.Api.GameAppVersion;
8+
9+
namespace GameFrameX.Client.Api.Controllers;
10+
11+
/// <summary>
12+
/// 程序版本控制器
13+
/// </summary>
14+
public class GameAppVersionController : BaseController<ClientAppVersion>
815
{
916
/// <summary>
10-
/// 程序版本控制器
17+
///
1118
/// </summary>
12-
public class GameAppVersionController : BaseController<ClientAppVersion>
19+
/// <param name="service"></param>
20+
public GameAppVersionController(BaseService<ClientAppVersion> service) : base(service)
1321
{
14-
/// <summary>
15-
///
16-
/// </summary>
17-
/// <param name="service"></param>
18-
public GameAppVersionController(BaseService<ClientAppVersion> service) : base(service)
22+
}
23+
24+
/// <summary>
25+
/// 获取游戏版本信息
26+
/// </summary>
27+
/// <returns></returns>
28+
[ProducesResponseType(typeof(GameAppVersionResponse), 200)]
29+
[HttpPost]
30+
public async Task<HttpJsonResult> GetInfo([FromBody] GameAppVersionRequest gameAppVersionRequest)
31+
{
32+
var response = new GameAppVersionResponse();
33+
ClientAppVersion gameAppVersion = await PBaseService.GetAsync(m =>
34+
m.Platform == gameAppVersionRequest.Platform
35+
&& m.Package == gameAppVersionRequest.PackageName
36+
&& m.OldVersion == gameAppVersionRequest.AppVersion
37+
&& m.Language == gameAppVersionRequest.Language
38+
&& m.Channel == gameAppVersionRequest.Channel);
39+
40+
if (gameAppVersion == null)
1941
{
42+
gameAppVersion = await PBaseService.GetAsync(m =>
43+
m.Platform == gameAppVersionRequest.Platform
44+
&& m.Package == gameAppVersionRequest.PackageName
45+
&& m.OldVersion == gameAppVersionRequest.AppVersion
46+
&& m.Language == gameAppVersionRequest.Language
47+
&& m.Channel == ConstValue.ChannelNameDefault);
2048
}
2149

22-
/// <summary>
23-
/// 获取游戏版本信息
24-
/// </summary>
25-
/// <returns></returns>
26-
[ProducesResponseType(typeof(GameAppVersionResponse), 200)]
27-
[HttpPost]
28-
public async Task<HttpResult> GetInfo([FromBody] GameAppVersionRequest gameAppVersionRequest)
50+
if (gameAppVersion == null)
2951
{
30-
var response = new GameAppVersionResponse();
31-
ClientAppVersion gameAppVersion = await PBaseService.GetAsync(m =>
32-
m.Platform == gameAppVersionRequest.Platform && m.Package == gameAppVersionRequest.PackageName && m.OldVersion == gameAppVersionRequest.AppVersion && m.Language == gameAppVersionRequest.Language &&
33-
m.Channel == gameAppVersionRequest.Channel);
34-
35-
/*if (gameAppVersion == null)
36-
{
37-
gameAppVersion = await PBaseService.GetAsync(m =>
38-
m.Platform == request.Platform && m.Package == request.PackageName && m.OldVersion == request.AppVersion && m.Language == request.Language &&
39-
m.Channel == request.Channel);
40-
}*/
41-
42-
if (gameAppVersion == null)
43-
{
44-
gameAppVersion = await PBaseService.GetAsync(m =>
45-
m.Platform == gameAppVersionRequest.Platform && m.Package == gameAppVersionRequest.PackageName && m.OldVersion == gameAppVersionRequest.AppVersion && m.Language == gameAppVersionRequest.Language &&
46-
m.Channel == ConstValue.ChannelNameDefault);
47-
}
48-
49-
if (gameAppVersion == null)
50-
{
51-
gameAppVersion = await PBaseService.GetAsync(m =>
52-
m.Platform == gameAppVersionRequest.Platform && m.Package == gameAppVersionRequest.PackageName && m.OldVersion == gameAppVersionRequest.AppVersion && m.Language == ConstValue.LanguageDefault &&
53-
m.Channel == ConstValue.ChannelNameDefault);
54-
}
52+
gameAppVersion = await PBaseService.GetAsync(m =>
53+
m.Platform == gameAppVersionRequest.Platform
54+
&& m.Package == gameAppVersionRequest.PackageName
55+
&& m.OldVersion == gameAppVersionRequest.AppVersion
56+
&& m.Language == ConstValue.LanguageDefault
57+
&& m.Channel == ConstValue.ChannelNameDefault);
58+
}
5559

56-
if (gameAppVersion == null)
57-
{
58-
gameAppVersion = await PBaseService.GetAsync(m =>
59-
m.Platform == gameAppVersionRequest.Platform && m.Package == gameAppVersionRequest.PackageName && m.OldVersion == ConstValue.AppVersionDefault &&
60-
m.Language == ConstValue.LanguageDefault &&
61-
m.Channel == ConstValue.ChannelNameDefault);
62-
}
60+
if (gameAppVersion == null)
61+
{
62+
gameAppVersion = await PBaseService.GetAsync(m =>
63+
m.Platform == gameAppVersionRequest.Platform
64+
&& m.Package == gameAppVersionRequest.PackageName
65+
&& m.OldVersion == ConstValue.AppVersionDefault
66+
&& m.Language == ConstValue.LanguageDefault
67+
&& m.Channel == ConstValue.ChannelNameDefault);
68+
}
6369

64-
if (gameAppVersion == null)
65-
{
66-
gameAppVersion = await PBaseService.GetAsync(m =>
67-
m.Platform == gameAppVersionRequest.Platform &&
68-
m.Package == ConstValue.PackageNameDefault &&
69-
m.Version == ConstValue.AppVersionDefault &&
70-
m.Language == ConstValue.LanguageDefault &&
71-
m.Channel == ConstValue.ChannelNameDefault);
72-
}
70+
if (gameAppVersion == null)
71+
{
72+
gameAppVersion = await PBaseService.GetAsync(m =>
73+
m.Platform == gameAppVersionRequest.Platform &&
74+
m.Package == ConstValue.PackageNameDefault &&
75+
m.Version == ConstValue.AppVersionDefault &&
76+
m.Language == ConstValue.LanguageDefault &&
77+
m.Channel == ConstValue.ChannelNameDefault);
78+
}
7379

74-
if (gameAppVersion == null)
75-
{
76-
gameAppVersion = await PBaseService.GetAsync(m =>
77-
m.Platform == ConstValue.PlatformDefault && m.Package == ConstValue.PackageNameDefault && m.OldVersion == ConstValue.AppVersionDefault &&
78-
m.Language == ConstValue.LanguageDefault &&
79-
m.Channel == ConstValue.ChannelNameDefault);
80-
}
80+
if (gameAppVersion == null)
81+
{
82+
gameAppVersion = await PBaseService.GetAsync(m =>
83+
m.Platform == ConstValue.PlatformDefault
84+
&& m.Package == ConstValue.PackageNameDefault
85+
&& m.OldVersion == ConstValue.AppVersionDefault &&
86+
m.Language == ConstValue.LanguageDefault &&
87+
m.Channel == ConstValue.ChannelNameDefault);
88+
}
8189

82-
if (gameAppVersion == null)
83-
{
84-
return HttpResult.Create(HttpStatusCode.NotFound, "not found");
85-
}
90+
if (gameAppVersion == null)
91+
{
92+
return HttpJsonResult.NotFound();
93+
}
8694

87-
response.IsForce = gameAppVersion.IsForce;
88-
response.IsUpgrade = gameAppVersionRequest.AppVersion != gameAppVersion.Version;
89-
response.UpdateAnnouncement = gameAppVersion.Announcement;
90-
response.AppDownloadUrl = gameAppVersion.DownloadUrl;
95+
response.IsForce = gameAppVersion.IsForce;
96+
response.IsUpgrade = gameAppVersionRequest.AppVersion != gameAppVersion.Version;
97+
response.UpdateAnnouncement = gameAppVersion.Announcement;
98+
response.AppDownloadUrl = gameAppVersion.DownloadUrl;
9199

92-
return HttpResult.Create(JsonConvert.SerializeObject(response));
93-
}
100+
return HttpJsonResult.Success(response);
94101
}
95102
}

0 commit comments

Comments
 (0)