From 494c68c9ad1cc3b085c27e87865269c4593c24e8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 25 十一月 2022 09:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/InvokeHelper.cs | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 5f8510d..2cdb5c3 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -4,27 +4,28 @@
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 = 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");
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("61aec029faed1a");//璐﹀鏍囩ず
- Parameters.Add("Administrator");//鐢ㄦ埛鍚�
- Parameters.Add("qaz!@#123");//瀵嗙爜
+ Parameters.Add(dbId);//璐﹀鏍囩ず
+ Parameters.Add(useName);//鐢ㄦ埛鍚�
+ Parameters.Add(pwd);//瀵嗙爜
Parameters.Add(2052);//2052浠ｈ〃涓枃
httpClient.Content = JsonConvert.SerializeObject(Parameters);
@@ -36,9 +37,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);
@@ -185,6 +186,7 @@
return httpClient.SyncRequest();
}
+ //鍙嶅鏍�
public static string UnAudit(string formId, string content)
{
HttpClient httpClient = new HttpClient();
@@ -198,7 +200,7 @@
httpClient.Content = JsonConvert.SerializeObject(Parameters);
return httpClient.SyncRequest();
}
-
+ //涓嬫帹
public static string Push(string formId, string content)
{
HttpClient httpClient = new HttpClient();
@@ -240,5 +242,23 @@
httpClient.Content = JsonConvert.SerializeObject(args);
return httpClient.SyncRequest();
}
+
+ //鐢熶骇璁㈠崟 鎵ц
+ 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");
+
+ List<object> Parameters = new List<object>();
+ //涓氬姟瀵硅薄Id
+ Parameters.Add(formId);
+ //鎿嶄綔 寮�宸�"ToStart"
+ Parameters.Add(opNumber);
+ //Json瀛椾覆
+ Parameters.Add(content);
+ httpClient.Content = JsonConvert.SerializeObject(Parameters);
+ return httpClient.SyncRequest();
+ }
}
}
--
Gitblit v1.9.1