diff --git a/system-test/src/main/java/com/mall4j/cloud/systemtest/api/platform/PlatformWalletApi.java b/system-test/src/main/java/com/mall4j/cloud/systemtest/api/platform/PlatformWalletApi.java index cb7d0ad..41efc8c 100644 --- a/system-test/src/main/java/com/mall4j/cloud/systemtest/api/platform/PlatformWalletApi.java +++ b/system-test/src/main/java/com/mall4j/cloud/systemtest/api/platform/PlatformWalletApi.java @@ -19,7 +19,7 @@ public class PlatformWalletApi { * 根据订单号查询结算记录 */ public static List getMongoShopWalletLogBO(Long orderId) { - String url = Constant.API_URL + "/tmerclub_admin/mp/shop_wallet/page?platformIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10"; + String url = Constant.API_URL + "/tmerclub_admin/ma/shopWallet/page?platformIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10"; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.PLATFORM)), PageVO.class).getList()), MongoShopWalletLogBO.class); } diff --git a/system-test/src/main/java/com/mall4j/cloud/systemtest/api/store/ShopWalletApi.java b/system-test/src/main/java/com/mall4j/cloud/systemtest/api/store/ShopWalletApi.java index 1bb8392..70f6a4b 100644 --- a/system-test/src/main/java/com/mall4j/cloud/systemtest/api/store/ShopWalletApi.java +++ b/system-test/src/main/java/com/mall4j/cloud/systemtest/api/store/ShopWalletApi.java @@ -19,7 +19,7 @@ public class ShopWalletApi { * 根据订单号查询结算记录 */ public static List getMongoShopWalletLogBO(Long orderId, Boolean isMainShop) { - String url = Constant.API_URL + "/tmerclub_admin/mp/shop_wallet/page?shopIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10"; + String url = Constant.API_URL + "/tmerclub_admin/ma/shopWallet/page?shopIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10"; if(isMainShop) { return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.SHOP)), PageVO.class).getList()), MongoShopWalletLogBO.class); } else { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java index 6bf1115..1d4e170 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java @@ -23,7 +23,8 @@ import java.util.Objects; * @date 2022/9/13 14:06 */ @RestController("adminCompanyAuditingController") -@RequestMapping("/mp/shop_company_auditing") +@RequestMapping("/ma/shopAuditing") +//@RequestMapping("/mp/shop_company_auditing") @Tag(name = "admin-工商信息审核情况") public class CompanyAuditingController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java index 0b069ef..230d2a1 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java @@ -30,7 +30,8 @@ import java.util.Objects; * @date 2021-01-27 09:10:00 */ @RestController("adminHotSearchController") -@RequestMapping("/mp/hot_search") +@RequestMapping("/ma/hotQuery") +//@RequestMapping("/mp/hot_search") @Tag(name = "admin-热搜") public class HotSearchController { private static final Logger log = LoggerFactory.getLogger(HotSearchController.class); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java index c3a794e..c07fdf3 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java @@ -29,7 +29,8 @@ import java.util.Objects; * @date 2020-11-24 16:38:32 */ @RestController("adminIndexImgController") -@RequestMapping("/mp/index_img") +@RequestMapping("/ma/indexPic") +//@RequestMapping("/mp/index_img") @Tag(name = "admin-轮播图") public class IndexImgController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/NoticeController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/NoticeController.java index c8c59a3..06c5dbe 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/NoticeController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/NoticeController.java @@ -35,7 +35,8 @@ import java.util.stream.Collectors; * @date 2020-11-25 17:57:56 */ @RestController("adminNoticeController") -@RequestMapping("/mp/notice") +@RequestMapping("/ma/notice") +//@RequestMapping("/mp/notice") @Tag(name = "admin-公告") public class NoticeController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java index 39bffb9..4e033c0 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java @@ -28,7 +28,8 @@ import java.util.Objects; * @Date 2021/8/14 16:53 */ @RestController("adminShopCompanyController") -@RequestMapping("/mp/shop_company") +@RequestMapping("/ma/shopCompany") +//@RequestMapping("/mp/shop_company") @Tag(name = "admin-商家工商信息") public class ShopCompanyController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java index 537d60a..d504910 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java @@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.RestController; * @Date 2021/8/14 16:45 */ @RestController("adminShopDetailController") -@RequestMapping("/mp/shop_detail") +@RequestMapping("/ma/shopDetail") +//@RequestMapping("/mp/shop_detail") @Tag(name = "admin-店铺信息") public class ShopDetailController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java index 9f0c902..aaf5fc7 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java @@ -28,7 +28,8 @@ import java.util.Objects; * @date 2021-01-15 17:46:26 */ @RestController("shopOfflineHandleEventController") -@RequestMapping("/mp/shop_offline_handle_event") +@RequestMapping("/ma/offlineEvent") +//@RequestMapping("/mp/shop_offline_handle_event") @Tag(name = "admin-下线处理事件") public class ShopOfflineHandleEventController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java index 2c41127..c612c27 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java @@ -21,7 +21,8 @@ import org.springframework.web.bind.annotation.RestController; * @Date 2022/6/30 17:23 */ @RestController("adminShopRechargeController") -@RequestMapping("/mp/shop_recharge") +@RequestMapping("/ma/shopCharge") +//@RequestMapping("/mp/shop_recharge") @Tag(name = "admin-商家充值记录信息") public class ShopRechargeController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java index f71ae6c..f54a213 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java @@ -27,7 +27,8 @@ import java.util.List; * @date 2021-01-27 09:10:00 */ @RestController("adminShopRefundAddrController") -@RequestMapping("/mp/shop_refund_addr") +@RequestMapping("/ma/ShopRedundAddr") +//@RequestMapping("/mp/shop_refund_addr") @Tag(name = "admin-退货地址") public class ShopRefundAddrController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java index 69a0128..fe2bc55 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java @@ -24,7 +24,8 @@ import java.util.Objects; * @author Orange */ @RestController("adminShopRenovationController") -@RequestMapping("/mp/shop_renovation") +@RequestMapping("/ma/shopRenovation") +//@RequestMapping("/mp/shop_renovation") @Tag(name = "店铺装修信息") public class ShopRenovationController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java index dd5b46c..4ec2ff4 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java @@ -23,7 +23,8 @@ import java.util.Objects; * @author 菠萝凤梨 */ @RestController("adminShopRenovationUpDelController") -@RequestMapping("/mp/shop_renovation") +@RequestMapping("/ma/shopRenovation") +//@RequestMapping("/mp/shop_renovation") @Tag(name = "店铺页面-修改、删除、设为主页") public class ShopRenovationUpDelController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java index 40b0058..2c5c20e 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java @@ -26,7 +26,8 @@ import java.util.Objects; * @author Orange */ @RestController("multishopShopTemplateController") -@RequestMapping("/mp/shop_template") +@RequestMapping("/ma/shopTemplate") +//@RequestMapping("/mp/shop_template") @Tag(name = "店铺装修模板") public class ShopTemplateController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java index 6b61856..20b3591 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java @@ -18,11 +18,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; -/** - * @author 菠萝凤梨 - */ @RestController("adminShopTemplateUpDelController") -@RequestMapping("/mp/shop_template") +@RequestMapping("/ma/shopTemplate") +//@RequestMapping("/mp/shop_template") @Tag(name = "店铺装修模板-修改、删除、设为主页") public class ShopTemplateUpDelController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java index 56895cb..4afaa97 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java @@ -30,7 +30,8 @@ import java.util.Objects; * @date 2021/6/8 19:46 */ @RestController("adminShopWalletController") -@RequestMapping("/mp/shop_wallet") +@RequestMapping("/ma/shopWallet") +//@RequestMapping("/mp/shop_wallet") @Tag(name = "admin-店铺钱包") public class ShopWalletController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java index dbcb768..eb35653 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java @@ -26,7 +26,8 @@ import java.util.Objects; * @Date 2021/6/11 9:23 */ @RestController("adminShopWithdrawCashController") -@RequestMapping("/mp/shop_withdraw_cash") +@RequestMapping("/ma/shopWithdrwaCash") +//@RequestMapping("/mp/shop_withdraw_cash") @Tag(name = "admin-商家提现申请信息") public class ShopWithdrawCashController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java index af7edaf..bd7b11a 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java @@ -23,7 +23,8 @@ import java.util.List; * @date 2021-01-27 09:10:00 */ @RestController("appHotSearchController") -@RequestMapping("/ua/app/hot_search") +@RequestMapping("/mua/app/hotQuery") +//@RequestMapping("/ua/app/hot_search") @Tag(name = "app-热搜") public class HotSearchController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java index eb83592..25c6a87 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java @@ -23,7 +23,8 @@ import java.util.List; * @date 2020-11-24 16:38:32 */ @RestController("appIndexImgController") -@RequestMapping("/ua/index_img") +@RequestMapping("/mua/app/indexPic") +//@RequestMapping("/ua/index_img") @Tag(name = "app-轮播图") public class IndexImgController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/NoticeController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/NoticeController.java index 13dd833..dbc36e5 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/NoticeController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/NoticeController.java @@ -36,7 +36,8 @@ import java.util.stream.Collectors; * @date 2020-11-25 17:57:56 */ @RestController("appNoticeController") -@RequestMapping("/ma/notice") +@RequestMapping("/mua/app/notice") +//@RequestMapping("/ma/notice") @Tag(name = "app-公告") public class NoticeController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java index c864c3c..d1b9108 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java @@ -25,7 +25,8 @@ import java.util.List; * @date 2021-02-23 14:41:42 */ @RestController("appUserCollectionShopController") -@RequestMapping("/user_collection_shop") +@RequestMapping("/mua/app/userFavorite") +//@RequestMapping("/user_collection_shop") @Tag(name = "app-用户店铺收藏记录") public class ShopCollectionController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java index 08b9884..fd6c79c 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java @@ -32,7 +32,8 @@ import java.util.Objects; * @date 2020-12-05 15:50:25 */ @RestController("appShopDetailController") -@RequestMapping("/ua/shop_detail") +@RequestMapping("/mua/app/shopDetail") +//@RequestMapping("/ua/shop_detail") @Tag(name = "app-店铺详情") public class ShopDetailController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java index 96e1480..a3455b7 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java @@ -24,7 +24,8 @@ import java.util.Objects; * @date 2022-08-12 11:27:18 */ @RestController("appShopRenovationController") -@RequestMapping("/ua/shop_renovation") +@RequestMapping("/mua/app/shopRenovation") +//@RequestMapping("/ua/shop_renovation") @Tag(name = "app-店铺装修信息") public class ShopRenovationController { private static final Logger logger = LoggerFactory.getLogger(ShopRenovationController.class); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java index c933c24..d0a8c4f 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java @@ -27,7 +27,8 @@ import java.util.Objects; * @Author lth * @Date 2021/5/12 20:27 */ -@RequestMapping("/m/apply_shop/shop_user") +@RequestMapping("/mm/apply/shopUser") +//@RequestMapping("/m/apply_shop/shop_user") @RestController("multishopShopUserController") @Tag(name = "multishop-店铺用户信息") public class ApplyShopUserController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java index cef88d2..3ac560b 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java @@ -22,7 +22,8 @@ import java.util.Objects; * @date 2022/9/13 14:06 */ @RestController("multishopCompanyAuditingController") -@RequestMapping("/m/shop_company_auditing") +@RequestMapping("/mm/apply/shopAuditing") +//@RequestMapping("/m/shop_company_auditing") @Tag(name = "multishop-店铺变更工商信息") public class CompanyAuditingController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java index c8128c5..610071e 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java @@ -29,7 +29,8 @@ import java.util.Objects; * @author person */ @RestController("multishopShopApplyController") -@RequestMapping("/m/apply_shop/shop_apply") +@RequestMapping("/mm/apply/shopApply") +//@RequestMapping("/m/apply_shop/shop_apply") @Tag(name = "multishop-店铺申请") public class ShopApplyController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java index 97bd42c..28bdbb5 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java @@ -30,7 +30,8 @@ import java.util.Objects; * @author lth */ @RestController("multishopShopBankCardController") -@RequestMapping("/m/apply_shop/shop_bank_card") +@RequestMapping("/mm/apply/shopBankCard") +//@RequestMapping("/m/apply_shop/shop_bank_card") @Tag(name = "multishop-店铺银行卡信息") public class ShopBankCardController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java index dd31652..ae07e57 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java @@ -34,7 +34,8 @@ import java.util.Objects; * @Date 2021/4/25 16:31 */ @RestController -@RequestMapping("/m/apply_shop/shop_company") +@RequestMapping("/mm/apply/shopCompany") +//@RequestMapping("/m/apply_shop/shop_company") @Tag(name = "multishop-店铺工商信息") public class ShopCompanyController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java index dbe1e3e..bdc2108 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java @@ -31,7 +31,8 @@ import java.util.Objects; * @author lth */ @RestController("multishopShopDetailController") -@RequestMapping("/m/apply_shop/shop_detail") +@RequestMapping("/mm/apply/shoDetail") +//@RequestMapping("/m/apply_shop/shop_detail") @Tag(name = "multishop-店铺信息") public class ShopDetailController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java index fc09a26..1302b41 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java @@ -33,7 +33,8 @@ import java.util.Objects; * @author chiley */ @RestController("multishopRechargeController") -@RequestMapping("/m/shop_recharge") +@RequestMapping("/mm/shopCharge") +//@RequestMapping("/m/shop_recharge") @Tag(name = "multishop-商家余额充值") public class ShopRechargeController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java index 7114f73..94554e9 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java @@ -23,7 +23,8 @@ import java.util.Objects; * @date 2022-06-22 17:09:12 */ @RestController("multishopShopSubstituteSalesController") -@RequestMapping("/m/shop_substitute_sales") +@RequestMapping("/mm/shopSaleAgent") +//@RequestMapping("/m/shop_substitute_sales") @Tag(name = "代销设置表") public class ShopSubstituteSalesController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java index 11a929d..2c6b8cc 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java @@ -38,7 +38,8 @@ import java.util.Objects; * @author tmerclub * @date 2020/09/02 */ -@RequestMapping("/m/shop_user") +@RequestMapping("/mm/shopUser") +//@RequestMapping("/m/shop_user") @RestController @Tag(name = "店铺用户信息") public class ShopUserController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java index e0db46f..be8b07a 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java @@ -21,7 +21,8 @@ import java.util.Objects; * @author lth */ @RestController("multishopShopUserRegisterController") -@RequestMapping("/ua/shop_user_register") +@RequestMapping("/mm/shopUserRegister") +//@RequestMapping("/ua/shop_user_register") @Tag(name = "multishop-商家注册") public class ShopUserRegisterController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java index c1823cb..00c5649 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java @@ -21,7 +21,8 @@ import java.util.Objects; * @author tmerclub */ @RestController("multishopShopWithdrawCashController") -@RequestMapping("/m/shop_withdraw_cash") +@RequestMapping("/mm/shopWithdrawalApply") +//@RequestMapping("/m/shop_withdraw_cash") @Tag(name = "multishop-商家提现申请信息") public class ShopWithdrawCashController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java index 66231da..7a51d39 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java @@ -40,7 +40,8 @@ import java.util.Objects; * @date 2021-02-01 17:10:35 */ @RestController("platformShopAuditingController") -@RequestMapping("/p/shop_auditing") +@RequestMapping("/mup/platformAuditing") +//@RequestMapping("/p/shop_auditing") @Tag(name = "platform-平台审核信息") public class ShopAuditingController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java index aaa247e..a0aed4f 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java @@ -27,7 +27,8 @@ import java.util.Objects; * @Date 2021/4/26 10:09 */ @RestController -@RequestMapping("/p/shop_bank_card") +@RequestMapping("/mup/shopBankCard") +//@RequestMapping("/p/shop_bank_card") @Tag(name = "platform-店铺银行卡信息") public class ShopBankCardController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopCompanyController.java index 44d94a5..1e262ae 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopCompanyController.java @@ -28,7 +28,8 @@ import java.util.Objects; * @author lth */ @RestController("platformShopCompanyController") -@RequestMapping("/p/shop_company") +@RequestMapping("/mup/shopInfo") +//@RequestMapping("/p/shop_company") @Tag(name = "platform-商家工商信息") public class ShopCompanyController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java index c4af9fc..aebf756 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java @@ -40,7 +40,8 @@ import java.util.Objects; * @date 2020-12-05 15:50:25 */ @RestController("platformShopDetailController") -@RequestMapping("/p/shop_detail") +@RequestMapping("/mup/shopDetail") +//@RequestMapping("/p/shop_detail") @Tag(name = "platform-店铺信息") public class ShopDetailController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopWithdrawCashController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopWithdrawCashController.java index cae363d..93501fe 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopWithdrawCashController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopWithdrawCashController.java @@ -17,7 +17,8 @@ import org.springframework.web.bind.annotation.*; * @Date 2021/6/11 9:28 */ @RestController("platformShopWithdrawCashController") -@RequestMapping("/p/shop_withdraw_cash") +@RequestMapping("/mup/shopWithdrawalApply") +//@RequestMapping("/p/shop_withdraw_cash") @Tag(name = "platform-商家提现申请信息") public class ShopWithdrawCashController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java index ce2712b..2a5692e 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java @@ -25,7 +25,8 @@ import java.util.Objects; * @Author lth * @Date 2021/5/12 20:27 */ -@RequestMapping("/s/apply_shop/shop_user") +@RequestMapping("/mus/shopUser") +//@RequestMapping("/s/apply_shop/shop_user") @RestController("supplierShopUserController") @Tag(name = "supplier-店铺用户信息") public class ApplyShopUserController { diff --git a/tmerclub-admin/src/main/resources/bootstrap.yml b/tmerclub-admin/src/main/resources/bootstrap.yml index e8361e8..427611c 100644 --- a/tmerclub-admin/src/main/resources/bootstrap.yml +++ b/tmerclub-admin/src/main/resources/bootstrap.yml @@ -27,5 +27,8 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11112} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-auth/src/main/resources/bootstrap.yml b/tmerclub-auth/src/main/resources/bootstrap.yml index 24301c1..061b7fa 100644 --- a/tmerclub-auth/src/main/resources/bootstrap.yml +++ b/tmerclub-auth/src/main/resources/bootstrap.yml @@ -27,10 +27,7 @@ logging: dubbo: protocol: port: ${TMERCLUB_DUBBO_PORT:11101} - # host: ${spring.cloud.nacos.discovery.ip} consumer: loadbalance: dev - # registry: - # address: nacos://${spring.cloud.nacos.discovery.server-addr} - # parameters: - # namespace: ${spring.cloud.nacos.discovery.namespace} + registry: + group: dubbo-default diff --git a/tmerclub-biz/src/main/resources/bootstrap.yml b/tmerclub-biz/src/main/resources/bootstrap.yml index 49c4119..35aab0a 100644 --- a/tmerclub-biz/src/main/resources/bootstrap.yml +++ b/tmerclub-biz/src/main/resources/bootstrap.yml @@ -28,4 +28,7 @@ logging: dubbo: protocol: port: ${TMERCLUB_DUBBO_PORT:11118} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-flow/src/main/resources/bootstrap.yml b/tmerclub-flow/src/main/resources/bootstrap.yml index 0924990..1f0d2d1 100644 --- a/tmerclub-flow/src/main/resources/bootstrap.yml +++ b/tmerclub-flow/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${TMERCLUB_DUBBO_PORT:11116} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-group/src/main/resources/bootstrap.yml b/tmerclub-group/src/main/resources/bootstrap.yml index 7fc3f41..d27a135 100644 --- a/tmerclub-group/src/main/resources/bootstrap.yml +++ b/tmerclub-group/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11114} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-im/src/main/resources/bootstrap.yml b/tmerclub-im/src/main/resources/bootstrap.yml index ae9d3b5..6752b7f 100644 --- a/tmerclub-im/src/main/resources/bootstrap.yml +++ b/tmerclub-im/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11120} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-marketing/src/main/resources/bootstrap.yml b/tmerclub-marketing/src/main/resources/bootstrap.yml index 535ac85..c4edc22 100644 --- a/tmerclub-marketing/src/main/resources/bootstrap.yml +++ b/tmerclub-marketing/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11109} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-order/src/main/resources/bootstrap.yml b/tmerclub-order/src/main/resources/bootstrap.yml index 4152e53..fe8527a 100644 --- a/tmerclub-order/src/main/resources/bootstrap.yml +++ b/tmerclub-order/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11106} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-payment/src/main/resources/bootstrap.yml b/tmerclub-payment/src/main/resources/bootstrap.yml index e4e9ff9..7a2953f 100644 --- a/tmerclub-payment/src/main/resources/bootstrap.yml +++ b/tmerclub-payment/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11113} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-product/src/main/resources/bootstrap.yml b/tmerclub-product/src/main/resources/bootstrap.yml index fcf99e2..581126c 100644 --- a/tmerclub-product/src/main/resources/bootstrap.yml +++ b/tmerclub-product/src/main/resources/bootstrap.yml @@ -33,4 +33,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11104} - #host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-search/src/main/resources/bootstrap.yml b/tmerclub-search/src/main/resources/bootstrap.yml index 7006372..13527b8 100644 --- a/tmerclub-search/src/main/resources/bootstrap.yml +++ b/tmerclub-search/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11108} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-seckill/src/main/resources/bootstrap.yml b/tmerclub-seckill/src/main/resources/bootstrap.yml index 7ad5bdb..48fb14e 100644 --- a/tmerclub-seckill/src/main/resources/bootstrap.yml +++ b/tmerclub-seckill/src/main/resources/bootstrap.yml @@ -27,4 +27,7 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11115} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default diff --git a/tmerclub-user/src/main/resources/bootstrap.yml b/tmerclub-user/src/main/resources/bootstrap.yml index 17bdfa5..bdff9b3 100644 --- a/tmerclub-user/src/main/resources/bootstrap.yml +++ b/tmerclub-user/src/main/resources/bootstrap.yml @@ -34,5 +34,8 @@ logging: dubbo: protocol: port: ${tmerclub_DUBBO_PORT:11105} - host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + registry: + group: dubbo-default