소스 검색

no message

ducnt 3 주 전
부모
커밋
5d6f819476

+ 34 - 6
WebChallenge/WebChallenge/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -16,14 +16,42 @@ namespace WebChallenge
     {
 
         private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Program));
+        //public static void Main(string[] args)
+        //{
+        //    XmlDocument log4netConfig = new XmlDocument();
+        //    log4netConfig.Load(File.OpenRead("log4net.config"));
+        //    var repo = log4net.LogManager.CreateRepository(
+        //        Assembly.GetEntryAssembly(), typeof(log4net.Repository.Hierarchy.Hierarchy));
+
+        //    log4net.Config.XmlConfigurator.Configure(repo, log4netConfig["log4net"]);
+
+        //    log.Info("Application - Main is invoked");
+
+        //    CreateHostBuilder(args).Build().Run();
+        //}
         public static void Main(string[] args)
         {
-            XmlDocument log4netConfig = new XmlDocument();
-            log4netConfig.Load(File.OpenRead("log4net.config"));
-            var repo = log4net.LogManager.CreateRepository(
-                Assembly.GetEntryAssembly(), typeof(log4net.Repository.Hierarchy.Hierarchy));
+            // 1. Xác định đường dẫn tuyệt đối đến file config
+            string configPath = Path.Combine(AppContext.BaseDirectory, "log4net.config");
+
+            // Kiểm tra xem file có tồn tại không trước khi load để tránh crash ứng dụng
+            if (!File.Exists(configPath))
+            {
+                // Bạn có thể log ra console hoặc event log của windows ở đây nếu muốn
+                Console.WriteLine($"Không tìm thấy file cấu hình tại: {configPath}");
+            }
+            else
+            {
+                XmlDocument log4netConfig = new XmlDocument();
+                using (var fs = File.OpenRead(configPath))
+                {
+                    log4netConfig.Load(fs);
+                    var repo = log4net.LogManager.CreateRepository(
+                        Assembly.GetEntryAssembly(), typeof(log4net.Repository.Hierarchy.Hierarchy));
 
-            log4net.Config.XmlConfigurator.Configure(repo, log4netConfig["log4net"]);
+                    log4net.Config.XmlConfigurator.Configure(repo, log4netConfig["log4net"]);
+                }
+            }
 
             log.Info("Application - Main is invoked");
 

+ 3 - 3
WebChallenge/WebChallenge/Views/Home/BuyTurn.cshtml

@@ -46,15 +46,15 @@
                     </div>
 
                     <div class="mt-[2.87rem] grid grid-cols-3 gap-[0.72rem] max-w-[393px] px-5 mx-auto">
-                        <div class="buy-turn-btn buy-turn-btn-1 " packg="MAIN_CHARGE_2">
+                        <div class="buy-turn-btn buy-turn-btn-1 " packg="THUTHACH_CHARGE">
                             <p class="text-[1875rem] font-black uppercase">5Cents</p>
                             <p class="text-xl font-extrabold">2 @Lang.turn</p>
                         </div>
-                        <div class="buy-turn-btn buy-turn-btn-2 active" packg="MAIN_CHARGE_5">
+                        <div class="buy-turn-btn buy-turn-btn-2 active" packg="THUTHACH_CHARGE_10">
                             <p class="text-[1875rem] font-black uppercase">10Cents</p>
                             <p class="text-xl font-extrabold">5 @Lang.turns</p>
                         </div>
-                        <div class="buy-turn-btn buy-turn-btn-3" packg="MAIN_CHARGE_10">
+                        <div class="buy-turn-btn buy-turn-btn-3" packg="THUTHACH_CHARGE_20">
                             <p class="text-[1875rem] font-black uppercase">20Cents</p>
                             <p class="text-xl font-extrabold">10 @Lang.turns</p>
                         </div>

+ 1 - 1
WebChallenge/WebChallenge/Views/Home/Index.cshtml

@@ -28,7 +28,7 @@
 
                 <div class="flex flex-col flex-grow justify-center">
                     <div class="flex flex-col items-center gap-[5px] justify-center -mt-1 h-full max-h-[175px]">
-                        <img src="../assets/icons/logo.svg" alt="movitel_challenges.png" class="max-w-[40px] max-h-[45px]" />
+                        @* <img src="../assets/icons/logo.svg" alt="movitel_challenges.png" class="max-w-[40px] max-h-[45px]" /> *@
                         <img src="../assets/images/movitel_challenges.png" alt="movitel_challenges.png"
                              class="max-w-[14.125rem] max-h-[7.5625rem]" />
                     </div>

+ 2 - 2
WebChallenge/WebChallenge/Views/Home/Setting.cshtml

@@ -66,12 +66,12 @@
                                 </button>
                             </div>
 
-                            <div class="mt-2 text-center flex justify-center">
+                            @* <div class="mt-2 text-center flex justify-center">
                                 <p class="text-[#434343] max-w-[156px]">
                                     @Lang.CancelConfirm
                                     <button class="text-[#F20] font-bold underline" onclick="showModal('dialogCancel')">@Lang.Cancel</button>
                                 </p>
-                            </div>
+                            </div> *@
                         </div>
                     }
                 </div>

+ 4 - 4
WebChallenge/WebChallenge/Views/Home/Winner.cshtml

@@ -39,12 +39,12 @@
                 </a>
                 <div class="relative overflow-hidden w-full h-32 flex items-center justify-between p-4">
                     <!-- Text -->
-                    <div class="text-left">
+                    @* <div class="text-left">
                         <p class="text-white font-black leading-none text-[37px] font-roboto">100 $</p>
-                    </div>
+                    </div> *@
                     <!-- Background -->
-                    <div class="absolute inset-0 z-[-1]">
-                        <img src="../assets/images/mmt-moza.png" alt="Background" class="object-cover w-full h-full">
+                    <div class="absolute inset-0 z-[-1]" >
+                        <img src="../assets/images/mmt-moza.png" alt="Background" style="border-radius:18px" class="object-cover w-full h-full">
                     </div>
                 </div>
             </div>

+ 1 - 1
WebChallenge/WebChallenge/Views/Shared/_Layout.cshtml

@@ -160,7 +160,7 @@
                     <div class="w-full">
                         <input type="hidden" id="packagePeriod"/>
                         <div>
-                            <input type="radio" id="basicAccount" name="payment" value="MAIN_AUTO" checked=checked />
+                            <input type="radio" id="basicAccount" name="payment" value="THUTHACH_REGISTER_DAILY" checked=checked />
                             <label for="basicAccount">@Lang.PayBasic</label>
                         </div>
                         @* <div>

+ 14 - 11
WebChallenge/WebChallenge/WebChallenge.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
   </PropertyGroup>
 
@@ -17,16 +17,19 @@
     <Content Remove="Views\Shared\_LayoutLogin.cshtml" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.17" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.17" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="log4net" Version="2.0.17" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.32" />
+
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
+
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 
   <ItemGroup>
     <Compile Update="Texts\Lang.Designer.cs">

BIN
WebChallenge/WebChallenge/wwwroot/assets/images/data.png


BIN
WebChallenge/WebChallenge/wwwroot/assets/images/mmt-moza.png


BIN
WebChallenge/WebChallenge/wwwroot/assets/images/sms-MT-data.png