no message

src/HYH.Registry.Application/Services/Encryption/ComputerInfoHelper.cs

@@ -157,5 +157,14 @@ namespace HYH.Registry.Services.Encryption
             return MACIp;
         }
 
+        public static string GetHostName()
+        {
+            IPGlobalProperties computerProperties = IPGlobalProperties.GetIPGlobalProperties();
+            //获取本机电脑名
+            var HostName = computerProperties.HostName;
+            ////获取域名
+            //var DomainName = computerProperties.DomainName;
+            return "电脑名：" + HostName;
+        }
     }
 }

src/HYH.Registry.Application/Services/Encryption/EncryptionDto.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HYH.Registry.Services.Encryption
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EncryptionDto
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CipherText { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompanyName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ExpirationDate { get; set; }
+    }
+}

src/HYH.Registry.Application/Services/Encryption/EncryptionService.cs

@@ -11,6 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace HYH.Registry.Services.Encryption
 {
@@ -103,9 +104,11 @@ namespace HYH.Registry.Services.Encryption
         [HttpGet]
         public string GetGeneratedCode()
         {
-            string netCardMACAddress = ComputerInfoHelper.GetNetCardMACAddress();
-            string hardDiskSerialNumber = ComputerInfoHelper.GetHardDiskSerialNumber();
-            string data = netCardMACAddress + hardDiskSerialNumber;
+            //string netCardMACAddress = ComputerInfoHelper.GetNetCardMACAddress();
+            //string hardDiskSerialNumber = ComputerInfoHelper.GetHardDiskSerialNumber();
+            string netCardMACAddress = ComputerInfoHelper.GetMACIp();
+            string hostName = ComputerInfoHelper.GetHostName();
+            string data = netCardMACAddress + hostName;
             var dataLen = data.Length;
             var result = AESHelper.AESEncrypt(data, "jianzhukeji", "jzkj");
             var length = result.Length;
@@ -117,19 +120,45 @@ namespace HYH.Registry.Services.Encryption
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public string GetGeneratingCiphertext(string input)
+        public string GetGeneratingCiphertext(EncryptionDto input)
         {
-            string data = AESHelper.AESDecrypt(input, "jianzhukeji", "jzkj");
-            string code = _currentUser.TenantCode;
-            var tenant = _repTenant.FirstOrDefault(q => q.Code == code);
-            string timestamp = (tenant.EndTime - tenant.StartTime).ToString();
-            string companyName = tenant.Name;
-            data += timestamp + companyName;
+            string data = AESHelper.AESDecrypt(input.CipherText, "jianzhukeji", "jzkj");
+            //var tenant = _repTenant.FirstOrDefault(q => q.Code == _currentUser.TenantCode);
+            string timeStr = Convert.ToDateTime(input.ExpirationDate).ToString("yyyy-MM-dd HH:mm:ss");
+            string companyName = input.CompanyName;
+            //string time = input.ExpirationDate;
+            //string companyName = input.CompanyName;
+            data = timeStr + data + companyName;
             data = data.PadRight(72);
             var datalen = data.Length;
             var result = AESHelper.AESEncrypt(data, "jianzhukeji", "jzkj");
             var length = result.Length;
             return result;
+
+        }
+        /// <summary>
+        /// 登录的密文验证
+        /// </summary>
+        /// <returns></returns>
+
+        public async Task<IActionResult> LoginCipherCertification()
+        {
+            bool flag = false;
+            string netCardMACAddress = ComputerInfoHelper.GetMACIp();
+            string hostName = ComputerInfoHelper.GetHostName();
+            var tenant = await _repTenant.FirstOrDefaultAsync(q => q.Code == _currentUser.TenantCode);
+            if (!string.IsNullOrEmpty(tenant.Registry_cipher))
+            {
+                // 解密
+                var dataString = AESHelper.AESDecrypt(tenant.Registry_cipher, "jianzhukeji", "jzkj");
+                string timeStr = dataString.Substring(0, 19);
+                DateTime dateTime = Convert.ToDateTime(timeStr);
+                if (dateTime > DateTime.Now)
+                {
+                    flag = true;
+                }
+            }
+            return new JsonResult(flag);
         }
     }
 }

src/HYH.Registry.Web.Host/HYH.Registry.Application.xml

@@ -55,6 +55,26 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:HYH.Registry.Services.Encryption.EncryptionDto">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:HYH.Registry.Services.Encryption.EncryptionDto.CipherText">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:HYH.Registry.Services.Encryption.EncryptionDto.CompanyName">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:HYH.Registry.Services.Encryption.EncryptionDto.ExpirationDate">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:HYH.Registry.Services.Encryption.EncryptionService">
             <summary>
             
@@ -107,11 +127,17 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:HYH.Registry.Services.Encryption.EncryptionService.GetGeneratingCiphertext(System.String)">
+        <member name="M:HYH.Registry.Services.Encryption.EncryptionService.GetGeneratingCiphertext(HYH.Registry.Services.Encryption.EncryptionDto)">
             <summary>
             生成密文
             </summary>
             <returns></returns>
         </member>
+        <member name="M:HYH.Registry.Services.Encryption.EncryptionService.LoginCipherCertification">
+            <summary>
+            登录的密文验证
+            </summary>
+            <returns></returns>
+        </member>
     </members>
 </doc>