diff --git a/YD_AllHeartRates.Api/Dockerfile b/YD_AllHeartRates.Api/Dockerfile index cbb1411..4074898 100644 --- a/YD_AllHeartRates.Api/Dockerfile +++ b/YD_AllHeartRates.Api/Dockerfile @@ -11,6 +11,8 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # 此阶段用于生成服务项目 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build diff --git a/YD_AllHeartRates.Api/appsettings.json b/YD_AllHeartRates.Api/appsettings.json index ce0767a..1e05f22 100644 --- a/YD_AllHeartRates.Api/appsettings.json +++ b/YD_AllHeartRates.Api/appsettings.json @@ -47,13 +47,23 @@ "Topic": "heartrates/topic", "BatchSize": 1 }, + //"DataPush": { + // "Hous": "http://shsunshine-ty.shec.edu.cn/tzjk-watch/", + // "Appid": "e96cde5c1908bc3cf09ebce13735765bb2790e2b485581c5307cfd58fbbc026e5c0b36545927c92bf4ab97471d8f0278218d1af6f0deb488003eef85f430439d", + // "ClientId": "92465d8d-d16b-4088-bcb7-9b81415b755a", + // "PublicKey": "03c948ec7c093c29b318a0814fcf37a9ec5e623df96c78cb859f4fa3ddc91811d3", + // "SecretKey": "87d00391b2807a32696abf8e3d639ac6ae8a9c2a476e45180f919966d71105af", + // "Sm4key": "Zy3bzNGyzugnEmYe", + // "Sm4iv": "swiBsHDHbibRUmfm" + //} + "DataPush": { - "Hous": "http://shsunshine-ty.shec.edu.cn/tzjk-watch/", - "Appid": "e96cde5c1908bc3cf09ebce13735765bb2790e2b485581c5307cfd58fbbc026e5c0b36545927c92bf4ab97471d8f0278218d1af6f0deb488003eef85f430439d", - "ClientId": "92465d8d-d16b-4088-bcb7-9b81415b755a", - "PublicKey": "03c948ec7c093c29b318a0814fcf37a9ec5e623df96c78cb859f4fa3ddc91811d3", + "Hous": "https://zxx.shedusoft.com/tzjk-watch/", + "Appid": "e96cde5c1908bc3cf09ebce13735765b7a2a617726ae122722bbbfb46f1d737c2df72c9773a75f4b7d5f89dfd4052cd47e22688fcf3ca829712f9f41d5b6d4558fffa081ac7d2f746744e5bc40451e04", + "ClientId": "a93d62bc-6517-40b5-849b-91beed8cf59e", + "PublicKey": "038412fc7ae2ed37c1335622257138fb730c7f7bf6e4c08795b2f011005faf7a7e", "SecretKey": "87d00391b2807a32696abf8e3d639ac6ae8a9c2a476e45180f919966d71105af", - "Sm4key": "Zy3bzNGyzugnEmYe", - "Sm4iv": "swiBsHDHbibRUmfm" + "Sm4key": "qU3pK6JOKXCFtNFK", + "Sm4iv": "hxXbu1vW8ObPhUJl" } } diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs index ea0aa87..d327cfc 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3fb2268bb010dba28589cdc7a4186a566f598d0c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+16661693972e7a62edc93601c180e76d2eb23024")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache index 95a8f22..c988585 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -45bbed3a25c19fc3e72e316405f040c6cd1751d64f9cada8b42789394000df94 +39a32c7b9cc1be33889f7d33a4ef5ef615357360471850dacd960b9d1077c285 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache index 472d843..586992a 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache index 17cb692..e3dac67 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs index 83f9a3a..1e17851 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3fb2268bb010dba28589cdc7a4186a566f598d0c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+16661693972e7a62edc93601c180e76d2eb23024")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache index 038530e..ba9adbd 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -570bf2cb94f3c5895254f5e1e956aeef4ad74c2361b0fe7de273549fbb278f22 +ab88d7d6eb05fa794293cb68b2cf34e94d6795619392710412747134a29619af