diff --git a/Cyberpipe.suo b/Cyberpipe.suo index de30431..3b0d671 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index de30431..3b0d671 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index ca2020d..e05a967 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -82,7 +82,7 @@ return false; } HttpWebRequest request = - WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + WebRequest.Create(roleserver.Trim()+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId="+Utility.AppId.Trim()) as HttpWebRequest; if (request == null) return false; using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index de30431..3b0d671 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index ca2020d..e05a967 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -82,7 +82,7 @@ return false; } HttpWebRequest request = - WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + WebRequest.Create(roleserver.Trim()+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId="+Utility.AppId.Trim()) as HttpWebRequest; if (request == null) return false; using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) { diff --git a/Utility.cs b/Utility.cs index 18cbf3a..a15f296 100644 --- a/Utility.cs +++ b/Utility.cs @@ -6,7 +6,6 @@ using System.Security.Cryptography; using System.Text; using System.Windows.Forms; -using System.Windows.Forms.DataVisualization.Charting; using System.Xml; using GeoScene.Data; using GeoScene.Engine; @@ -95,6 +94,7 @@ public static string SysnameVersion; public static string Copyright; public static string LegendImgPath; + public static string AppId; public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { @@ -617,6 +617,10 @@ { LegendImgPath = xmlReader.ReadElementString(); } + else if (xmlReader.Name.Equals("appId")) + { + AppId = xmlReader.ReadElementString(); + } } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index de30431..3b0d671 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index ca2020d..e05a967 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -82,7 +82,7 @@ return false; } HttpWebRequest request = - WebRequest.Create(roleserver+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId=21") as HttpWebRequest; + WebRequest.Create(roleserver.Trim()+"/rs/authority/user?username=" + user + "&password=" + pwd + "&appId="+Utility.AppId.Trim()) as HttpWebRequest; if (request == null) return false; using (HttpWebResponse response = request.GetResponse() as HttpWebResponse) { diff --git a/Utility.cs b/Utility.cs index 18cbf3a..a15f296 100644 --- a/Utility.cs +++ b/Utility.cs @@ -6,7 +6,6 @@ using System.Security.Cryptography; using System.Text; using System.Windows.Forms; -using System.Windows.Forms.DataVisualization.Charting; using System.Xml; using GeoScene.Data; using GeoScene.Engine; @@ -95,6 +94,7 @@ public static string SysnameVersion; public static string Copyright; public static string LegendImgPath; + public static string AppId; public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { @@ -617,6 +617,10 @@ { LegendImgPath = xmlReader.ReadElementString(); } + else if (xmlReader.Name.Equals("appId")) + { + AppId = xmlReader.ReadElementString(); + } } } diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 05316f2..bd2dc1d 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -25,7 +25,8 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml - http://192.168.0.102:8080/ctrl + http://192.168.0.102:8080/ctrl + 21 /Resource/title.jpg /Resource/图例P.jpg 智慧太湖新城管网规划分析系统6.0