From 2f6f2d57f37b1992d1b0d26a21c2257ce9e2b2c9 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 04 十月 2024 18:55:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/InvokeHelper.cs | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 92f048c..ae7824f 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -10,24 +10,23 @@
{
public static class InvokeHelper
{
- //private static string CloudUrl = "http://localhost/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- //private static string CloudUrl = "http://60.190.4.42:9002/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- private static string CloudUrl = "http://47.96.97.237/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- //private static string CloudUrl = "http://60.190.4.42:9002/K3CLOUD/";//澶忓疂
- //private static string CloudUrl = "http://124.70.129.242/k3cloud/";//闆呯惇璇�
-
+ private static string CloudUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
/// <summary>
/// 鐧婚檰
/// </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");
- var CloudUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl");
- //var url = GetKey(AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "/kdapi.config", "KDApiUrl");
- //var loginResult = ValidateLogin(dbId, useName, pwd, 2052);
- //var resultType = JObject.Parse(loginResult)["LoginResultType"].Value<int>();
+ //浠嶤鐩橀厤缃枃浠惰幏鍙� 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");
@@ -46,9 +45,9 @@
HttpClient httpClient = new HttpClient();
httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
List<object> Parameters = new List<object>();
- Parameters.Add("5f9258a311401c");//璐﹀鏍囩ず
+ Parameters.Add("622703e117d642");//璐﹀鏍囩ず
Parameters.Add("Administrator");//鐢ㄦ埛鍚�
- Parameters.Add("qaz!@#123");//瀵嗙爜
+ Parameters.Add("sa@123456");//瀵嗙爜
Parameters.Add(2052);//2052浠ｈ〃涓枃
httpClient.Content = JsonConvert.SerializeObject(Parameters);
@@ -224,6 +223,9 @@
return httpClient.SyncRequest();
}
+ /// <summary>
+ /// 鍗曟嵁鏌ヨ
+ /// </summary>
public static string Query(string formId, string content)
{
HttpClient httpClient = new HttpClient();
--
Gitblit v1.9.1