diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
index e5a6c98..1ba6115 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
@@ -412,29 +412,55 @@ namespace EasyBL.WEBAPP.SYS
             {
                 do
                 {
-
+                   
                     var oUser = db.Queryable<SETB_CMS_Member>().Single(x => x.OrgID == OrgID && x.MemberID == MemberID);
 
-                    var RightNow = DateTime.Now;   //取當下時間
-                    var Time = RightNow - oUser.ExpireTime;
+                    //DateTime exxpireTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(oUser.ExpireTime));
+                    //TimeSpan test = new TimeSpan().Subtract(oUser.ExpireTime);
 
-                    TimeSpan Timec = (TimeSpan)(RightNow - oUser.ExpireTime);
+                    //-----------------------------------------
+                    var Time = DateTime.Now;   //取當下時間
 
-                    if (!string.IsNullOrEmpty(Code))
+                    if(Time > oUser.ExpireTime)
                     {
-                        if (Code == oUser.VerifyCode)
-                        {
-                            oUser.Status = "1";   //註冊成功
-                        }
-                        else
+
+                        System.Diagnostics.Debug.WriteLine("超過了");
+                        sError = @"認證時間已過期";   //驗證碼輸入錯誤
+                        errorStaus = (int)StatusCodeEnum.TokenVerifyFailed;
+                        break;
+
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(Code))
                         {
-                            sError = @"驗證碼輸入錯誤";   //驗證碼輸入錯誤
-                            errorStaus = (int)StatusCodeEnum.Error;
-                            break;
+                            if (Code == oUser.VerifyCode)
+                            {
+                                oUser.Status = "1";   //註冊成功
+                            }
+                            else
+                            {
+                                sError = @"驗證碼輸入錯誤";   //驗證碼輸入錯誤
+                                errorStaus = (int)StatusCodeEnum.Error;
+                                break;
+                            }
                         }
+                        System.Diagnostics.Debug.WriteLine("沒超過");
 
                     }
 
+                    var now = new TimeSpan(Time.Ticks);
+                    var ExpireTime = oUser.ExpireTime;   //紀錄的時效
+                    var expireTime = new TimeSpan(ExpireTime.Ticks);
+                    var time = now - expireTime;   //相差時間
+
+                    TimeSpan fiveMinute = new TimeSpan(0, 0, 5, 0, 0);   //過期時間為5分鐘
+
+                    System.Diagnostics.Debug.WriteLine("Time:" + Time);  //738601.11:02:57.8313066
+                    System.Diagnostics.Debug.WriteLine("sExpireTime:" + expireTime);   //738600.18:01:22.6400000
+                    System.Diagnostics.Debug.WriteLine("time:" + time.GetType());
+                    System.Diagnostics.Debug.WriteLine("fiveMinute:" + fiveMinute.Ticks);   //3000000000
+
                     var iRel = db.Updateable(oUser).ExecuteCommand();
                     //注冊成功后默認登錄
                     var ticket = new OTB_SYS_TicketAuth
diff --git a/EuroTran/Entity/Sugar/SETB_CMS_Member.cs b/EuroTran/Entity/Sugar/SETB_CMS_Member.cs
index 70aa4cb..eaea464 100644
--- a/EuroTran/Entity/Sugar/SETB_CMS_Member.cs
+++ b/EuroTran/Entity/Sugar/SETB_CMS_Member.cs
@@ -167,7 +167,7 @@ namespace Entity.Sugar
         /// Default:N
         /// Nullable:True
         /// </summary>           
-        public DateTime? ExpireTime { get; set; }
+        public DateTime ExpireTime { get; set; }
         public const string CN_ExpireTime = "ExpireTime";
 
         /// <summary>