From 6fc4736a560468d40331431b6d3e8e9ccb017e9b Mon Sep 17 00:00:00 2001 From: tdx Date: Sat, 23 May 2026 11:26:23 +0000 Subject: [PATCH] SVN r1183 SVN-Revision: r1183 --- 插件库/Lskj.Core/DBConfig.cs | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/插件库/Lskj.Core/DBConfig.cs b/插件库/Lskj.Core/DBConfig.cs index 0b8ca64..502bb7e 100644 --- a/插件库/Lskj.Core/DBConfig.cs +++ b/插件库/Lskj.Core/DBConfig.cs @@ -130,6 +130,10 @@ namespace Lskj.Core /// public bool IsInternalNetwork; /// + ///选中数据库类型 + /// + public string ServerType = "SqlServer"; + /// ///内网地址 /// public string InternalNetworkAddress; @@ -145,6 +149,7 @@ namespace Lskj.Core public string Connection; public string dephiConnection; public string Connection1 = "QkYyNjE3QTcxQjc4RDFFMDlERjlFMDc1QkIyMDVGRjdDRUIyMEVEOUM5NjBCQjc5NTA5NzdEQTk0MkNEQTE1RTFGMEIwMThFNUJDQTE0RjE1NjQwM0U5QTYxMThCMDY2MTA4NkE2OTIxNTNBQjQ0MjRDMDIwM0Q5OEVDQjkwQTVCN0RENjJBODkxNUNGOUM5OEI5RTEzN0E3ODBERjg2OURCNEQ5QTlCMzhCQUZGQ0FBNUREMjY4M0FCODg2RTkxMDRERTQ3MjRGQTE1MERDOTJGRDFDRjY2REQ1ODYyREUzN0RGM0ZBQzc4NzJENjIwNDg4RUUyNkI3ODE1RjlDM0I0MjNCQzcyOENDN0VDMTg0QUU0MjgwMDVDMENBOUZF"; + public string Connection1DM = "Nzg5REZBQ0IzMjYzQkQzRTZFRTExNjY5MThCNjUwQTUxNDFBRUY4QzREQkJCMEU4NjQyNUI3QzYzMzA0ODMwRjAzODdEODlCMjRFM0JBQTg0RjAxMDQ1QTc3MEM5MTM1RTlBQkUzNUQyRTgwNzlGMTYwQzU5MjI4QkMyNUQ1MEU="; public string Connection2 = "Njk5NTI5NDE5RUI2ODM4MEQ5MEJFQkU3NzM3REQxQThDREM4NzRFNUY3QzYzMkVEOEEzODRBMzJBRjIwRUY4Njg4Qjg3M0Q1MTY3MjAxRkY2OTNGMzk3MUZBRjMxMzdDQ0U4RjMxQUVERjdBQzI5MEExNjQ3ODlDNkEwODVBMUJDMUJGN0U2RUJENkMwQzhERTFCNzgyMjg1MjBFQkE2MkU4NjMyQjBEMDY0QjQ0MzVDQ0QxMjMzQTA3NjI3QjQyOTczQUJBMUI0OUNGMkE5REYzOTI2NDFBRTY3QzFGQTJCRDFDNUIzQ0FCMzA4QzEwMjc2MTI5QjU2MzgxMjBDN0MwNUFGNUU3QTdBRTI2REQzREEyM0FFM0I2MUVGMzYw"; public string Connection3 = "NjQ0OTQzRTY1MkUwQUUxQTdCQTlBRjkwRjI4QkU1MTRDNTc5RDI0RTg5Q0Q5RjU2QjQ3RjY4REY2NEY1QjM5QUNCREIzMTBDRUMxREQ5NzlBREUxMjQ5NzdCM0Y0RUM1Qjc2MEI3MzFFNTcxQ0Q5MzA5RTI5RUFGNDQxOTMyRkQ1RTdDNjcyRTFCQjUyM0Y4RkE2NEE2N0QyNzEyQzVCRTcyOUJBRTYxMjMzRjYwMjg5NzIyRjJGOTdDMzE0NTQ0MjIwQzFBNEI4MDI0OUNFNTJDMzlEOEMwNjY1MjA3M0YyQkQ0NDRDOTg5REMxMUVCMDM1MUU0OTEzQzQwRDBDQ0E3Rjk4QjgyNzRFRjYzQzBEMDcxQzVFMjdCMTIxNkE2MzI0MEIyNDkwOERGNUFDMjRGMEYxRkFFNzJEQTIwM0EyRjU0N0U4OEFENDBEMjEzNUY1OTI5NUUxRDM1N0I0Rg=="; public string Connection4 = "NjU3MDQ0Q0JDREI0Mjc2OUY4RTBCOEIxMjBDOEM4MEQ2QUMwMjNEOUVDOTQ4NEMwRDE2RDdEMTQwNEQwODg3MURBMzRENkIxNEFENEYwQTcyMkEwMTE0NDhDM0NGNUZBQ0U4RjMxQUVERjdBQzI5MEExNjQ3ODlDNkEwODVBMUI3NDlCRkU1RDBGQUI0RUJFODlFNkE5MzlFNkIzODAyODEyRjFGQzE4NjVCMEM2OThDRDgzRUY4M0ZGNEExRkEyRUFGQzE4NTg1QkZBMEMwRTI5NzAzQzkzMzY2RUU0Mzc5RkI4NkVDRTM3NDNBMTk0ODJBQTNDNUY2RDlGMzU3MUEyOUEzOEI5RjA3NzA2NjM1NUNFM0U5RjNCNzMzM0RBMUY2MDkxQUZDQ0YxN0Q5MDgwOEY0NzZEMUM3MjQyMkRBOUY2N0NFRUE3MTkwNzk0OTA2NUYyRDJBMEM4RUU4OQ=="; @@ -182,6 +187,7 @@ namespace Lskj.Core ExternalNetworkAddress = subKey.GetValue("ExternalNetworkAddress", "") + ""; IsInternalNetwork = (subKey.GetValue("IsInternalNetwork", "") + "").Equals("1"); + ServerType = subKey.GetValue("ServerType", "") + ""; LoginName = subKey.GetValue("LoginName", "") + ""; UpdateSet = subKey.GetValue("UpdateSet", "0") + "" == "1" || subKey.GetValue("UpdateSet", "0") + "" == "True" ? true : false; SmallClient = subKey.GetValue("SmallClient", "0") + "" == "1" || subKey.GetValue("SmallClient", "0") + "" == "True" ? true : false; @@ -300,6 +306,7 @@ namespace Lskj.Core subKey.SetValue("InternalNetworkAddress", InternalNetworkAddress); subKey.SetValue("ExternalNetworkAddress", ExternalNetworkAddress); subKey.SetValue("IsInternalNetwork", IsInternalNetwork ? "1" : "0"); + subKey.SetValue("ServerType", ServerType); subKey.SetValue("LoginName", LoginName); subKey.SetValue("UpdateSet", UpdateSet); subKey.SetValue("SmallClient", SmallClient); @@ -338,7 +345,7 @@ namespace Lskj.Core { return string.Format(AESUtil.Decrypt(Connection), ServerName, DataBase); } - return IsConsumer ? string.Format(AESUtil.Decrypt(Connection1), ServerName, DataBase) : string.Format(AESUtil.Decrypt(Connection5), ServerName, DataBase); + return IsConsumer ? (DBConfig.Instance.ServerType + "").Equals("达梦数据库") ? string.Format(AESUtil.Decrypt(Connection1DM), ServerName, DataBase, Environment.MachineName) : string.Format(AESUtil.Decrypt(Connection1), ServerName, DataBase) : string.Format(AESUtil.Decrypt(Connection5), ServerName, DataBase); } /// /// 说明：获取delphi连接字符串 @@ -390,12 +397,19 @@ namespace Lskj.Core try { string connStr = GetConnection(Connection); - //connectionType = ConnectionType.KdbnServer; - //connStr = "host=192.168.0.55;port=54321;database=test3;username=lserpAdmin;password=lserp110;"; - //connectionType = ConnectionType.DmServer; - //connStr = "Server=192.168.0.55:5236; schema=DBO; UserId=LSERPADMIN; PWD=Lserp110"; string providerName = "System.Data.SqlClient"; SqlHelper.ConnectionType = ConnectionType.SqlServer; + //connectionType = ConnectionType.KdbnServer; + //connStr = "host=192.168.0.55;port=54321;database=test3;username=lserpAdmin;password=lserp110;"; + + //connectionType = ConnectionType.DmServer; + //string hostname = Environment.MachineName; + //connStr = $"Server=110.185.161.104:5236; schema=LSERP_JTCS; UserId=LSERPADMIN; PWD=Lserp110 ;host={hostname}"; + if (DBConfig.Instance.ServerType.Equals("达梦数据库")) + { + connectionType = ConnectionType.DmServer; + //connStr = $"Server=110.185.161.104:5236; schema=LSERP_JTCS; UserId=LSERPADMIN; PWD=Lserp110 ;host={hostname}"; + } if (connectionType == ConnectionType.KdbnServer) { providerName = "Kdbndp";