From da711ce7cbb414ea8df8f1320b543f1c587e2de3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 16 四月 2025 08:45:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/InvokeHelper.cs | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 59d764c..dcf04ee 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -1,31 +1,73 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
+using WebAPI.Utility;
namespace WebAPI
{
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 = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
/// <summary>
/// 鐧婚檰
/// </summary>
public static string Login()
{
+ //浠嶤鐩橀厤缃枃浠惰幏鍙� 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");
List<object> Parameters = new List<object>();
- Parameters.Add("61b14ea86f5c8a");//璐﹀鏍囩ず
- Parameters.Add("Administrator");//鐢ㄦ埛鍚�
- Parameters.Add("888888");//瀵嗙爜
+ Parameters.Add(dbId);//璐﹀鏍囩ず
+ Parameters.Add(useName);//鐢ㄦ埛鍚�
+ Parameters.Add(pwd);//瀵嗙爜
+ Parameters.Add(2052);//2052浠ｈ〃涓枃
+ httpClient.Content = JsonConvert.SerializeObject(Parameters);
+
+ return httpClient.SyncRequest();
+ }
+
+ public static string LoginUser(string user)
+ {
+ //浠嶤鐩橀厤缃枃浠惰幏鍙� 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;
+
+ //鑾峰彇鐢ㄦ埛缁戝畾閲戣澏璐﹀彿
+ DataSet ds;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("exec h_p_API_GetCloudUserByLoginUser '" + user.ToString() + "'", "h_p_API_GetCloudUserByLoginUser");
+
+ if (ds != null && ds.Tables[0].Rows.Count != 0)
+ {
+ useName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCloudUserName"]);
+ pwd = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCloudUserPsd"]);
+ }
+
+ 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(dbId);//璐﹀鏍囩ず
+ Parameters.Add(useName);//鐢ㄦ埛鍚�
+ Parameters.Add(pwd);//瀵嗙爜
Parameters.Add(2052);//2052浠ｈ〃涓枃
httpClient.Content = JsonConvert.SerializeObject(Parameters);
@@ -37,9 +79,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);
@@ -215,6 +257,9 @@
return httpClient.SyncRequest();
}
+ /// <summary>
+ /// 鍗曟嵁鏌ヨ
+ /// </summary>
public static string Query(string formId, string content)
{
HttpClient httpClient = new HttpClient();
@@ -246,6 +291,7 @@
//鐢熶骇璁㈠崟 鎵ц
public static string ExcuteOperation(string formId, string opNumber, string content)
{
+ LogService.Write("鐢熶骇璁㈠崟 鎵ц锛宱pNumber锛� " + opNumber + ",content:" + content);
HttpClient httpClient = new HttpClient();
httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExcuteOperation.common.kdsvc");
--
Gitblit v1.9.1