From ace57897fc40d465114820fcf1c3c87f9bf42f42 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 七月 2024 09:24:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/InvokeHelper.cs |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 2cdb5c3..ae7824f 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -16,9 +16,17 @@
         /// </summary>
         public static string Login()
         {
-            var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
-            var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
-            var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
+            //浠嶤鐩橀厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+            Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo);
+            var useName = Pub_Class.ClsPub.sCLOUDUseName;
+            var pwd = Pub_Class.ClsPub.sCLOUDPsd;
+            var dbId = Pub_Class.ClsPub.sCLOUDAcc;
+            CloudUrl = Pub_Class.ClsPub.sCLOUDUrl;
+
+            //鍘熶粠Config/kdapi.config妯″潡涓幏鍙�    20240712灞忚斀
+            //var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
+            //var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
+            //var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
             HttpClient httpClient = new HttpClient();
             httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
 
@@ -215,6 +223,9 @@
             return httpClient.SyncRequest();
         }
 
+        /// <summary>
+        /// 鍗曟嵁鏌ヨ
+        /// </summary>
         public static string Query(string formId, string content)
         {
             HttpClient httpClient = new HttpClient();

--
Gitblit v1.9.1