~sjz/TLM.git - Gitblit

啊鑫

2024-08-21 641458e41533d10a5c5e12c2c715ab8d7d0f2b45

更正

已修改10个文件

	MES.Service/DB/OracleSQLHelper.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/bin/Debug/net8.0/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/bin/Debug/net8.0/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.deps.json	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/appsettings.json	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 MES.Service/DB/OracleSQLHelper.cs

@@ -9,18 +9,13 @@
/// </summary>
public class OracleSQLHelper
{
    private readonly string ConnectionString =AppsettingsUtility.Settings.DataBaseConn;

    private readonly string _connectionString;

    public readonly string ConnectionString =
        AppsettingsUtility.Settings.DataBaseConn;

    //public static string connectionString = "Data Source = 192.168.1.19; Persist Security Info=True;User ID = abtdev; Password=abt_dev";
    public string connectionString =
        "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"; // 这里替换成你的实际连接字符串

    public OracleSQLHelper()
    {
        _connectionString = connectionString;
        _connectionString = ConnectionString;
    }

    public OracleSQLHelper(string connectionString)

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.deps.json

@@ -1412,10 +1412,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      }
    }

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/appsettings.json

@@ -8,8 +8,8 @@
  },
  "AllowedHosts": "*",
  "AppSettings": {
    "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
    "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
  }
}

			@@ -9,18 +9,13 @@
			/// </summary>
			public class OracleSQLHelper
			{
			private readonly string ConnectionString =AppsettingsUtility.Settings.DataBaseConn;

			private readonly string _connectionString;

			public readonly string ConnectionString =
			AppsettingsUtility.Settings.DataBaseConn;

			//public static string connectionString = "Data Source = 192.168.1.19; Persist Security Info=True;User ID = abtdev; Password=abt_dev";
			public string connectionString =
			"Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"; // 这里替换成你的实际连接字符串

			public OracleSQLHelper()
			{
			_connectionString = connectionString;
			_connectionString = ConnectionString;
			}

			public OracleSQLHelper(string connectionString)

			@@ -1412,10 +1412,7 @@
			"SqlSugarCore": "5.1.4.158"
			},
			"runtime": {
			"MES.Service.dll": {
			"assemblyVersion": "1.0.0",
			"fileVersion": "1.0.0.0"
			}
			"MES.Service.dll": {}
			}
			}
			}

			@@ -8,8 +8,8 @@
			},
			"AllowedHosts": "*",
			"AppSettings": {
			"TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
			"ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
			"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
			"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
			"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
			"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
			}
			}