From c22f20a51782d9928e25f16633ea40aa370a7bda Mon Sep 17 00:00:00 2001 From: renyh1013 Date: Sun, 5 Jun 2016 15:05:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dp2Command.Server/ImgManager.cs | 134 -------------------- dp2Command.Server/dp2CmdService2.cs | 10 +- dp2Command.Server/dp2Command.Service.csproj | 2 - 3 files changed, 3 insertions(+), 143 deletions(-) delete mode 100644 dp2Command.Server/ImgManager.cs diff --git a/dp2Command.Server/ImgManager.cs b/dp2Command.Server/ImgManager.cs deleted file mode 100644 index b019381f..00000000 --- a/dp2Command.Server/ImgManager.cs +++ /dev/null @@ -1,134 +0,0 @@ -using DigitalPlatform.Xml; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using System.Xml; - -namespace dp2Command.Service -{ - public class ImgManager - { - XmlDocument imgDom = null; - string imgFileName = ""; - - Dictionary imgDict = new Dictionary(); - - /// - /// 把文件解析到内存中 - /// - /// - public ImgManager(string strImgFile) - { - imgFileName = strImgFile; - imgDom = new XmlDocument(); - - /* - if (File.Exists(strImgFile) == true) - { - File.Delete(strImgFile); - // 创建一个根元素 - XmlNode root = imgDom.CreateElement("root"); - imgDom.AppendChild(root); - } - */ - - - - if (File.Exists(strImgFile) == true) - { - imgDom.Load(strImgFile); - XmlNodeList nodeList = imgDom.DocumentElement.SelectNodes("img"); - - bool bChange = false; - foreach (XmlNode node in nodeList) - { - string no = DomUtil.GetAttr(node, "no"); - string url = DomUtil.GetAttr(node, "url"); - - if (String.IsNullOrEmpty(no) == false && String.IsNullOrEmpty(url) == false) - { - imgDict[no] = url; - } - else - { - imgDom.DocumentElement.RemoveChild(node); - bChange = true; - } - } - - if (bChange == true) - { - imgDom.Save(this.imgFileName); - } - } - - else - { - // 创建一个根元素 - XmlNode root = imgDom.CreateElement("root"); - imgDom.AppendChild(root); - } - - } - - /// - /// 获取当前的背景图url - /// - /// - public string GetTodayImgUrl() - { - string todayNo = DateTime.Now.Day.ToString(); - return GetImgUrl(todayNo); - } - - /// - /// 获取指定天的背景图url - /// - /// - public string GetImgUrl(string strNo) - { - - - // 先从本地记录找，有则直接返回 - if (imgDict.Keys.Contains(strNo) == true) - { - return imgDict[strNo]; - } - - //通过网络取url - //我们可以通过访问：http://cn.bing.com/HPImageArchive.aspx?format=xml&idx=0&n=1获得一个XML文件，里面包含了图片的地址。 - //上面访问参数的含义分别是： - //1、format，非必要。返回结果的格式，不存在或者等于xml时，输出为xml格式，等于js时，输出json格式。 - //2、idx，非必要。不存在或者等于0时，输出当天的图片，-1为已经预备用于明天显示的信息，1则为昨天的图片，idx最多获取到前16天的图片信息。 - //3、n，必要参数。这是输出信息的数量。比如n=1，即为1条，以此类推，至多输出8条。 - //在返回的XML文件中我们通过访问images->image->url获得图片地址，然后通过http://s.cn.bing.net/获得的图片地址进行访问 - string url = "http://cn.bing.com/HPImageArchive.aspx?format=xml&idx=0&n=1"; - WebClient client = new WebClient(); - byte[] result = client.DownloadData(url); - string strResult = Encoding.UTF8.GetString(result); - - XmlDocument dom = new XmlDocument(); - dom.LoadXml(strResult); - XmlNode node = dom.SelectSingleNode("images/image/url"); - string imgUrl = DomUtil.GetNodeText(node); - imgUrl = "http://s.cn.bing.net/" + imgUrl; - - // 设到字典 - imgDict[strNo] = imgUrl; - - // 保存到dom - XmlNode imgNode = imgDom.CreateElement("img"); - DomUtil.SetAttr(imgNode, "no", strNo); - DomUtil.SetAttr(imgNode, "url", imgUrl); - imgDom.DocumentElement.AppendChild(imgNode); - imgDom.Save(this.imgFileName); - return imgUrl; - } - - - } -} diff --git a/dp2Command.Server/dp2CmdService2.cs b/dp2Command.Server/dp2CmdService2.cs index dd80e9b0..0936f4d6 100644 --- a/dp2Command.Server/dp2CmdService2.cs +++ b/dp2Command.Server/dp2CmdService2.cs @@ -220,7 +220,7 @@ public void SetDp2mserverInfo(string dp2mserverUrl, root.AppendChild(nodeDp2mserver); } DomUtil.SetAttr(nodeDp2mserver, "url", dp2mserverUrl); - DomUtil.SetAttr(nodeDp2mserver, "username", userName); + DomUtil.SetAttr(nodeDp2mserver, "username", userName); string encryptPassword = Cryptography.Encrypt(password, dp2CmdService2.EncryptKey); DomUtil.SetAttr(nodeDp2mserver, "password", encryptPassword); dom.Save(this._cfgFile); @@ -2150,8 +2150,6 @@ public long SearchBiblio(string remoteUserName, try { - REDO1: - CancellationToken cancel_token = new CancellationToken(); string id = Guid.NewGuid().ToString(); SearchRequest request = new SearchRequest(id, @@ -2167,11 +2165,9 @@ public long SearchBiblio(string remoteUserName, count); int tempNo = connIndex;// connIndex % 2; - MessageConnection connection = this._channels.GetConnectionAsync( this.dp2MServerUrl, - remoteUserName + tempNo).Result; - + remoteUserName).Result; //+ tempNo todo connIndex++; SearchResult result = connection.SearchAsync( @@ -2221,7 +2217,7 @@ public long SearchBiblio(string remoteUserName, if (result.Records.Count > 0 && start+result.Records.Count < result.ResultCount) { start += result.Records.Count; - goto REDO1; + //goto REDO1; } return records.Count; diff --git a/dp2Command.Server/dp2Command.Service.csproj b/dp2Command.Server/dp2Command.Service.csproj index b4d2caed..8e7d33e0 100644 --- a/dp2Command.Server/dp2Command.Service.csproj +++ b/dp2Command.Server/dp2Command.Service.csproj @@ -65,7 +65,6 @@ - @@ -114,7 +113,6 @@ -