提交代码
This commit is contained in:
parent
08cd3df42b
commit
09aa1ded73
|
|
@ -8,6 +8,7 @@
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
<DockerfileContext>..\..</DockerfileContext>
|
<DockerfileContext>..\..</DockerfileContext>
|
||||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||||
|
<IsPackable>true</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,10 @@ ARG BUILD_CONFIGURATION=Release
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
COPY ["Api/CloudGaming.Api/CloudGaming.Api.csproj", "Api/CloudGaming.Api/"]
|
COPY ["Api/CloudGaming.Api/CloudGaming.Api.csproj", "Api/CloudGaming.Api/"]
|
||||||
COPY ["Code/CloudGaming.Code/CloudGaming.Code.csproj", "Code/CloudGaming.Code/"]
|
COPY ["Code/CloudGaming.Code/CloudGaming.Code.csproj", "Code/CloudGaming.Code/"]
|
||||||
COPY ["Model/CloudGaming.Model/CloudGaming.Model.csproj", "Model/CloudGaming.Model/"]
|
COPY ["Model/CloudGaming.DtoModel/CloudGaming.DtoModel.csproj", "Model/CloudGaming.DtoModel/"]
|
||||||
|
COPY ["Model/CloudGaming.GameModel/CloudGaming.GameModel.csproj", "Model/CloudGaming.GameModel/"]
|
||||||
COPY ["Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj", "Utile/HuanMeng.DotNetCore/"]
|
COPY ["Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj", "Utile/HuanMeng.DotNetCore/"]
|
||||||
|
COPY ["Model/CloudGaming.Model/CloudGaming.Model.csproj", "Model/CloudGaming.Model/"]
|
||||||
RUN dotnet restore "./Api/CloudGaming.Api/CloudGaming.Api.csproj"
|
RUN dotnet restore "./Api/CloudGaming.Api/CloudGaming.Api.csproj"
|
||||||
COPY . .
|
COPY . .
|
||||||
WORKDIR "/src/Api/CloudGaming.Api"
|
WORKDIR "/src/Api/CloudGaming.Api"
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,15 @@
|
||||||
"Microsoft.AspNetCore": "Warning"
|
"Microsoft.AspNetCore": "Warning"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"AgileConfig": {
|
||||||
|
"appId": "CloudGaming",
|
||||||
|
"secret": "95BB717C61D1ECB0E9FB82C932CC77FF",
|
||||||
|
"nodes": "http://124.220.55.158:94", //多个节点使用逗号分隔
|
||||||
|
"url": "http://124.220.55.158:94",
|
||||||
|
"env": "DEV",
|
||||||
|
"UserName": "admin",
|
||||||
|
"Password": "dbt@com@1234"
|
||||||
|
},
|
||||||
//服务器配置
|
//服务器配置
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
"Endpoints": {
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
"secret": "95BB717C61D1ECB0E9FB82C932CC77FF",
|
"secret": "95BB717C61D1ECB0E9FB82C932CC77FF",
|
||||||
"nodes": "http://124.220.55.158:94", //多个节点使用逗号分隔
|
"nodes": "http://124.220.55.158:94", //多个节点使用逗号分隔
|
||||||
"url": "http://124.220.55.158:94",
|
"url": "http://124.220.55.158:94",
|
||||||
"env": "DEV",
|
"env": "TEST",
|
||||||
"UserName": "admin",
|
"UserName": "admin",
|
||||||
"Password": "dbt@com@1234"
|
"Password": "dbt@com@1234"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ namespace CloudGaming.Code.Epg
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var epgInfo = item.ToEpgInfo(Cache.GameEntityCache,it.DefaultImageStyle);
|
var epgInfo = item.ToEpgInfo(Cache.GameEntityCache,it.DefaultImageStyle);
|
||||||
if (epgInfo != null)
|
if (epgInfo != null)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,7 @@ namespace CloudGaming.Code.Epg
|
||||||
{
|
{
|
||||||
epgCfg.ImageResStyle = defaultImageStyle;
|
epgCfg.ImageResStyle = defaultImageStyle;
|
||||||
}
|
}
|
||||||
|
epgInfo.ImageResStyle = epgCfg.ImageResStyle;
|
||||||
//defaultImageStyle
|
//defaultImageStyle
|
||||||
if (epgInfo.ImageUrl == 0 && epgCfg.ImageResStyle != 0)
|
if (epgInfo.ImageUrl == 0 && epgCfg.ImageResStyle != 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,10 @@ namespace CloudGaming.DtoModel.Epg
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Images]
|
[Images]
|
||||||
public int ImageUrl { get; set; }
|
public int ImageUrl { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 图片样式
|
||||||
|
/// </summary>
|
||||||
|
public int ImageResStyle { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 角标图片信息
|
/// 角标图片信息
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user