230330

Tynab · Mar 29, 2023 · d5140f5 · d5140f5
1 parent 2bcd7e3
commit d5140f5
Show file tree

Hide file tree

Showing 16 changed files with 252 additions and 116 deletions.
diff --git a/Loginside FYAN Bot GUI/Loginside FYAN Bot GUI.csproj b/Loginside FYAN Bot GUI/Loginside FYAN Bot GUI.csproj
@@ -25,7 +25,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.4.0.0</ApplicationVersion>
+    <ApplicationVersion>2.0.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>

diff --git a/Loginside FYAN Bot GUI/Properties/AssemblyInfo.cs b/Loginside FYAN Bot GUI/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("8.8.8.8")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 [assembly: NeutralResourcesLanguage("vi")]
diff --git a/Loginside FYAN Bot GUI/Script/Constant.cs b/Loginside FYAN Bot GUI/Script/Constant.cs
@@ -1,16 +1,16 @@
 using System.Drawing;
 using System.Media;
 using static Loginside_FYAN_Bot_GUI.Properties.Resources;
-using static System.AppDomain;
 using static System.Drawing.Color;
+using static System.Environment;
 using static System.IO.Directory;
 
 namespace Loginside_FYAN_Bot_GUI.Script;
 
 internal static class Constant
 {
     // path
-    internal static readonly string CONFIG_ADR = $@"{GetParent(CurrentDomain?.BaseDirectory)}\{serv_name}.exe.config";
+    internal static readonly string CONFIG_ADR = $@"{GetParent(CurrentDirectory)}\{serv_name}.exe.config";
 
     // sound
     internal static readonly SoundPlayer SND_BACK = new(sBack);

diff --git a/Loginside FYAN Bot Service/Loginside FYAN Bot Service.csproj b/Loginside FYAN Bot Service/Loginside FYAN Bot Service.csproj
@@ -27,7 +27,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.4.0.0</ApplicationVersion>
+    <ApplicationVersion>2.0.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>

diff --git a/Loginside FYAN Bot Service/Properties/AssemblyInfo.cs b/Loginside FYAN Bot Service/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("2.2.2.2")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 [assembly: NeutralResourcesLanguage("vi")]
diff --git a/Loginside FYAN Bot Service/Script/Constant.cs b/Loginside FYAN Bot Service/Script/Constant.cs
@@ -1,5 +1,6 @@
 using System;
-using static System.AppDomain;
+using static System.Environment;
+using static System.Environment.SpecialFolder;
 using static System.TimeSpan;
 
 namespace Loginside_FYAN_Bot_Service.Script;
@@ -8,10 +9,9 @@ internal static class Constant
 {
     // path
     internal const string BOT_NAME = "Fyan Bot";
-    internal const string BRV_ADR = @"C:\Program Files\BraveSoftware\Brave-Browser\Application\brave.exe";
-    internal static readonly string BASE_PATH = CurrentDomain.BaseDirectory;
-    internal static readonly string LOG_PATH = $@"{BASE_PATH}\log";
-    internal static readonly string CR_DRV_ADR = $@"{BASE_PATH}\chromedriver.exe";
+    internal static readonly string BRV_ADR = $@"{GetFolderPath(ProgramFiles)}\BraveSoftware\Brave-Browser\Application\brave.exe";
+    internal static readonly string LOG_PATH = $@"{CurrentDirectory}\log";
+    internal static readonly string CR_DRV_ADR = $@"{CurrentDirectory}\chromedriver.exe";
 
     // other
     internal const int SHDW_BOT_CNT = 5;

diff --git a/Loginside FYAN Bot Service/Script/Model/CbBot.cs b/Loginside FYAN Bot Service/Script/Model/CbBot.cs
@@ -48,7 +48,7 @@ protected internal override void ShdwBotChk()
                 {
                     BinaryLocation = BRV_ADR
                 };
-                using IWebDriver drv = new ChromeDriver(BASE_PATH, opts);
+                using IWebDriver drv = new ChromeDriver(CurrentDirectory, opts);
                 ShdwChkIO(Name, drv, acctIns);
             }
             catch (Exception ex)
@@ -87,7 +87,7 @@ protected internal override bool ShdwBotPwd()
                 {
                     BinaryLocation = BRV_ADR
                 };
-                using IWebDriver drv = new ChromeDriver(BASE_PATH, opts);
+                using IWebDriver drv = new ChromeDriver(CurrentDirectory, opts);
                 ShdwChgPwd(Name, drv, acctIns);
                 return true;
             }