From de0db5ac3d0c04bfaee7a2a265cc036d730751a5 Mon Sep 17 00:00:00 2001
From: rainzm <mjoycarry@gmail.com>
Date: Tue, 28 Sep 2021 11:13:09 +0800
Subject: [PATCH] fix(notify): add connect info in EXPIRED_RELEASE template

---
 .../share/local-templates/content@cn/EXPIRED_RELEASE.tmpl | 8 ++++++++
 .../share/local-templates/content@en/DELETE_WITH_IP.tmpl  | 2 +-
 .../share/local-templates/content@en/EXPIRED_RELEASE.tmpl | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/notify/root/opt/yunion/share/local-templates/content@cn/EXPIRED_RELEASE.tmpl b/build/notify/root/opt/yunion/share/local-templates/content@cn/EXPIRED_RELEASE.tmpl
index 9eae642ba6..b7ac9d6bd0 100644
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/EXPIRED_RELEASE.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@cn/EXPIRED_RELEASE.tmpl
@@ -3,4 +3,12 @@
 {{- if $d.brand -}}
 {{ $d.brand }}平台
 {{- end -}}
+
+{{- if $d.private_dns -}}
+，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}的
+{{- end -}}
 {{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，如需续期使用，请尽快前往控制台处理
diff --git a/build/notify/root/opt/yunion/share/local-templates/content@en/DELETE_WITH_IP.tmpl b/build/notify/root/opt/yunion/share/local-templates/content@en/DELETE_WITH_IP.tmpl
index e1a909f968..5845d6903d 100644
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/DELETE_WITH_IP.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@en/DELETE_WITH_IP.tmpl
@@ -6,7 +6,7 @@ Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {
 {{- end -}}
 
 {{- if $d.public_dns -}}
-, the internet address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
+, the external address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
 {{- end -}}
 
 {{- if and $d.address_type $d.address -}}
diff --git a/build/notify/root/opt/yunion/share/local-templates/content@en/EXPIRED_RELEASE.tmpl b/build/notify/root/opt/yunion/share/local-templates/content@en/EXPIRED_RELEASE.tmpl
index 04c84d7298..3bcf9d94e4 100644
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/EXPIRED_RELEASE.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@en/EXPIRED_RELEASE.tmpl
@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. If you need to renew, please go to the console as soon as possible
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.public_dns -}} with external address {{ $d.public_dns }}:{{ $d.public_connect_port }} {{ end -}} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. If you need to renew, please go to the console as soon as possible