Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

2024-09-23 1d30ccbec6631bbf9b1fc14ece97843587b2abbf

 WebAPI/InvokeHelper.cs

@@ -10,31 +10,30 @@
{
    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>();
            //从C盘配置文件获取 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("5f56ea565892f4");//账套标示
            Parameters.Add("Administrator");//用户名
            Parameters.Add("ycy123");//密码
            Parameters.Add(dbId);//账套标示
            Parameters.Add(useName);//用户名
            Parameters.Add(pwd);//密码
            Parameters.Add(2052);//2052代表中文
            httpClient.Content = JsonConvert.SerializeObject(Parameters);

@@ -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();