From 38b65d76764d6974981a4ea30ed9fb50bf455aab Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 10 Feb 2023 12:59:07 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=B8=AC=E8=A9=A6=E6=A9=9F=E4=BD=8D?=
 =?UTF-8?q?=E5=9D=80=E5=B0=8E=E9=A0=85=E4=BF=AE=E6=94=B9=20[WHY]=20?=
 =?UTF-8?q?=E9=96=8B=E7=99=BC=20ShowEasy=20=E5=BE=8C=E8=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs | 15 ++++++++++-----
 EuroTran/WebApp/Web.config                       |  5 +++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
index d092e81..19c6a38 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
@@ -24,10 +24,10 @@ namespace EasyBL.WEBAPP.SYS
     public class SignupService : ServiceBase
     {
         //public static string SERVER_IP = "localhost";
-        //public static string SERVER_PORT = "3466";
+       // public static string SERVER_PORT = "3466";
 
-        public static string SERVER_IP = "www.origtek.com";
-        public static string SERVER_PORT = "9105";
+        //public static string SERVER_IP = "www.origtek.com";
+        //public static string SERVER_PORT = "9105";
 
         //使用者以信箱註冊
         public HttpResponseMessage SignupWithEmail(SETB_CMS_Member newUser)
@@ -267,6 +267,7 @@ namespace EasyBL.WEBAPP.SYS
             StringBuilder sb = new StringBuilder();
 
             EmailTemplate_CH mailTemplate = new EmailTemplate_CH();
+            var Server = Common.ConfigGetValue("", "ida:SERVER");
 
             sb.Append(mailTemplate.MailHeader());
             sb.Append(mailTemplate.MailCSS());
@@ -319,7 +320,7 @@ namespace EasyBL.WEBAPP.SYS
             sb.Append("<tr>");
             sb.Append("<td class=\"s-btn s-btn__primary\" style=\"border-radius: 16px; background: #ee9546\">");
             sb.Append("<a class=\"s-btn s-btn__primary\" href=\"");
-            sb.Append("http://" + SERVER_IP + ":" + SERVER_PORT + "/api/Signup/VerifyAccount?OrgID=" + OrgID + "&MemberID=" + MemberID);
+            sb.Append(Server + "/api/Signup/VerifyAccount?OrgID=" + OrgID + "&MemberID=" + MemberID);
             sb.Append(" \" target=\"_parent\" style=\"background: #ee9546;border: 1px solid #ee9546;font-family: arial, sans-serif; font-size: 14px;line-height: 16px; color: #ffffff;text-align: center;text-decoration: none;padding: 12px 20px; display: block; border-radius: 16px; white-space: nowrap;\">");
             sb.Append("會員認證");
             sb.Append("</a>");
@@ -383,6 +384,8 @@ namespace EasyBL.WEBAPP.SYS
             StringBuilder sb = new StringBuilder();
 
             EmailTemplate_CH mailTemplate = new EmailTemplate_CH();
+            var Server = Common.ConfigGetValue("", "ida:SERVER");
+
 
             sb.Append(mailTemplate.MailHeader());
             sb.Append(mailTemplate.MailCSS());
@@ -438,7 +441,7 @@ namespace EasyBL.WEBAPP.SYS
             sb.Append("<tr>");
             sb.Append("<td class=\"s-btn s-btn__primary\" style=\"border-radius: 16px; background: #ee9546\">");
             sb.Append("<a class=\"s-btn s-btn__primary\" href=\"");
-            sb.Append("http://" + SERVER_IP + ":" + SERVER_PORT + "/api/Signup/ResetPage?Email=" + Email);
+            sb.Append(Server + "/api/Signup/ResetPage?Email=" + Email);
             sb.Append(" \" target=\"_parent\" style=\"background: #ee9546;border: 1px solid #ee9546;font-family: arial, sans-serif; font-size: 14px;line-height: 16px; color: #ffffff;text-align: center;text-decoration: none;padding: 12px 20px; display: block; border-radius: 16px; white-space: nowrap;\">");
             sb.Append("重設密碼");
             sb.Append("</a>");
@@ -531,6 +534,8 @@ namespace EasyBL.WEBAPP.SYS
             StringBuilder sb = new StringBuilder();
 
             EmailTemplate_CH mailTemplate = new EmailTemplate_CH();
+            var Server = Common.ConfigGetValue("", "ida:SERVER");
+
 
             sb.Append(mailTemplate.MailHeader());
             sb.Append(mailTemplate.MailCSS());
diff --git a/EuroTran/WebApp/Web.config b/EuroTran/WebApp/Web.config
index b500766..ad90573 100644
--- a/EuroTran/WebApp/Web.config
+++ b/EuroTran/WebApp/Web.config
@@ -87,8 +87,9 @@
     <add key="ida:AppId" value="8509ba61-9451-4960-94d8-10934d5365cc" />
     <add key="ida:AppPassword" value="qWWKUV056{*{)fuowwgHK31" />
     <add key="ida:RedirectUri" value="http://localhost:3466" />
-	<add key="ida:WebsiteUri" value="http://localhost:3000" />
-    <add key="ida:AppScopes" value=" User.Read Mail.ReadWrite Mail.Send Calendars.ReadWrite Contacts.Read Contacts.ReadWrite" />
+	<add key="ida:WebsiteUri" value="http://www.origtek.com:3000" />
+	<add key="ida:SERVER" value="http://www.origtek.com:3000" />
+	<add key="ida:AppScopes" value=" User.Read Mail.ReadWrite Mail.Send Calendars.ReadWrite Contacts.Read Contacts.ReadWrite" />
     <add key="ida:GraphRootUri" value="https://graph.microsoft.com/beta" />
   </appSettings>
   <!--設置json的最大長度-->