From 02b8b5c85f0b5d2c81d7e94ea7e48a9bc81c3334 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Wed, 23 Sep 2020 19:43:04 +0800 Subject: [PATCH] Fix RemoteService names --- .../EasyAbp/EShop/Orders/Orders/OrderController.cs | 2 +- .../EasyAbp/EShop/Payments/Payments/PaymentController.cs | 2 +- .../EasyAbp/EShop/Payments/Refunds/RefundController.cs | 2 +- .../EasyAbp/EShop/Products/Categories/CategoryController.cs | 2 +- .../Products/ProductCategories/ProductCategoryController.cs | 2 +- .../ProductDetailHistories/ProductDetailHistoryController.cs | 2 +- .../EShop/Products/ProductDetails/ProductDetailController.cs | 2 +- .../Products/ProductHistories/ProductHistoryController.cs | 2 +- .../Products/ProductInventories/ProductInventoryController.cs | 2 +- .../EasyAbp/EShop/Products/Products/ProductController.cs | 2 +- .../EasyAbp/EShop/Stores/StoreOwners/StoreOwnerController.cs | 2 +- .../EasyAbp/EShop/Stores/Stores/StoreController.cs | 2 +- .../EShop/Stores/Transactions/TransactionController.cs | 4 ++-- .../EShop/Plugins/Baskets/Localization/BasketsResource.cs | 2 +- .../EShop/Plugins/Baskets/BasketItems/BasketItemController.cs | 2 +- .../EShop/Plugins/Baskets/BasketItems/BasketItem/index.js | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs index ba2473a2..27984953 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Orders.Orders { - [RemoteService(Name = "EShopOrders")] + [RemoteService(Name = "EasyAbpEShopOrders")] [Route("/api/eShop/orders/order")] public class OrderController : OrdersController, IOrderAppService { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Payments/PaymentController.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Payments/PaymentController.cs index 1249e4c0..ac7163e2 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Payments/PaymentController.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Payments/PaymentController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Payments.Payments { - [RemoteService(Name = "EShopPayments")] + [RemoteService(Name = "EasyAbpEShopPayments")] [Route("/api/eShop/payments/payment")] public class PaymentController : PaymentsController, IPaymentAppService { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Refunds/RefundController.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Refunds/RefundController.cs index 6b8aba2a..577a7365 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Refunds/RefundController.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/Refunds/RefundController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Payments.Refunds { - [RemoteService(Name = "EShopPayments")] + [RemoteService(Name = "EasyAbpEShopPayments")] [Route("/api/eShop/payments/refund")] public class RefundController : PaymentsController, IRefundAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Categories/CategoryController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Categories/CategoryController.cs index 4590f582..4d23af9e 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Categories/CategoryController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Categories/CategoryController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.Categories { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/category")] public class CategoryController : ProductsController, ICategoryAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductCategories/ProductCategoryController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductCategories/ProductCategoryController.cs index c8529da1..6fc0326a 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductCategories/ProductCategoryController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductCategories/ProductCategoryController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.ProductCategories { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/productCategory")] public class ProductCategoryController : ProductsController, IProductCategoryAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryController.cs index ffce6ad3..05ff3524 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.ProductDetailHistories { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/productDetailHistory")] public class ProductDetailHistoryController : ProductsController, IProductDetailHistoryAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetails/ProductDetailController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetails/ProductDetailController.cs index 4cd965cb..11c6190a 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetails/ProductDetailController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductDetails/ProductDetailController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.ProductDetails { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/productDetail")] public class ProductDetailController : ProductsController, IProductDetailAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductHistories/ProductHistoryController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductHistories/ProductHistoryController.cs index 4b531832..ba071a53 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductHistories/ProductHistoryController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductHistories/ProductHistoryController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.ProductHistories { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/productHistory")] public class ProductHistoryController : ProductsController, IProductHistoryAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductInventories/ProductInventoryController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductInventories/ProductInventoryController.cs index 411393e1..19b7c4c9 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductInventories/ProductInventoryController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/ProductInventories/ProductInventoryController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.ProductInventories { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/productInventory")] public class ProductInventoryController : ProductsController, IProductInventoryAppService { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Products/ProductController.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Products/ProductController.cs index 21c0af38..5fcb5c95 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Products/ProductController.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp/EShop/Products/Products/ProductController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Products.Products { - [RemoteService(Name = "EShopProducts")] + [RemoteService(Name = "EasyAbpEShopProducts")] [Route("/api/eShop/products/product")] public class ProductController : ProductsController, IProductAppService { diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerController.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerController.cs index 66682a12..9bf9f39a 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerController.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Stores.StoreOwners { - [RemoteService(Name = "EShopStoreOwners")] + [RemoteService(Name = "EasyAbpEShopStores")] [Route("/api/eShop/stores/storeOwner")] public class StoreOwnerController : StoresController { diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Stores/StoreController.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Stores/StoreController.cs index 0dee07b4..01f8a650 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Stores/StoreController.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Stores/StoreController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Stores.Stores { - [RemoteService(Name = "EShopStores")] + [RemoteService(Name = "EasyAbpEShopStores")] [Route("/api/eShop/stores/store")] public class StoreController : StoresController, IStoreAppService { diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Transactions/TransactionController.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Transactions/TransactionController.cs index 84b72b15..a4296551 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Transactions/TransactionController.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp/EShop/Stores/Transactions/TransactionController.cs @@ -7,8 +7,8 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Stores.Transactions { - [RemoteService(Name = "TransactionService")] - [Route("/api/stores/transaction")] + [RemoteService(Name = "EasyAbpEShopStores")] + [Route("/api/eShop/stores/transaction")] public class TransactionController : StoresController, ITransactionAppService { private readonly ITransactionAppService _service; diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs index 73e83b8e..c07b9ca3 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs @@ -2,7 +2,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.Localization { - [LocalizationResourceName("EShopPluginsBaskets")] + [LocalizationResourceName("EasyAbpEShopPluginsBaskets")] public class BasketsResource { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemController.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemController.cs index 04a3b644..1b83ba1d 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemController.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemController.cs @@ -8,7 +8,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Plugins.Baskets.BasketItems { - [RemoteService(Name = "EShopPluginsBaskets")] + [RemoteService(Name = "EasyAbpEShopPluginsBaskets")] [Route("/api/eShop/plugins/baskets/basketItem")] public class BasketItemController : BasketsController, IBasketItemAppService { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.js b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.js index 8a4c65cf..f9160e58 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.js +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.js @@ -1,6 +1,6 @@ $(function () { - var l = abp.localization.getResource('EShopPluginsBaskets'); + var l = abp.localization.getResource('EasyAbpEShopPluginsBaskets'); var service = easyAbp.eShop.plugins.baskets.basketItems.basketItem; var createModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/Baskets/BasketItems/BasketItem/CreateModal');