From efc4b37782ed8289817bc33965d3aa66ce196f2b Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Wed, 15 Dec 2021 18:32:59 +0800 Subject: [PATCH] =?UTF-8?q?'RequestMapping=E8=AF=B7=E6=B1=82=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/controller/goods/CategoryBuyerController.java | 2 +- .../cn/lili/controller/goods/GoodsBuyerController.java | 2 +- .../cn/lili/controller/member/FootprintController.java | 2 +- .../controller/member/MemberAddressBuyerController.java | 2 +- .../member/MemberEvaluationBuyerController.java | 2 +- .../controller/member/MemberMessageBuyerController.java | 2 +- .../lili/controller/member/MemberReceiptController.java | 2 +- .../controller/member/MemberWalletBuyerController.java | 2 +- .../member/MemberWithdrawApplyBuyerController.java | 2 +- .../lili/controller/member/RechargeBuyerController.java | 2 +- .../lili/controller/other/AppVersionBuyerController.java | 2 +- .../cn/lili/controller/other/ArticleBuyerController.java | 2 +- .../lili/controller/other/FeedbackBuyerController.java | 2 +- .../lili/controller/other/LogisticsBuyerController.java | 2 +- .../cn/lili/controller/other/PageBuyerController.java | 2 +- .../controller/other/broadcast/StudioController.java | 2 +- .../other/distribution/DistributionBuyerController.java | 2 +- .../distribution/DistributionGoodsBuyerController.java | 2 +- .../other/purchase/PurchaseBuyerController.java | 2 +- .../other/purchase/PurchaseQuotedController.java | 2 +- .../lili/controller/passport/MemberBuyerController.java | 2 +- .../passport/connect/ConnectBuyerBindController.java | 2 +- .../passport/connect/ConnectBuyerWebController.java | 2 +- .../passport/connect/MiniProgramBuyerController.java | 2 +- .../cn/lili/controller/payment/CashierController.java | 2 +- .../lili/controller/payment/CashierRefundController.java | 2 +- .../cn/lili/controller/store/StoreBuyerController.java | 2 +- .../lili/controller/trade/AfterSaleBuyerController.java | 2 +- .../cn/lili/controller/trade/OrderBuyerController.java | 2 +- .../controller/trade/OrderComplaintBuyerController.java | 2 +- .../java/cn/lili/controller/common/FileController.java | 4 ++-- .../java/cn/lili/controller/common/IMController.java | 2 +- .../java/cn/lili/controller/common/LogoController.java | 4 ++-- .../java/cn/lili/controller/common/RegionController.java | 2 +- .../cn/lili/controller/common/SliderImageController.java | 2 +- .../java/cn/lili/controller/common/SmsController.java | 2 +- .../java/cn/lili/controller/common/UploadController.java | 2 +- .../cn/lili/controller/file/FileManagerController.java | 4 ++-- .../controller/goods/CategoryBrandManagerController.java | 2 +- .../goods/CategoryParameterGroupManagerController.java | 2 +- .../goods/CategorySpecificationManagerController.java | 2 +- .../cn/lili/controller/goods/GoodsManagerController.java | 2 +- .../{setting => hotwords}/HotWordsManagerController.java | 4 ++-- .../lili/controller/member/IpInfoManagerController.java | 9 ++++----- .../member/MemberEvaluationManagerController.java | 2 +- .../controller/member/MemberGradeManagerController.java | 2 +- .../member/MemberMessageManagerController.java | 2 +- .../member/MemberNoticeLogManagerController.java | 2 +- .../member/MemberNoticeSenterManagerController.java | 2 +- .../controller/member/MemberWalletManagerController.java | 2 +- .../member/MemberWithdrawApplyManagerController.java | 2 +- .../{setting => other}/AppVersionManagerController.java | 4 ++-- .../other/ArticleCategoryManagerController.java | 2 +- .../lili/controller/other/ArticleManagerController.java | 2 +- .../cn/lili/controller/other/CustomWordsController.java | 2 +- .../lili/controller/other/ElasticsearchController.java | 2 +- .../lili/controller/other/FeedbackManagerController.java | 2 +- .../{setting => other}/LogisticsManagerController.java | 4 ++-- .../lili/controller/other/MessageManagerController.java | 2 +- .../lili/controller/other/PageDataManagerController.java | 2 +- .../other/SensitiveWordsManagerController.java | 2 +- .../lili/controller/other/SpecialManagerController.java | 2 +- .../controller/other/VerificationSourceController.java | 2 +- .../other/broadcast/CommodityManagerController.java | 2 +- .../other/broadcast/StudioManagerController.java | 4 ++-- .../distribution/DistributionManagerController.java | 2 +- .../other/purchase/PurchaseManagerController.java | 2 +- .../controller/passport/AdminUserManagerController.java | 2 +- .../{member => passport}/MemberManagerController.java | 4 ++-- .../permission/DepartmentManagerController.java | 2 +- .../permission/DepartmentRoleManagerController.java | 2 +- .../controller/permission/MenuManagerController.java | 2 +- .../controller/permission/RoleManagerController.java | 2 +- .../controller/permission/RoleMenuManagerController.java | 2 +- .../controller/permission/UserRoleManagerController.java | 2 +- .../promotion/KanJiaActivityGoodsManagerController.java | 2 +- .../controller/promotion/PromotionManagerController.java | 2 +- .../cn/lili/controller/setting/LogManagerController.java | 2 +- .../setting/MemberNoticeManagerController.java | 2 +- .../setting/NoticeMessageManagerController.java | 2 +- .../lili/controller/setting/RegionManagerController.java | 2 +- .../setting/ServiceNoticeManagerController.java | 2 +- .../controller/setting/SettingManagerController.java | 2 +- .../controller/setting/SettingXManagerController.java | 2 +- .../cn/lili/controller/setting/SmsManagerController.java | 2 +- .../setting/WechatMPMessageManagerController.java | 2 +- .../setting/WechatMessageManageController.java | 2 +- .../RefundOrderStatisticsManagerController.java | 2 +- .../cn/lili/controller/store/StoreManagerController.java | 2 +- .../controller/store/StoreMessageManagerController.java | 4 ++-- .../controller/trade/AfterSaleManagerController.java | 2 +- .../trade/AfterSaleReasonManagerController.java | 2 +- .../trade/OrderComplaintManagerController.java | 2 +- .../lili/controller/trade/OrderLogManagerController.java | 2 +- .../cn/lili/controller/trade/OrderManagerController.java | 2 +- .../controller/trade/PaymentLogManagerController.java | 2 +- .../lili/controller/trade/ReceiptManagerController.java | 2 +- .../lili/controller/trade/RechargeManagerController.java | 2 +- .../controller/trade/RefundLogManagerController.java | 2 +- .../goods/CategoryParameterGroupStoreController.java | 2 +- .../goods/CategorySpecificationStoreController.java | 2 +- .../lili/controller/goods/DraftGoodsStoreController.java | 2 +- .../cn/lili/controller/goods/GoodsStoreController.java | 2 +- .../lili/controller/goods/GoodsUnitStoreController.java | 2 +- .../cn/lili/controller/member/StoreUserController.java | 2 +- .../other/{article => }/ArticleStoreController.java | 4 ++-- .../{settings => other}/LogisticsStoreController.java | 4 ++-- .../other/broadcast/CommodityStoreController.java | 2 +- .../other/broadcast/StudioStoreController.java | 2 +- .../distribution/DistributionGoodsStoreController.java | 2 +- .../distribution/DistributionOrderStoreController.java | 2 +- .../controller/passport/StorePassportController.java | 2 +- .../settings/FreightTemplateStoreController.java | 2 +- .../cn/lili/controller/settings/LogStoreController.java | 2 +- .../lili/controller/settings/StoreAddressController.java | 2 +- .../lili/controller/settings/StoreMessageController.java | 2 +- .../controller/settings/StorePageDataController.java | 2 +- .../controller/settings/StoreSettingsController.java | 2 +- .../statistics/RefundOrderStatisticsStoreController.java | 2 +- .../lili/controller/trade/AfterSaleStoreController.java | 2 +- .../cn/lili/controller/trade/BillStoreController.java | 2 +- .../trade/MemberEvaluationStoreController.java | 2 +- .../controller/trade/OrderComplaintStoreController.java | 2 +- .../lili/controller/trade/OrderLogStoreController.java | 2 +- .../cn/lili/controller/trade/OrderStoreController.java | 2 +- .../cn/lili/controller/trade/ReceiptStoreController.java | 2 +- 126 files changed, 140 insertions(+), 141 deletions(-) rename manager-api/src/main/java/cn/lili/controller/{setting => hotwords}/HotWordsManagerController.java (94%) mode change 100755 => 100644 rename manager-api/src/main/java/cn/lili/controller/{setting => other}/AppVersionManagerController.java (97%) mode change 100755 => 100644 rename manager-api/src/main/java/cn/lili/controller/{setting => other}/LogisticsManagerController.java (96%) rename manager-api/src/main/java/cn/lili/controller/{member => passport}/MemberManagerController.java (97%) rename seller-api/src/main/java/cn/lili/controller/other/{article => }/ArticleStoreController.java (95%) rename seller-api/src/main/java/cn/lili/controller/{settings => other}/LogisticsStoreController.java (97%) diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java index e5cb01575..37689867e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java @@ -25,7 +25,7 @@ import java.util.List; */ @RestController @Api(tags = "买家端,商品分类接口") -@RequestMapping("/buyer/category") +@RequestMapping("/buyer/goods/category") public class CategoryBuyerController { /** * 商品分类 diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java index cfc844dc3..92f8838d2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java @@ -43,7 +43,7 @@ import java.util.Map; @Slf4j @Api(tags = "买家端,商品接口") @RestController -@RequestMapping("/buyer/goods") +@RequestMapping("/buyer/goods/goods") public class GoodsBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java index b0ad9da46..256603f93 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "买家端,浏览历史接口") -@RequestMapping("/buyer/footprint") +@RequestMapping("/buyer/member/footprint") public class FootprintController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index fc2e7d3a3..d1763e883 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -26,7 +26,7 @@ import java.util.Objects; */ @RestController @Api(tags = "买家端,会员地址接口") -@RequestMapping("/buyer/memberAddress") +@RequestMapping("/buyer/member/address") public class MemberAddressBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java index acf5b34d7..42a28a14e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java @@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "买家端,会员商品评价接口") -@RequestMapping("/buyer/memberEvaluation") +@RequestMapping("/buyer/member/evaluation") public class MemberEvaluationBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java index 552e6aeba..f6a16d370 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "买家端,会员站内消息接口") -@RequestMapping("/buyer/member/message") +@RequestMapping("/buyer/message/member") public class MemberMessageBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java index 2d82d55c9..dfbec8c38 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "买家端,会员发票接口") -@RequestMapping("/buyer/member/receipt") +@RequestMapping("/buyer/wallet/receipt") public class MemberReceiptController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java index ca2135c11..65fecc4a4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java @@ -34,7 +34,7 @@ import javax.validation.constraints.Pattern; */ @RestController @Api(tags = "买家端,会员余额接口") -@RequestMapping("/buyer/members/wallet") +@RequestMapping("/buyer/wallet/wallet") public class MemberWalletBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java index 5ac9e860c..60498f5da 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "买家端,余额提现记录接口") -@RequestMapping("/buyer/member/withdrawApply") +@RequestMapping("/buyer/wallet/withdrawApply") @Transactional(rollbackFor = Exception.class) public class MemberWithdrawApplyBuyerController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java index e75eea9b6..a7ff4f464 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "买家端,预存款充值记录接口") -@RequestMapping("/buyer/member/recharge") +@RequestMapping("/buyer/wallet/recharge") @Transactional(rollbackFor = Exception.class) public class RechargeBuyerController { diff --git a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java index 581f3051a..ccf080adc 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "买家端,APP版本") -@RequestMapping("/buyer/appVersion") +@RequestMapping("/buyer/other/appVersion") public class AppVersionBuyerController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java index cef8b1ad5..1142e47e7 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java @@ -29,7 +29,7 @@ import java.util.List; */ @RestController @Api(tags = "买家端,文章接口") -@RequestMapping("/buyer/article") +@RequestMapping("/buyer/other/article") public class ArticleBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java index 83f0ac041..84c69306e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java @@ -22,7 +22,7 @@ import javax.validation.Valid; */ @RestController @Api(tags = "买家端,意见反馈接口") -@RequestMapping("/buyer/feedback") +@RequestMapping("/buyer/other/feedback") public class FeedbackBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java index 36c798cf1..b44aabd5f 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java @@ -21,7 +21,7 @@ import java.util.List; */ @RestController @Api(tags = "买家端,物流公司接口") -@RequestMapping("/buyer/logistics") +@RequestMapping("/buyer/other/logistics") public class LogisticsBuyerController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java index 35b262a8a..f7a609630 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "买家端,页面接口") -@RequestMapping("/buyer/pageData") +@RequestMapping("/buyer/other/pageData") public class PageBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java index d161e5c15..23bdc7600 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "买家端,直播间接口") -@RequestMapping("/buyer/broadcast/studio") +@RequestMapping("/buyer/other/broadcast/studio") public class StudioController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java index 68a874885..2fb64782b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "买家端,分销员接口") -@RequestMapping("/buyer/distribution") +@RequestMapping("/buyer/distribution/distribution") public class DistributionBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java index b2e68fa1a..e1b73bedc 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java @@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "买家端,分销商品接口") -@RequestMapping("/buyer/distributionGoods") +@RequestMapping("/buyer/distribution/goods") public class DistributionGoodsBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java index 1f7db0284..c72eb8af4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java @@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull; */ @Api(tags = "买家端,采购接口") @RestController -@RequestMapping("/buyer/purchase") +@RequestMapping("/buyer/other/purchase/purchase") public class PurchaseBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseQuotedController.java b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseQuotedController.java index 258c5951b..1bc03ae7b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseQuotedController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseQuotedController.java @@ -27,7 +27,7 @@ import java.util.List; */ @Api(tags = "买家端,采购报价接口") @RestController -@RequestMapping("/buyer/purchaseQuoted") +@RequestMapping("/buyer/other/purchase/purchaseQuoted") public class PurchaseQuotedController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index a1e6bccba..189f83c8c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "买家端,会员接口") -@RequestMapping("/buyer/members") +@RequestMapping("/buyer/passport/members") public class MemberBuyerController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java index 7557e952d..9a2675aeb 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java @@ -21,7 +21,7 @@ import java.util.List; */ @RestController @Api(tags = "买家端,app/小程序 联合登录") -@RequestMapping("/buyer/connect/bind") +@RequestMapping("/buyer/passport/connect/bind") public class ConnectBuyerBindController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java index 30ef2cf81..a6cbd7751 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java @@ -33,7 +33,7 @@ import java.io.IOException; @Slf4j @RestController @Api(tags = "买家端,web联合登录") -@RequestMapping("/buyer/connect") +@RequestMapping("/buyer/passport/connect/connect") public class ConnectBuyerWebController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java index f7c63f4a8..bdc0bed5b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java @@ -26,7 +26,7 @@ import java.util.List; * @since 2021/2/19 09:28 */ @RestController -@RequestMapping("/buyer/mini-program") +@RequestMapping("/buyer/passport/connect/miniProgram") @Api(tags = "买家端,小程序登录接口") public class MiniProgramBuyerController { diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java index 3389e3e48..217afeee9 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java @@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse; @Slf4j @RestController @Api(tags = "买家端,收银台接口") -@RequestMapping("/buyer/cashier") +@RequestMapping("/buyer/payment/cashier") public class CashierController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java index d86173caf..f4b382e93 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; */ @Api(tags = "买家端,退款回调") @RestController -@RequestMapping("/buyer/cashier/refund") +@RequestMapping("/buyer/payment/cashierRefund") public class CashierRefundController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index 2c9d9b0c5..eda140668 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -31,7 +31,7 @@ import java.util.List; * @since 2020/11/17 2:32 下午 */ @RestController -@RequestMapping("/buyer/store") +@RequestMapping("/buyer/store/store") @Api(tags = "买家端,店铺接口") public class StoreBuyerController { diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java index 5bf9cdf19..d840b282a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java @@ -35,7 +35,7 @@ import java.util.List; */ @RestController @Api(tags = "买家端,售后管理接口") -@RequestMapping("/buyer/afterSale") +@RequestMapping("/buyer/order/afterSale") public class AfterSaleBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java index 4e9458224..ce80967b6 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java @@ -34,7 +34,7 @@ import java.util.Objects; */ @RestController @Api(tags = "买家端,订单接口") -@RequestMapping("/buyer/orders") +@RequestMapping("/buyer/order/order") public class OrderBuyerController { /** diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java index c05fd8862..17d47fcd3 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java @@ -33,7 +33,7 @@ import java.util.Objects; **/ @RestController @Api(tags = "买家端,交易投诉接口") -@RequestMapping("/buyer/complain") +@RequestMapping("/buyer/order/complain") public class OrderComplaintBuyerController { /** diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java index 84df93ffc..255499b72 100644 --- a/common-api/src/main/java/cn/lili/controller/common/FileController.java +++ b/common-api/src/main/java/cn/lili/controller/common/FileController.java @@ -30,8 +30,8 @@ import java.util.List; * @since 2020/11/26 15:41 */ @RestController -@Api(tags = "文件管理管理接口") -@RequestMapping("/common/file") +@Api(tags = "文件管理接口") +@RequestMapping("/common/common/file") public class FileController { @Autowired diff --git a/common-api/src/main/java/cn/lili/controller/common/IMController.java b/common-api/src/main/java/cn/lili/controller/common/IMController.java index 0cc2aeddb..8111f9c43 100644 --- a/common-api/src/main/java/cn/lili/controller/common/IMController.java +++ b/common-api/src/main/java/cn/lili/controller/common/IMController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; * 2021-09-16 15:32 */ @RestController -@RequestMapping("/common/IM") +@RequestMapping("/common/common/IM") @Api(tags = "IM 中心") public class IMController { diff --git a/common-api/src/main/java/cn/lili/controller/common/LogoController.java b/common-api/src/main/java/cn/lili/controller/common/LogoController.java index 635954308..bed5a16e1 100644 --- a/common-api/src/main/java/cn/lili/controller/common/LogoController.java +++ b/common-api/src/main/java/cn/lili/controller/common/LogoController.java @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.RestController; * @since 2020/11/26 15:41 */ @RestController -@Api(tags = "文件管理管理接口") -@RequestMapping("/common/logo") +@Api(tags = "文件管理接口") +@RequestMapping("/common/common/logo") public class LogoController { @Autowired diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java index 0ddc11cc1..f951f0582 100644 --- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java +++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java @@ -22,7 +22,7 @@ import java.util.List; */ @RestController @Api(tags = "地址信息接口") -@RequestMapping("/common/region") +@RequestMapping("/common/common/region") public class RegionController { @Autowired diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index cdb6ba5c4..6b2335071 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; */ @Slf4j @RestController -@RequestMapping("/common/slider") +@RequestMapping("/common/common/slider") @Api(tags = "滑块验证码接口") public class SliderImageController { diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index d74b25dc6..b690e0221 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "短信验证码接口") -@RequestMapping("/common/sms") +@RequestMapping("/common/common/sms") public class SmsController { @Autowired diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 38d3cd0d3..bee48ef86 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -40,7 +40,7 @@ import java.util.Objects; @Slf4j @RestController @Api(tags = "文件上传接口") -@RequestMapping("/common/upload") +@RequestMapping("/common/common/upload") public class UploadController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java index 8580607e7..94142ad09 100644 --- a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java @@ -24,8 +24,8 @@ import java.util.List; * @since 2020/11/26 15:41 */ @RestController -@Api(tags = "管理端,文件管理管理接口") -@RequestMapping("/manager/file") +@Api(tags = "管理端,文件管理接口") +@RequestMapping("/manager/file/file") public class FileManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java index f7db55eed..364aff6fc 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,分类品牌接口") -@RequestMapping("/manager/category/brand") +@RequestMapping("/manager/goods/categoryBrand") public class CategoryBrandManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java index af99cdd53..db806e91a 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java @@ -27,7 +27,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,分类绑定参数组接口") -@RequestMapping("/manager/goods/category/parameters") +@RequestMapping("/manager/goods/categoryParameters") public class CategoryParameterGroupManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java index bde97a6be..ab08d003f 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java @@ -25,7 +25,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,商品分类规格接口") -@RequestMapping("/manager/goods/category/spec") +@RequestMapping("/manager/goods/categorySpec") public class CategorySpecificationManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java index 8004783c6..a0791e42f 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java @@ -32,7 +32,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,商品管理接口") -@RequestMapping("/manager/goods") +@RequestMapping("/manager/goods/goods") public class GoodsManagerController { /** * 商品 diff --git a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java old mode 100755 new mode 100644 similarity index 94% rename from manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java rename to manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java index 80c973969..678c5f40e --- a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.setting; +package cn.lili.controller.hotwords; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,系统设置扩展接口") -@RequestMapping("/manager/hotwords") +@RequestMapping("/manager/hotwords/hotWords") public class HotWordsManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java index 77881b55c..bf79872ae 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java @@ -1,7 +1,7 @@ -package cn.lili.controller.member; +package cn.lili.controller.common; -import cn.lili.common.utils.IpHelper; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.utils.IpHelper; import cn.lili.common.vo.ResultMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +19,8 @@ import javax.servlet.http.HttpServletRequest; * @since 2020-02-25 14:10:16 */ @RestController -@Api(tags = "管理端,IP接口") -@RequestMapping("/manager/common/ip") +@Api(tags = "获取IP信息以及天气") +@RequestMapping("/common/common/ip") public class IpInfoManagerController { @Autowired private IpHelper ipHelper; @@ -28,7 +28,6 @@ public class IpInfoManagerController { @RequestMapping(value = "/info", method = RequestMethod.GET) @ApiOperation(value = "IP及天气相关信息") public ResultMessage upload(HttpServletRequest request) { - String result = ipHelper.getIpCity(request); return ResultUtil.data(result); } diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java index e1d3d2414..99dfdbaf3 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java @@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "管理端,会员商品评价接口") -@RequestMapping("/manager/memberEvaluation") +@RequestMapping("/manager/member/evaluation") public class MemberEvaluationManagerController { @Autowired private MemberEvaluationService memberEvaluationService; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java index 907715b9f..e2ca98ca9 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "管理端,会员等级接口") -@RequestMapping("/manager/memberGrade") +@RequestMapping("/manager/member/memberGrade") public class MemberGradeManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java index 9ad3c74ee..4f23d206f 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Transactional(rollbackFor = Exception.class) -@Api(tags = "管理端,会员消息消息管理接口") +@Api(tags = "管理端,会员消息管理接口") @RequestMapping("/manager/message/member") public class MemberMessageManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java index 57f29a742..0b41722a9 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java @@ -22,7 +22,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,会员消息接口") -@RequestMapping("/manager/memberNoticeLog") +@RequestMapping("/manager/message/memberNoticeLog") public class MemberNoticeLogManagerController { @Autowired private MemberNoticeLogService memberNoticeLogService; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java index 312852dd6..72c9ccfe9 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,会员消息接口") -@RequestMapping("/manager/memberNoticeSenter") +@RequestMapping("/manager/message/memberNoticeSenter") public class MemberNoticeSenterManagerController { @Autowired private MemberNoticeSenterService memberNoticeSenterService; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java index 78a282ede..0265c2da4 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,预存款接口") -@RequestMapping("/manager/members/wallet") +@RequestMapping("/manager/wallet/wallet") public class MemberWalletManagerController { @Autowired private MemberWalletService memberWalletService; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java index 3c21d1bed..f17d9e5d5 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,余额提现记录接口") -@RequestMapping("/manager/members/withdraw-apply") +@RequestMapping("/manager/wallet/withdrawApply") @Transactional(rollbackFor = Exception.class) public class MemberWithdrawApplyManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java old mode 100755 new mode 100644 similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java rename to manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java index 0beb7cbcb..49dea11c6 --- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.setting; +package cn.lili.controller.other; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; @@ -28,7 +28,7 @@ import javax.validation.Valid; */ @RestController @Api("管理端,app版本控制器") -@RequestMapping("/manager/systems/app/version") +@RequestMapping("/manager/other/appVersion") public class AppVersionManagerController { @Autowired private AppVersionService appVersionService; diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java index 323fa887d..2fcb8264c 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java @@ -24,7 +24,7 @@ import java.util.List; @Slf4j @RestController @Api(tags = "管理端,文章分类管理接口") -@RequestMapping("/manager/article-category") +@RequestMapping("/manager/other/articleCategory") public class ArticleCategoryManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java index ce0a0921b..f9cf79ce8 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java @@ -25,7 +25,7 @@ import javax.validation.Valid; */ @RestController @Api(tags = "管理端,文章接口") -@RequestMapping("/manager/article") +@RequestMapping("/manager/other/article") public class ArticleManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java index c65ac8079..fbd07e664 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java @@ -33,7 +33,7 @@ import java.nio.charset.StandardCharsets; @Slf4j @RestController @Api(tags = "管理端,自定义分词接口") -@RequestMapping("/manager/custom-words") +@RequestMapping("/manager/other/customWords") public class CustomWordsController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java index 453d1efd0..4451507c5 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java @@ -21,7 +21,7 @@ import java.util.Map; */ @RestController @Api(tags = "ES初始化接口") -@RequestMapping("/manager/elasticsearch") +@RequestMapping("/manager/other/elasticsearch") public class ElasticsearchController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java index 5e882def9..77c5c011c 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,意见反馈接口") -@RequestMapping("/manager/feedback") +@RequestMapping("/manager/other/feedback") public class FeedbackManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/LogisticsManagerController.java similarity index 96% rename from manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java rename to manager-api/src/main/java/cn/lili/controller/other/LogisticsManagerController.java index 0ef036144..6ca05e0cb 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/LogisticsManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.setting; +package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; @@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "管理端,物流公司接口") -@RequestMapping("/manager/logistics") +@RequestMapping("/manager/other/logistics") public class LogisticsManagerController { @Autowired private LogisticsService logisticsService; diff --git a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java index 261c736fc..58905e798 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "管理端,消息发送管理接口") -@RequestMapping("/manager/message") +@RequestMapping("/manager/other/message") public class MessageManagerController { @Autowired private MessageService messageService; diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java index 0af0c47aa..ae0b02334 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java @@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "管理端,页面设置管理接口") -@RequestMapping("/manager/pageData") +@RequestMapping("/manager/other/pageData") public class PageDataManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java index 5ca04bc2d..457d33620 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java @@ -25,7 +25,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,敏感词管理接口") -@RequestMapping("/manager/sensitiveWords") +@RequestMapping("/manager/other/sensitiveWords") public class SensitiveWordsManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java index 6f6af7f37..af043eaa8 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,专题活动接口") -@RequestMapping("/manager/special") +@RequestMapping("/manager/order/special") public class SpecialManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 15ea88f4a..d650cfa16 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -26,7 +26,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,验证码资源维护接口") -@RequestMapping("/manager/verificationSource") +@RequestMapping("/manager/other/verificationSource") @Transactional(rollbackFor = Exception.class) public class VerificationSourceController { diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java index bd5b5c948..d166146e8 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "店铺端,直播商品接口") -@RequestMapping("/manager/broadcast/commodity") +@RequestMapping("/manager/other/broadcast/commodity") public class CommodityManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java index f663d4330..64cf3bef5 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java @@ -26,8 +26,8 @@ import javax.validation.constraints.NotNull; * @since 2021/5/28 11:56 上午 */ @RestController -@Api(tags = "店铺端,直播间接口") -@RequestMapping("/manager/broadcast/studio") +@Api(tags = "管理端,直播间接口") +@RequestMapping("/manager/other/broadcast/studio") public class StudioManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java index bbb98c1b2..c31d07bcf 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; */ @RestController @Api(tags = "管理端,分销员管理接口") -@RequestMapping("/manager/distribution") +@RequestMapping("/manager/distribution/distribution") public class DistributionManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java index 11185279d..3b849d0d4 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java @@ -27,7 +27,7 @@ import java.util.List; */ @Api(tags = "管理端,采购接口") @RestController -@RequestMapping("/manager/purchase") +@RequestMapping("/manager/other/purchase/purchase") public class PurchaseManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index 9bd1d547a..e718a02e4 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -45,7 +45,7 @@ import java.util.List; @Slf4j @RestController @Api(tags = "管理员") -@RequestMapping("/manager/user") +@RequestMapping("/manager/passport/user") @Transactional(rollbackFor = Exception.class) @Validated public class AdminUserManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java rename to manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java index 6daf5c1d4..c4f9714ca 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.member; +package cn.lili.controller.passport; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; @@ -29,7 +29,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,会员接口") -@RequestMapping("/manager/member") +@RequestMapping("/manager/passport/member") public class MemberManagerController { @Autowired private MemberService memberService; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java index 442a406f1..724b6c97c 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,部门管理接口") -@RequestMapping("/manager/department") +@RequestMapping("/manager/permission/department") public class DepartmentManagerController { @Autowired private DepartmentService departmentService; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java index 20d8b068e..8bf61daff 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java @@ -20,7 +20,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,部门角色接口") -@RequestMapping("/manager/departmentRole") +@RequestMapping("/manager/permission/departmentRole") public class DepartmentRoleManagerController { @Autowired private DepartmentRoleService departmentRoleService; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index 5169eb441..33787d210 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -26,7 +26,7 @@ import java.util.List; @Slf4j @RestController @Api(tags = "管理端,菜单管理接口") -@RequestMapping("/manager/menu") +@RequestMapping("/manager/permission/menu") public class MenuManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java index 4e4abbe7c..b6f3e9bfa 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,角色管理接口") -@RequestMapping("/manager/role") +@RequestMapping("/manager/permission/role") public class RoleManagerController { @Autowired private RoleService roleService; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java index 63b573551..b74f07ba9 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java @@ -21,7 +21,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,角色菜单接口") -@RequestMapping("/manager/roleMenu") +@RequestMapping("/manager/permission/roleMenu") public class RoleMenuManagerController { @Autowired private RoleMenuService roleMenuService; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java index b04971cb9..281977346 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java @@ -21,7 +21,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,管理员角色接口") -@RequestMapping("/manager/userRole") +@RequestMapping("/manager/permission/userRole") public class UserRoleManagerController { @Autowired private UserRoleService userRoleService; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java index 0b6f305f7..c31cd9190 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java @@ -27,7 +27,7 @@ import java.util.Arrays; **/ @RestController @Api(tags = "管理端,砍价促销接口") -@RequestMapping("/manager/promotion/kan-jia-goods") +@RequestMapping("/manager/promotion/kanJiaGoods") public class KanJiaActivityGoodsManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java index fea4cb300..72fea8efd 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @Api(tags = "管理端,促销接口") -@RequestMapping("/manager/promotion") +@RequestMapping("/manager/promotion/promotion") public class PromotionManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java index 6b61d0b92..ff7d31027 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java @@ -25,7 +25,7 @@ import java.util.List; @RestController @Transactional(rollbackFor = Exception.class) @Api(tags = "日志管理接口") -@RequestMapping("/manager/log") +@RequestMapping("/manager/setting/log") public class LogManagerController { @Autowired private SystemLogService systemLogService; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java index 54c7d5206..11df7c8d0 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java @@ -25,7 +25,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,会员站内信管理API") -@RequestMapping("/manager/member/notice") +@RequestMapping("/manager/message/memberNotice") public class MemberNoticeManagerController { @Autowired private MemberNoticeService memberNoticeService; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java index 33d50c504..4bbbf4031 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java @@ -35,7 +35,7 @@ import java.util.List; @Slf4j @RestController @Api(tags = "管理端,会员站内信管理接口") -@RequestMapping("/manager/noticeMessage") +@RequestMapping("/manager/setting/noticeMessage") public class NoticeMessageManagerController { @Autowired private NoticeMessageService noticeMessageService; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index 558b6e2c8..223bf5489 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,行政地区管理接口") -@RequestMapping("/manager/region") +@RequestMapping("/manager/setting/region") @Transactional(rollbackFor = Exception.class) public class RegionManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java index 59e7aa15d..c9205995b 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,服务订阅消息接口") -@RequestMapping("/manager/admin/notice") +@RequestMapping("/manager/message/serviceNotice") public class ServiceNoticeManagerController { @Autowired private ServiceNoticeService serviceNoticeService; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index 5d3aa8e12..19146d116 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -32,7 +32,7 @@ import java.util.Collections; */ @RestController @Api(tags = "管理端,系统设置接口") -@RequestMapping("/manager/system/setting") +@RequestMapping("/manager/setting/setting") public class SettingManagerController { @Autowired private SettingService settingService; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java index a5caa8bb8..ab5a1337a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,系统设置扩展接口") -@RequestMapping("/manager/system/settingx") +@RequestMapping("/manager/setting/settingx") public class SettingXManagerController { @ApiOperation(value = "支持支付方式表单") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java index e466affd9..c07eef618 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,短信接口") -@RequestMapping("/manager/sms") +@RequestMapping("/manager/sms/sms") public class SmsManagerController { @Autowired private SmsReachService smsReachService; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java index 366363ac9..b26e3816b 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java @@ -22,7 +22,7 @@ import java.util.List; */ @RestController @Api(tags = "微信小程序消息订阅接口") -@RequestMapping("/manager/message/wechatMPMessage") +@RequestMapping("/manager/wechat/wechatMPMessage") @Transactional(rollbackFor = Exception.class) public class WechatMPMessageManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java index f2f3634ca..36a8d5936 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "管理端,微信消息接口") -@RequestMapping("/manager/message/wechat") +@RequestMapping("/manager/wechat/wechatMessage") public class WechatMessageManageController { @Autowired private WechatMessageService wechatMessageService; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java index 36dab0da7..b5dadeb2f 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = "管理端,退款统计接口") @RestController -@RequestMapping("/manager/statistics/refund/order") +@RequestMapping("/manager/statistics/refundOrder") public class RefundOrderStatisticsManagerController { @Autowired private RefundOrderStatisticsService refundOrderStatisticsService; diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java index e73b4fd9a..ac4321d5a 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java @@ -33,7 +33,7 @@ import java.util.List; */ @Api(tags = "管理端,店铺管理接口") @RestController -@RequestMapping("/manager/store") +@RequestMapping("/manager/store/store") public class StoreManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java index 5bb23e45d..f0d8586e8 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java @@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Transactional(rollbackFor = Exception.class) -@Api(tags = "管理端,店铺消息消息管理接口") -@RequestMapping("/manager/message/store") +@Api(tags = "管理端,店铺消息管理接口") +@RequestMapping("/manager/store/storeMessage") public class StoreMessageManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java index 7916995f2..00fab268f 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java @@ -26,7 +26,7 @@ import java.util.List; * @since 2021/1/6 14:11 */ @RestController -@RequestMapping("/manager/afterSale") +@RequestMapping("/manager/order/afterSale") @Api(tags = "管理端,售后接口") public class AfterSaleManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java index 6e4162550..2f1e7c13f 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java @@ -23,7 +23,7 @@ import javax.validation.Valid; * @since 2021/1/6 14:11 */ @RestController -@RequestMapping("/manager/afterSaleReason") +@RequestMapping("/manager/order/afterSaleReason") @Api(tags = "管理端,售后原因接口") public class AfterSaleReasonManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java index 68c7c69f8..d8fc9cab1 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(tags = "管理端,交易投诉接口") -@RequestMapping("/manager/complain") +@RequestMapping("/manager/order/complain") public class OrderComplaintManagerController { /** diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java index 401461e29..c5bcd87f4 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Transactional(rollbackFor = Exception.class) @Api(tags = "管理端,订单日志管理接口") -@RequestMapping("/manager/orderLog") +@RequestMapping("/manager/order/orderLog") public class OrderLogManagerController { @Autowired private OrderLogService orderLogService; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java index 27c7faa16..4d247f90e 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java @@ -31,7 +31,7 @@ import java.util.List; * @since 2020/11/17 4:34 下午 */ @RestController -@RequestMapping("/manager/orders") +@RequestMapping("/manager/order/order") @Api(tags = "管理端,订单API") public class OrderManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java index 48a58eb4e..aa61f83cf 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,收款日志接口") -@RequestMapping("/manager/paymentLog") +@RequestMapping("/manager/order/paymentLog") @Transactional(rollbackFor = Exception.class) public class PaymentLogManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java index 984ad00ca..f7429a340 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @Api(tags = "管理端,发票记录接口") -@RequestMapping("/manager/receipt") +@RequestMapping("/manager/trade/receipt") public class ReceiptManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java index cac4e44e6..152739d82 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,预存款充值记录接口") -@RequestMapping("/manager/recharge") +@RequestMapping("/manager/wallet/recharge") @Transactional(rollbackFor = Exception.class) public class RechargeManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java index 597e69d5f..8ca6c8df6 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "管理端,退款日志接口") -@RequestMapping("/manager/refundLog") +@RequestMapping("/manager/order/refundLog") @Transactional(rollbackFor = Exception.class) public class RefundLogManagerController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java index 273e7babc..2c377dbff 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = "店铺端,分类绑定参数组管理接口") -@RequestMapping("/store/goods/category/parameters") +@RequestMapping("/store/goods/categoryParameters") @Transactional(rollbackFor = Exception.class) public class CategoryParameterGroupStoreController { diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java index 656efb436..63acdd857 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java @@ -22,7 +22,7 @@ import java.util.List; */ @RestController @Api(tags = "店铺端,商品分类规格接口") -@RequestMapping("/store/goods/category/spec") +@RequestMapping("/store/goods/categorySpec") @Transactional(rollbackFor = Exception.class) public class CategorySpecificationStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java index 490526fd1..556f6dace 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java @@ -27,7 +27,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,草稿商品接口") -@RequestMapping("/store/draft/goods") +@RequestMapping("/store/goods/draftGoods") public class DraftGoodsStoreController { @Autowired private DraftGoodsService draftGoodsService; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index 5d9d8f357..4615dcba6 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -39,7 +39,7 @@ import java.util.stream.Collectors; */ @RestController @Api(tags = "店铺端,商品接口") -@RequestMapping("/store/goods") +@RequestMapping("/store/goods/goods") public class GoodsStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java index 4a1ff7640..9a247c67d 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "店铺端,商品计量单位接口") -@RequestMapping("/store/goods/unit") +@RequestMapping("/store/goods/goodsUnit") @Transactional(rollbackFor = Exception.class) public class GoodsUnitStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java index 8a6778f89..3c0c51b59 100644 --- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java +++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "店铺端,管理员接口") -@RequestMapping("/store/user") +@RequestMapping("/store/member/user") public class StoreUserController { @Autowired private MemberService memberService; diff --git a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java similarity index 95% rename from seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java rename to seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java index 73bd5b385..473754970 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.article; +package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "店铺端,文章接口") -@RequestMapping("/store/article") +@RequestMapping("/store/other/article") public class ArticleStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/LogisticsStoreController.java similarity index 97% rename from seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java rename to seller-api/src/main/java/cn/lili/controller/other/LogisticsStoreController.java index 188db0cea..04a5cf8c5 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/LogisticsStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.settings; +package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; @@ -25,7 +25,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,物流公司接口") -@RequestMapping("/store/logistics") +@RequestMapping("/store/other/logistics") public class LogisticsStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java index 6a863e73c..9fa92ae4f 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java @@ -26,7 +26,7 @@ import java.util.List; */ @RestController @Api(tags = "店铺端,直播商品接口") -@RequestMapping("/store/broadcast/commodity") +@RequestMapping("/store/other/broadcast/commodity") public class CommodityStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java index d64ab9b8c..067c7fbd7 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java @@ -29,7 +29,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,直播间接口") -@RequestMapping("/store/broadcast/studio") +@RequestMapping("/store/other/broadcast/studio") public class StudioStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java index 2dfb6d5d6..92e907097 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java @@ -29,7 +29,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,分销商品接口") -@RequestMapping("/store/distributionGoods") +@RequestMapping("/store/distribution/goods") public class DistributionGoodsStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java index ab18fba4d..e3d97183b 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java @@ -24,7 +24,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,分销订单接口") -@RequestMapping("/store/distributionOrder") +@RequestMapping("/store/distribution/order") public class DistributionOrderStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index 531857daf..4513b1372 100644 --- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java +++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java @@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "店铺端,商家登录接口 ") -@RequestMapping("/store/login") +@RequestMapping("/store/passport/login") public class StorePassportController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java index 0d3c9c1e5..0232f21f4 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java @@ -24,7 +24,7 @@ import java.util.Objects; **/ @RestController @Api(tags = "店铺端,运费模板接口") -@RequestMapping("/store/freightTemplate") +@RequestMapping("/store/settings/freightTemplate") public class FreightTemplateStoreController { @Autowired private FreightTemplateService freightTemplateService; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java index e319db0a9..6c17527cd 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java @@ -27,7 +27,7 @@ import java.util.Objects; @RestController @Transactional(rollbackFor = Exception.class) @Api(tags = "店铺端,日志管理接口") -@RequestMapping("/store/log") +@RequestMapping("/store/settings/log") public class LogStoreController { @Autowired private SystemLogService systemLogService; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java index 48930caa2..85d5d5d20 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java @@ -26,7 +26,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,商家地址（自提点）接口") -@RequestMapping("/store/storeAddress") +@RequestMapping("/store/settings/storeAddress") public class StoreAddressController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java index 679b7636c..5f2fffab0 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java @@ -29,7 +29,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,消息接口") -@RequestMapping("/store/message") +@RequestMapping("/store/message/storeMessage") public class StoreMessageController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java index bb269bef8..2efc96559 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java @@ -31,7 +31,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,页面接口") -@RequestMapping("/store/pageData") +@RequestMapping("/store/settings/pageData") public class StorePageDataController { @Autowired private PageDataService pageDataService; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java index 9f3e1267b..15f1fc075 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java @@ -27,7 +27,7 @@ import javax.validation.Valid; */ @RestController @Api(tags = "店铺端,店铺设置接口") -@RequestMapping("/store/settings") +@RequestMapping("/store/settings/storeSettings") public class StoreSettingsController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java index 0619e9bd1..6b13166e5 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java @@ -25,7 +25,7 @@ import java.util.Objects; */ @Api(tags = "店铺端,退款统计接口") @RestController -@RequestMapping("/store/statistics/refund/order") +@RequestMapping("/store/statistics/refundOrder") public class RefundOrderStatisticsStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java index ffff571f3..8ab2c6df6 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java @@ -30,7 +30,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,售后管理接口") -@RequestMapping("/store/afterSale") +@RequestMapping("/store/order/afterSale") public class AfterSaleStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java index 7b6101f07..88add03f6 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java @@ -30,7 +30,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,结算单接口") -@RequestMapping("/store/bill") +@RequestMapping("/store/member/bill") public class BillStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java index 3c320774d..db07c5451 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java @@ -26,7 +26,7 @@ import java.util.Objects; */ @RestController @Api(tags = "店铺端,商品评价管理接口") -@RequestMapping("/store/memberEvaluation") +@RequestMapping("/store/member/evaluation") public class MemberEvaluationStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java index 2be516aee..b2ed9a922 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java @@ -29,7 +29,7 @@ import java.util.Objects; **/ @RestController @Api(tags = "店铺端,交易投诉接口") -@RequestMapping("/store/complain") +@RequestMapping("/store/order/complain") public class OrderComplaintStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java index eb10a8982..a3e1aa413 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java @@ -25,7 +25,7 @@ import java.util.List; **/ @RestController @Api(tags = "店铺端,订单日志接口") -@RequestMapping("/store/orderLog") +@RequestMapping("/store/order/orderLog") public class OrderLogStoreController { @Autowired diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java index fe6cfec66..5fd12d490 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java @@ -40,7 +40,7 @@ import java.util.Objects; **/ @Slf4j @RestController -@RequestMapping("/store/orders") +@RequestMapping("/store/order/order") @Api(tags = "店铺端,订单接口") public class OrderStoreController { diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java index 25af43dc3..59c51be67 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java @@ -27,7 +27,7 @@ import java.util.Objects; **/ @RestController @Api(tags = "店铺端,发票接口") -@RequestMapping("/store/receipt") +@RequestMapping("/store/trade/receipt") public class ReceiptStoreController { @Autowired