diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs index 0246ba82..78b46a31 100644 --- a/IRaCIS.Core.API/Program.cs +++ b/IRaCIS.Core.API/Program.cs @@ -23,50 +23,6 @@ namespace IRaCIS.Core.API public readonly string environment; public static async Task Main(string[] args) { - - //if(!File.Exists($@"C:\.xingcang\config.json")) - //{ - // Console.WriteLine("当前未注册"); - // Console.ReadLine(); - // return; - //} - //else - //{ - // var json = File.ReadAllText($@"C:\.xingcang\config.json"); - - // JObject jsonObject = JObject.Parse(json); - - // var key = jsonObject["key"].ToString(); - - // var value= jsonObject["value"].ToString(); - - - // var physicalAddressList = NetworkInterface.GetAllNetworkInterfaces().Select(t=>t.GetPhysicalAddress().ToString()); - - // // 判断文件里面的机器码是否是本机的 - // if (!physicalAddressList.Contains(key)) - // { - // Console.WriteLine("机器码和本机不对应"); - // Console.ReadLine(); - - // return; - // } - - - // var secrete = MD5Helper.Md5($"{key}_XINGCANG"); - - // if (value != secrete) - // { - // Console.WriteLine("机器码和注册码不匹配"); - // Console.ReadLine(); - - // return; - - // } - - //} - - try { //以配置文件为准,否则 从url中取环境值(服务以命令行传递参数启动,配置文件配置了就不需要传递环境参数) @@ -109,6 +65,65 @@ namespace IRaCIS.Core.API //// Serilog SerilogExtension.AddSerilogSetup(enviromentName, host.Services); + #region 认证程序 + + if (!File.Exists($@"C:\ProgramData\.xingcang\config.json")) + { + Console.WriteLine("当前未注册"); + Log.Logger.Error("当前未注册"); + Console.ReadLine(); + return; + } + else + { + var json = File.ReadAllText($@"C:\ProgramData\.xingcang\config.json"); + + JObject jsonObject = JObject.Parse(json); + + var key = jsonObject["key"].ToString(); + + var value = jsonObject["value"].ToString(); + + + var physicalAddressList = NetworkInterface.GetAllNetworkInterfaces().Select(t => t.GetPhysicalAddress().ToString()); + + //// 判断文件里面的机器码是否是本机的 + //if (!physicalAddressList.Contains(key)) + //{ + // Console.WriteLine("机器码和本机不对应"); + // Log.Logger.Error("机器码和本机不对应"); + // Console.ReadLine(); + + // return; + //} + + + var secrete = MD5Helper.Md5($"{key}_XINGCANG"); + + if (value != secrete) + { + Console.WriteLine("机器码和注册码不匹配"); + Log.Logger.Error("机器码和注册码不匹配"); + Console.ReadLine(); + + return; + + } + + } + + #endregion + + #region 数据库连接写入配置文件 + + var appsettingsJson = File.ReadAllText("appsettings.CertificateApply.json"); + + //var + + #endregion + + + //缓存项目的状态 匿名化数据 await InitCache(host); diff --git a/IRaCIS.Core.API/appsettings.CertificateApply.json b/IRaCIS.Core.API/appsettings.CertificateApply.json index 2c04ce92..894274f5 100644 --- a/IRaCIS.Core.API/appsettings.CertificateApply.json +++ b/IRaCIS.Core.API/appsettings.CertificateApply.json @@ -7,8 +7,9 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Certificate;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true", - "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true" + // "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Certificate;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true", + //"RemoteNew": "Server=.;Database=IRaCIS;Trusted_Connection=True;TrustServerCertificate=true" + "RemoteNew": "Server=(local);Database=IRaCIS;Trusted_Connection=True;TrustServerCertificate=true" }, "BasicSystemConfig": { diff --git a/IRaCIS.Core.API/appsettings.Development.json b/IRaCIS.Core.API/appsettings.Development.json index e9f58c77..d283f553 100644 --- a/IRaCIS.Core.API/appsettings.Development.json +++ b/IRaCIS.Core.API/appsettings.Development.json @@ -7,9 +7,7 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true", - "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true" - + "RemoteNew": "Server=.;Database=IRaCIS;Trusted_Connection=True;TrustServerCertificate=true" }, "BasicSystemConfig": {