From 2d0c8d06924703c957db688785891cc4b99abf0f Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 04 八月 2025 15:34:48 +0800
Subject: [PATCH] 配置文件新增配置，控制携客云切正式\测试环境切换
---
StandardPda/MESApplication/appsettings.json | 7 ++-
StandardPda/MES.Service/service/QC/LljService.cs | 109 +++++++++++++++++++++++++++++-------------------------
2 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 5b2ad6e..8783b71 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -4,6 +4,7 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
+using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using SqlSugar;
using System.Data;
@@ -18,6 +19,10 @@
public class LljService
{
private static readonly HttpClient client = new();
+ private static IConfiguration configuration = new ConfigurationBuilder()
+ .SetBasePath(Directory.GetCurrentDirectory())
+ .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+ .Build();
public (List<LtsLlj> item, int TotalCount) GetPage(XJPageResult queryObj)
{
@@ -1843,14 +1848,14 @@
{
var apiParam = new ApiCommonParam
{
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.APP_KEY,
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
@@ -1873,14 +1878,14 @@
{
var apiParam = new ApiCommonParam
{
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
@@ -1908,29 +1913,31 @@
public static XkyinnerVendorParam GetInit()
{
+
var apiParam = new ApiCommonParam
{
- //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- //appKey = DataAcquisitionConfiguration.APP_KEY,
- //// 鎺ュ彛鐗堟湰
- //version = "1.0",
- //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- //operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
- //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- //ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
- //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
- //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"]=="1")?DataAcquisitionConfiguration.APP_KEY: DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1")?DataAcquisitionConfiguration.COMPANY_CODE:DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1")?DataAcquisitionConfiguration.COMPANY_CODE: DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+
+ // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ //appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鎺ュ彛鐗堟湰
+ //version = "1.0",
+ //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ //operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ //ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
@@ -1958,28 +1965,28 @@
public static XkyFlushedrVendorParam GetInit()
{
var apiParam = new ApiCommonParam
- {
+ {
//// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- //appKey = DataAcquisitionConfiguration.APP_KEY,
- //// 鎺ュ彛鐗堟湰
- //version = "1.0",
- //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- //operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
- //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- //ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
- //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
- //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
-
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+
+ // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ //appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鎺ュ彛鐗堟湰
+ //version = "1.0",
+ //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ //operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ //ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
@@ -2009,26 +2016,26 @@
var apiParam = new ApiCommonParam
{
//// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- //appKey = DataAcquisitionConfiguration.APP_KEY,
- //// 鎺ュ彛鐗堟湰
- //version = "1.0",
- //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- //operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
- //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- //ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
- //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
- //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
-
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+
+ // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ //appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鎺ュ彛鐗堟湰
+ //version = "1.0",
+ //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ //operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ //ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
diff --git a/StandardPda/MESApplication/appsettings.json b/StandardPda/MESApplication/appsettings.json
index b391b5e..7af20e8 100644
--- a/StandardPda/MESApplication/appsettings.json
+++ b/StandardPda/MESApplication/appsettings.json
@@ -11,8 +11,11 @@
"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.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest"
- //娴嬭瘯搴擄紙鍙戝竷鏃惰鍒囨崲姝ｅ紡搴擄紝鎻愪氦浠ｇ爜鍕挎彁浜ゆ鏂囦欢锛�
//"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest"
+ //娴嬭瘯搴擄紙鍙戝竷鏃惰鍒囨崲姝ｅ紡搴擄紝鎻愪氦浠ｇ爜鍕挎彁浜ゆ鏂囦欢锛�
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest",
+ //鎼哄浜戠幆澧冨垏鎹細0娴嬭瘯锛�1姝ｅ紡
+ "XKYamgylchedd": "0"
+
}
}
--
Gitblit v1.9.3