diff --git a/WebWeiXinToGZH/WebWeiXinToGZH.csproj b/WebWeiXinToGZH/WebWeiXinToGZH.csproj index f821b105..a61ab0ab 100644 --- a/WebWeiXinToGZH/WebWeiXinToGZH.csproj +++ b/WebWeiXinToGZH/WebWeiXinToGZH.csproj @@ -92,9 +92,9 @@ {1b74d69a-530f-4275-845b-8ca6d1463bdd} DigitalPlatform.LibraryRestClient - + {a77b8a4a-3ae8-4bd7-b09a-bf8d92fe802d} - dp2Command.Server + dp2Command.Service diff --git a/WebWeiXinToGZH/WeiXinApi.aspx.cs b/WebWeiXinToGZH/WeiXinApi.aspx.cs index 9980e1cf..291bf7d1 100644 --- a/WebWeiXinToGZH/WeiXinApi.aspx.cs +++ b/WebWeiXinToGZH/WeiXinApi.aspx.cs @@ -1,5 +1,4 @@ using dp2weixin; -using dp2Command.Server; using System; using System.Collections.Generic; using System.Linq; diff --git a/dp2-v3.sln b/dp2-v3.sln index 6e71166c..48c02d2c 100644 --- a/dp2-v3.sln +++ b/dp2-v3.sln @@ -27,7 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalPlatform.IO", "Digit EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalPlatform.LibraryRestClient", "DigitalPlatform.LibraryRestClient\DigitalPlatform.LibraryRestClient.csproj", "{1B74D69A-530F-4275-845B-8CA6D1463BDD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dp2Command.Server", "dp2Command.Server\dp2Command.Server.csproj", "{A77B8A4A-3AE8-4BD7-B09A-BF8D92FE802D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dp2Command.Service", "dp2Command.Server\dp2Command.Service.csproj", "{A77B8A4A-3AE8-4BD7-B09A-BF8D92FE802D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dp2CommandConsole", "dp2CommandConsole\dp2CommandConsole.csproj", "{AA0ADD05-854B-43F9-8C57-9A8768C7A564}" EndProject diff --git a/dp2Command.Server/Command/BaseCommand.cs b/dp2Command.Server/Command/BaseCommand.cs index 064ccd24..8e7851c6 100644 --- a/dp2Command.Server/Command/BaseCommand.cs +++ b/dp2Command.Server/Command/BaseCommand.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace dp2Command.Server +namespace dp2Command.Service { public class BaseCommand { diff --git a/dp2Command.Server/Command/BindingCommand.cs b/dp2Command.Server/Command/BindingCommand.cs index e5fe2279..d9d8a096 100644 --- a/dp2Command.Server/Command/BindingCommand.cs +++ b/dp2Command.Server/Command/BindingCommand.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace dp2Command.Server.Command +namespace dp2Command.Service { public class BindingCommand:BaseCommand { diff --git a/dp2Command.Server/Command/CommandContainer.cs b/dp2Command.Server/Command/CommandContainer.cs index 0210e20d..bf46a19b 100644 --- a/dp2Command.Server/Command/CommandContainer.cs +++ b/dp2Command.Server/Command/CommandContainer.cs @@ -1,11 +1,10 @@ -using dp2Command.Server.Command; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace dp2Command.Server +namespace dp2Command.Service { public class CommandContainer { diff --git a/dp2Command.Server/Command/SearchCommand.cs b/dp2Command.Server/Command/SearchCommand.cs index 24ec4624..fbe7b355 100644 --- a/dp2Command.Server/Command/SearchCommand.cs +++ b/dp2Command.Server/Command/SearchCommand.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace dp2Command.Server +namespace dp2Command.Service { public class SearchCommand:BaseCommand { diff --git a/dp2Command.Server/Command/dp2CommandUtility.cs b/dp2Command.Server/Command/dp2CommandUtility.cs index 2e3eb3fc..73b8cc91 100644 --- a/dp2Command.Server/Command/dp2CommandUtility.cs +++ b/dp2Command.Server/Command/dp2CommandUtility.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Web; -namespace dp2Command.Server +namespace dp2Command.Service { public class dp2CommandUtility { diff --git a/dp2Command.Server/dp2Command.Server.csproj b/dp2Command.Server/dp2Command.Service.csproj similarity index 100% rename from dp2Command.Server/dp2Command.Server.csproj rename to dp2Command.Server/dp2Command.Service.csproj diff --git a/dp2Command.Server/dp2CommandService.cs b/dp2Command.Server/dp2CommandService.cs index 46c3d232..cdcc268e 100644 --- a/dp2Command.Server/dp2CommandService.cs +++ b/dp2Command.Server/dp2CommandService.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; using System.Xml; -namespace dp2Command.Server +namespace dp2Command.Service { public class dp2CommandService { diff --git a/dp2CommandConsole/Instance.cs b/dp2CommandConsole/Instance.cs index b7ddeba6..d7993fec 100644 --- a/dp2CommandConsole/Instance.cs +++ b/dp2CommandConsole/Instance.cs @@ -7,8 +7,7 @@ using DigitalPlatform.Text; using System.Net; using DigitalPlatform.IO; -using dp2Command.Server; -using dp2Command.Server.Command; +using dp2Command.Service; using DigitalPlatform.LibraryRestClient; using System.Xml; using DigitalPlatform.Xml; diff --git a/dp2CommandConsole/dp2CommandConsole.csproj b/dp2CommandConsole/dp2CommandConsole.csproj index 6732cd07..5c398470 100644 --- a/dp2CommandConsole/dp2CommandConsole.csproj +++ b/dp2CommandConsole/dp2CommandConsole.csproj @@ -65,9 +65,9 @@ {e6489e89-1349-4ee7-a00b-ac96b9912587} DigitalPlatform.Xml - + {a77b8a4a-3ae8-4bd7-b09a-bf8d92fe802d} - dp2Command.Server + dp2Command.Service diff --git a/dp2weixin.service/dp2MessageHandler/dp2MessageContext.cs b/dp2weixin.service/dp2MessageHandler/dp2MessageContext.cs index afe6c19f..f8903a02 100644 --- a/dp2weixin.service/dp2MessageHandler/dp2MessageContext.cs +++ b/dp2weixin.service/dp2MessageHandler/dp2MessageContext.cs @@ -15,7 +15,7 @@ using System.Runtime.Remoting.Messaging; using System.Text; using Senparc.Weixin.MP.Entities; -using dp2Command.Server; +using dp2Command.Service; namespace dp2weixin { diff --git a/dp2weixin.service/dp2MessageHandler/dp2MessageHandler.cs b/dp2weixin.service/dp2MessageHandler/dp2MessageHandler.cs index 264de26d..06d170a0 100644 --- a/dp2weixin.service/dp2MessageHandler/dp2MessageHandler.cs +++ b/dp2weixin.service/dp2MessageHandler/dp2MessageHandler.cs @@ -16,9 +16,9 @@ using System.Diagnostics; using DigitalPlatform; using DigitalPlatform.Text; -using dp2Command.Server; -using dp2Command.Server.Command; +using dp2Command.Service; using DigitalPlatform.LibraryRestClient; +using dp2Command.Service; namespace dp2weixin { diff --git a/dp2weixin.service/dp2MessageHandler/dp2MessageHandler_Events.cs b/dp2weixin.service/dp2MessageHandler/dp2MessageHandler_Events.cs index 76823282..4333528e 100644 --- a/dp2weixin.service/dp2MessageHandler/dp2MessageHandler_Events.cs +++ b/dp2weixin.service/dp2MessageHandler/dp2MessageHandler_Events.cs @@ -7,7 +7,7 @@ using Senparc.Weixin.MP.Helpers; using Senparc.Weixin.MP.MessageHandlers; using Senparc.Weixin.Context; -using dp2Command.Server; +using dp2Command.Service; namespace dp2weixin { /// diff --git a/dp2weixin/Global.asax.cs b/dp2weixin/Global.asax.cs index 34ae0562..7c360888 100644 --- a/dp2weixin/Global.asax.cs +++ b/dp2weixin/Global.asax.cs @@ -7,7 +7,7 @@ //using dp2weixin.dp2RestfulApi; using System.Web.Configuration; using DigitalPlatform.IO; -using dp2Command.Server; +using dp2Command.Service; namespace dp2weixin { diff --git a/dp2weixin/Index.aspx.cs b/dp2weixin/Index.aspx.cs index aca79436..1abc15d9 100644 --- a/dp2weixin/Index.aspx.cs +++ b/dp2weixin/Index.aspx.cs @@ -8,7 +8,7 @@ using Senparc.Weixin.MP; using Senparc.Weixin.MP.Entities.Request; using DigitalPlatform.LibraryRestClient; -using dp2Command.Server; +using dp2Command.Service; namespace dp2weixin { public partial class Index : System.Web.UI.Page diff --git a/dp2weixin/dp2weixin.csproj b/dp2weixin/dp2weixin.csproj index 314b173b..5faf7aae 100644 --- a/dp2weixin/dp2weixin.csproj +++ b/dp2weixin/dp2weixin.csproj @@ -119,9 +119,9 @@ {e6489e89-1349-4ee7-a00b-ac96b9912587} DigitalPlatform.Xml - + {a77b8a4a-3ae8-4bd7-b09a-bf8d92fe802d} - dp2Command.Server + dp2Command.Service {8085b933-f69e-4a89-97eb-0a61d115c69f} diff --git a/dp2weixinP2P/Controllers/WeixinController.cs b/dp2weixinP2P/Controllers/WeixinController.cs index 4efb43ca..12dbdfa0 100644 --- a/dp2weixinP2P/Controllers/WeixinController.cs +++ b/dp2weixinP2P/Controllers/WeixinController.cs @@ -30,7 +30,7 @@ using Senparc.Weixin.MP.MvcExtension; using Senparc.Weixin.MP; using dp2weixin; -using dp2Command.Server; +using dp2Command.Service; namespace dp2weixinP2P.Controllers { diff --git a/dp2weixinP2P/Global.asax.cs b/dp2weixinP2P/Global.asax.cs index 5b79d17f..966e5cfd 100644 --- a/dp2weixinP2P/Global.asax.cs +++ b/dp2weixinP2P/Global.asax.cs @@ -8,7 +8,7 @@ using System.Web.SessionState; using System.Web.Http; using System.Web.Configuration; -using dp2Command.Server; +using dp2Command.Service; using DigitalPlatform.IO; using dp2Command.Service; diff --git a/dp2weixinP2P/dp2weixinP2P.csproj b/dp2weixinP2P/dp2weixinP2P.csproj index caf31131..bf00bd28 100644 --- a/dp2weixinP2P/dp2weixinP2P.csproj +++ b/dp2weixinP2P/dp2weixinP2P.csproj @@ -181,9 +181,9 @@ {1b74d69a-530f-4275-845b-8ca6d1463bdd} DigitalPlatform.LibraryRestClient - + {a77b8a4a-3ae8-4bd7-b09a-bf8d92fe802d} - dp2Command.Server + dp2Command.Service {8085b933-f69e-4a89-97eb-0a61d115c69f}