Merge branch 'master' of http://git.dongkesoft.com:9001/hg5020/dk.hg5020.wcf

DK.Service/SAPDataService/SAPDataLogic.cs

@@ -1788,13 +1788,13 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 					// 登录
 					UserNamePasswordClientCredential credential =
 						sapClient.ClientCredentials.UserName;
-                    credential.UserName = "hgsapdk";
-                    credential.Password = "Sapdk#240";
-					//INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
-					//credential.UserName = ini.ReadIniData("SAP_HEGII", "UserName");
-					//credential.Password = ini.ReadIniData("SAP_HEGII", "Password");
-					// 参数
-					sapParameter.ZSUMSpecified = true;
+                    //credential.UserName = "hgsapdk";
+                    //credential.Password = "Sapdk#240";
+                    INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
+                    credential.UserName = ini.ReadIniData("SAP_HEGII", "UserName");
+                    credential.Password = ini.ReadIniData("SAP_HEGII", "Password");
+                    // 参数
+                    sapParameter.ZSUMSpecified = true;
 					sapParameter.TABLE_OUT = new ZSPP100[0];
 					// 接口
 					sapResult = sapClient.ZPPFM008(sapParameter);
@@ -1841,13 +1841,13 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 					// 登录
 					UserNamePasswordClientCredential credential =
 						sapClient.ClientCredentials.UserName;
-                    credential.UserName = "hgsapdk";
-                    credential.Password = "Sapdk#240";
-                    //INIUtility ini = INIUtility.Instance(INIUtility.IniFile.Config);
-					//credential.UserName = ini.ReadIniData("SAP_HEGII", "UserName");
-					//credential.Password = ini.ReadIniData("SAP_HEGII", "Password");
-					// 参数
-					sapParameter.ZSUMSpecified = true;
+                    //credential.UserName = "hgsapdk";
+                    //credential.Password = "Sapdk#240";
+                    INIUtility ini = INIUtility.Instance(INIUtility.IniFile.Config);
+                    credential.UserName = ini.ReadIniData("SAP_HEGII", "UserName");
+                    credential.Password = ini.ReadIniData("SAP_HEGII", "Password");
+                    // 参数
+                    sapParameter.ZSUMSpecified = true;
 					sapParameter.TABLE_OUT = new ZSPP110[0];
 					// 接口
 					sapResult = sapClient.ZPPFM010(sapParameter);

IBOSS.PRD/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.20.0805")]
-[assembly: AssemblyFileVersion("1.2.20.0805")]
+[assembly: AssemblyVersion("1.2.20.0903")]
+[assembly: AssemblyFileVersion("1.2.20.0903")]

WCF.Service/WCF.Hosting/Config.ini

@@ -18,8 +18,8 @@ ServerName=Debug
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.2.20.0423
-ClientVersion=1.2.20.0805
+AndroidVersion=1.2.20.0903
+ClientVersion=1.2.20.0903
 
 [PathSetting]
 ;客户端升级，下载文件路径

WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.20.0805")]
-[assembly: AssemblyFileVersion("1.2.20.0805")]
+[assembly: AssemblyVersion("1.2.20.0903")]
+[assembly: AssemblyFileVersion("1.2.20.0903")]

WCF.Service/WCF.WebHosting/Config.ini

@@ -19,8 +19,8 @@ GOURL=http://172.18.32.35:9000/mes/mesgo.ashx
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.0.20.0423
-ClientVersion=1.2.20.0708
+AndroidVersion=1.0.20.0903
+ClientVersion=1.2.20.0903
 
 [PathSetting]
 ;客户端升级，下载文件路径