ducnt 5 өдөр өмнө
parent
commit
7fa9a791b5

+ 0 - 7
SicboSub/Common/Constant/CommonConstant.cs

@@ -2,8 +2,6 @@
 
 public static class CommonConstant
 {
-    public const string ShowResult = "1";
-    public const string NextQuestion = "2";
 
     public const string Channel = "1542";
     public const string CountryCode = "258";
@@ -35,11 +33,6 @@ public static class CommonConstant
 
     public const String PathImage = "/outside";
 
-    public const String MissitonTypeLOGIN = "LOGIN";
-    public const String MissitonTypeREGISTER = "REGISTER";
-    public const String MissitonTypeREGISTERS = "REGISTERS";
-    public const String MissitonTypeINVITING = "INVITING";
-
 
     public const int StatusActive = 1;
     public const int StatusInactive = 0;

+ 6 - 0
SicboSub/SicboSub.Web/Controllers/BaseController.cs

@@ -119,6 +119,12 @@ namespace SicboSub.Web.Controllers
         protected IActionResult RedirectToLogin(IConfiguration configuration)
         {
             var redirectUrl = configuration.GetSection("RedirectUrl").Value;
+
+            var tokenRedirect =  HttpContext.Session.GetComplexData<string>("tokenRedirect");
+            if (string.IsNullOrEmpty(tokenRedirect)) {
+                return Redirect(redirectUrl);
+            }
+           
             
             if (!string.IsNullOrEmpty(redirectUrl))
             {

+ 2 - 2
SicboSub/SicboSub.Web/Controllers/HomeController.cs

@@ -1,7 +1,6 @@
 using Common.Constant;
 using log4net;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using SicboSub.Web.Helpers;
 using SicboSub.Web.Models;
 using System.Configuration;
@@ -14,7 +13,6 @@ namespace SicboSub.Web.Controllers
         private static readonly ILog log = LogManager.GetLogger(typeof(HomeController));
         private readonly ILogger<HomeController> _logger;
         private readonly IConfiguration _configuration;
-       
 
         public HomeController(ILogger<HomeController> logger, IConfiguration configuration)
         {
@@ -80,6 +78,7 @@ namespace SicboSub.Web.Controllers
             try
             {
                 string token = GetToken();
+
                 var request = new PackageLoadReq
                 {
                     lang = GetLanguage(),
@@ -281,6 +280,7 @@ namespace SicboSub.Web.Controllers
         {
             try
             {
+
                 var token = GetToken();
                 // 3 days ago
                 var fromDate = DateTime.Now.AddDays(-3).ToString("dd/MM/yyyy");

+ 37 - 1
SicboSub/SicboSub.Web/Language/Language.Designer.cs

@@ -19,7 +19,7 @@ namespace SicboSub.Web.Language {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Language {
@@ -294,6 +294,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Failed.
+        /// </summary>
+        public static string Failed {
+            get {
+                return ResourceManager.GetString("Failed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Game.
         /// </summary>
@@ -483,6 +492,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Rank.
+        /// </summary>
+        public static string Rank {
+            get {
+                return ResourceManager.GetString("Rank", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ranking.
         /// </summary>
@@ -582,6 +600,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Success.
+        /// </summary>
+        public static string Success {
+            get {
+                return ResourceManager.GetString("Success", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Switch to Daily.
         /// </summary>
@@ -681,6 +708,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Value.
+        /// </summary>
+        public static string Value {
+            get {
+                return ResourceManager.GetString("Value", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Verify.
         /// </summary>

+ 12 - 0
SicboSub/SicboSub.Web/Language/Language.resx

@@ -339,4 +339,16 @@
   <data name="Close" xml:space="preserve">
     <value>Close</value>
   </data>
+  <data name="Value" xml:space="preserve">
+    <value>Value</value>
+  </data>
+  <data name="Rank" xml:space="preserve">
+    <value>Rank</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Success</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>Failed</value>
+  </data>
 </root>

+ 12 - 0
SicboSub/SicboSub.Web/Language/Language.vi.resx

@@ -339,4 +339,16 @@
   <data name="Close" xml:space="preserve">
     <value>Close</value>
   </data>
+  <data name="Value" xml:space="preserve">
+    <value>Value</value>
+  </data>
+  <data name="Rank" xml:space="preserve">
+    <value>Rank</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Success</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>Failed</value>
+  </data>
 </root>

+ 7 - 7
SicboSub/SicboSub.Web/Views/Home/History.cshtml

@@ -73,10 +73,10 @@
         <div class="history-table hidden" id="prize-table">
             <!-- Header Row -->
             <div class="table-header">
-                <div class="col-account">Account</div>
-                <div class="col-time">Time</div>
-                <div class="col-value">Value</div>
-                <div class="col-status">Rank</div>
+                <div class="col-account">@Language.Account</div>
+                <div class="col-time">@Language.Time</div>
+                <div class="col-value">@Language.Value</div>
+                <div class="col-status">@Language.Rank</div>
             </div>
 
             <!-- Data Rows -->
@@ -120,15 +120,15 @@
                     <div class="table-row">
                         <div class="col-no">@(no++)</div>
                         <div class="col-time">@item.registerTime.ToString("dd/MM/yyyy HH:mm:ss")</div>
-                        <div class="col-value">@item.serviceId.ToString("N0") <span class="coins">HTG</span></div>
+                        <div class="col-value">@item.serviceId.ToString("N0") <span class="coins">@Language.HTG</span></div>
                         <div class="col-type">@item.productName</div>
                         @if (item.status == 1) // Assuming 1 is Success
                         {
-                             <div class="col-status successful">Success</div>
+                            <div class="col-status successful">@Language.Success</div>
                         }
                         else
                         {
-                             <div class="col-status fail">Failed</div>
+                            <div class="col-status fail">@Language.Failed</div>
                         }
                     </div>
                 }

+ 2 - 1
SicboSub/SicboSub.Web/appsettings.json

@@ -7,7 +7,8 @@
   },
   "AllowedHosts": "*",
   "Url": "http://127.0.0.1:9106",
-  "RedirectUrl": "http://149.28.132.56:8110",
+  //"RedirectUrl": "http://149.28.132.56:8110",
+  "RedirectUrl": "http://127.0.0.1:5042/?token=",
   "PackageCodeDaily": "SICBO_DAY",
   "Kestrel": {
     "EndPoints": {