From 600125711d995e73f0b978aa638e6d928fd48986 Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 4 Dec 2024 14:10:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CloudGaming/Api/CloudGaming.Api/Dockerfile | 10 +++++----- .../Code/CloudGaming.Code/Config/AppConfigBLLExtend.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CloudGaming/Api/CloudGaming.Api/Dockerfile b/src/CloudGaming/Api/CloudGaming.Api/Dockerfile index e369fa9..1c3b44f 100644 --- a/src/CloudGaming/Api/CloudGaming.Api/Dockerfile +++ b/src/CloudGaming/Api/CloudGaming.Api/Dockerfile @@ -4,11 +4,11 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base # 设置时区为北京时间 -RUN apt-get update && apt-get install -y tzdata && \ - ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo "Asia/Shanghai" > /etc/timezone && \ - dpkg-reconfigure -f noninteractive tzdata && \ - apt-get clean && rm -rf /var/lib/apt/lists/* +#RUN apt-get update && apt-get install -y tzdata && \ +# ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ +# echo "Asia/Shanghai" > /etc/timezone && \ +# dpkg-reconfigure -f noninteractive tzdata && \ +# apt-get clean && rm -rf /var/lib/apt/lists/* USER $APP_UID WORKDIR /app diff --git a/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLLExtend.cs b/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLLExtend.cs index de6ef8a..73eb259 100644 --- a/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLLExtend.cs +++ b/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLLExtend.cs @@ -41,7 +41,7 @@ public static class AppConfigBLLExtend public static AppConfigCache GetAppConfig(this List app_Configs, int cfgType, int cfgId, AppRequestConfig? appRequestInfo) { var list = GetAppCfgList(app_Configs, cfgType, cfgId, appRequestInfo?.Channel, appRequestInfo?.Platform, appRequestInfo.VersionNum, appRequestInfo?.Continent, appRequestInfo?.CountryName); - return list.FirstOrDefault(); + return list?.FirstOrDefault(); } ///