修改URL和添加dubbo组

This commit is contained in:
liubozhi 2025-04-08 17:35:07 +08:00
parent e0c41b11f1
commit 067195ff69
53 changed files with 128 additions and 60 deletions

View File

@ -19,7 +19,7 @@ public class PlatformWalletApi {
* 根据订单号查询结算记录
*/
public static List<MongoShopWalletLogBO> 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);
}

View File

@ -19,7 +19,7 @@ public class ShopWalletApi {
* 根据订单号查询结算记录
*/
public static List<MongoShopWalletLogBO> 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 {

View File

@ -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 {

View File

@ -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);

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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);

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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