Merge branch 'main' of github.com:masastack/MASA.Alert

masastack · Aug 6, 2024 · caba51d · caba51d
2 parents f13a7ee + ce38fe3
commit caba51d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
  <MasaFrameworkPackageVersion>1.2.0-preview.2</MasaFrameworkPackageVersion>
- <MasaStackSdksPackageVersion>1.1.1-preview.4</MasaStackSdksPackageVersion>
+ <MasaStackSdksPackageVersion>1.1.1-preview.7</MasaStackSdksPackageVersion>
  </PropertyGroup>
 </Project>
diff --git a/src/Domain/Masa.Alert.Domain.Shared/AlarmRules/AlarmRuleChannelTypes.cs b/src/Domain/Masa.Alert.Domain.Shared/AlarmRules/AlarmRuleChannelTypes.cs
diff --git a/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj b/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj
@@ -17,7 +17,7 @@
  <PackageReference Include="Mapster" Version="7.3.0" />
  <PackageReference Include="Masa.BuildingBlocks.Authentication.Identity" Version="$(MasaFrameworkPackageVersion)" />
  <PackageReference Include="Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch" Version="$(MasaFrameworkPackageVersion)" />
- <PackageReference Include="Masa.Stack.Components" Version="0.0.475" />
+ <PackageReference Include="Masa.Stack.Components" Version="0.0.478" />
  <PackageReference Include="Masa.Utils.Data.Elasticsearch" Version="$(MasaFrameworkPackageVersion)" />
  <PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaStackSdksPackageVersion)" />
  <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.3" />

diff --git a/src/Web/Masa.Alert.Web.Admin/wwwroot/i18n/zh-CN.json b/src/Web/Masa.Alert.Web.Admin/wwwroot/i18n/zh-CN.json
@@ -67,6 +67,7 @@
  "Email": "邮箱",
  "WebsiteMessage": "站内信",
  "WeixinWork": "企业微信",
+ "WeixinWorkWebhook": "企业微信群机器人",
  "WaitAudit": "待审核",
  "Adopt": "通过",
  "Fail": "未通过",