diff --git a/App.config b/App.config index 9f87935..9752663 100644 --- a/App.config +++ b/App.config @@ -21,4 +21,4 @@ - + diff --git a/Database/MarketData.eap b/Database/MarketData.eap index 49b6612..6f7c50f 100644 Binary files a/Database/MarketData.eap and b/Database/MarketData.eap differ diff --git a/MarketData.csproj b/MarketData.csproj index 1e65f1c..f67cf9b 100644 --- a/MarketData.csproj +++ b/MarketData.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties MarketData mk - v4.6.2 + v4.7.2 512 diff --git a/MarketDataLib/MarketDataLib.csproj b/MarketDataLib/MarketDataLib.csproj index 9ea8269..a7e7848 100644 --- a/MarketDataLib/MarketDataLib.csproj +++ b/MarketDataLib/MarketDataLib.csproj @@ -10,7 +10,7 @@ Properties MarketDataLib MarketDataLib - v4.6.2 + v4.7.2 512 @@ -266,6 +266,7 @@ + diff --git a/MarketDataUnitTests/App.config b/MarketDataUnitTests/App.config index 8d7663f..e0bdf97 100644 --- a/MarketDataUnitTests/App.config +++ b/MarketDataUnitTests/App.config @@ -21,4 +21,4 @@ - + diff --git a/MarketDataUnitTests/MarketDataUnitTests.csproj b/MarketDataUnitTests/MarketDataUnitTests.csproj index e60c383..b3bae54 100644 --- a/MarketDataUnitTests/MarketDataUnitTests.csproj +++ b/MarketDataUnitTests/MarketDataUnitTests.csproj @@ -10,7 +10,7 @@ Properties MarketDataUnitTests MarketDataUnitTests - v4.6.2 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 @@ -20,6 +20,7 @@ UnitTest + true diff --git a/Program.cs b/Program.cs index 7453316..10789bb 100644 --- a/Program.cs +++ b/Program.cs @@ -22,52 +22,12 @@ using MarketData.Cache; using MarketData.Generator.CMTrend; using Axiom.Interpreter; using System.Data; -using MarketData.CNNProcessing; -using MySql.Data.MySqlClient; using MarketData.Generator.MovingAverage; using MarketData.Generator.MGSHMomentum; -using System.Security.Cryptography; +using MarketData.Security; namespace MarketData { - //public static class Security - //{ - // public static string HashPassword(string password) - // { - // using (SHA256 sha256 = SHA256.Create()) - // { - // byte[] bytes = Encoding.UTF8.GetBytes(password); - // byte[] hashBytes = sha256.ComputeHash(bytes); - // return Convert.ToBase64String(hashBytes); - // } - // } - - // public static (string Salt, string Hash) HashPasswordWithSalt(string password) - // { - // using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider()) - // { - // byte[] salt = new byte[16]; - // rng.GetBytes(salt); - // using (SHA256 sha256 = SHA256.Create()) - // { - // byte[] passwordBytes = Encoding.UTF8.GetBytes(password); - // byte[] saltedPassword = new byte[passwordBytes.Length + salt.Length]; - // Buffer.BlockCopy(passwordBytes, 0, saltedPassword, 0, passwordBytes.Length); - // Buffer.BlockCopy(salt, 0, saltedPassword, passwordBytes.Length, salt.Length); - // byte[] hashBytes = sha256.ComputeHash(saltedPassword); - // return (Convert.ToBase64String(salt), Convert.ToBase64String(hashBytes)); - // } - // } - // } - - - - - - //} - - - class Program { public static void DisplayUsage() @@ -1012,6 +972,10 @@ namespace MarketData //} } + //Security + //public static bool VerifyPassword(string inputPassword, string storedSalt, string storedHash) + //public static (string Salt, string Hash) HashPasswordWithSalt(string password) + //public static string HashPassword(string password) @@ -1025,6 +989,13 @@ namespace MarketData Trace.Listeners.Add(new TextWriterTraceListener(strLogFile)); DateTime currentDate=DateTime.Now; + //String salt= default; + //String hash = default; + +// (String salt, String hash)= Encryption.HashPasswordWithSalt("MN5191306"); +// bool result = Encryption.VerifyPassword("MN5191306", salt, hash); + + DateTime maxHolidayDate =HolidayDA.GetMaxHolidayDate(); if(currentDate>maxHolidayDate) {