From 53767614fe99b0985a6b7aad5bdda7b33eaf1d7d Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 4 Feb 2023 20:38:51 +0800 Subject: [PATCH] 增加商城的提示 --- yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java | 4 ++++ yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/package-info.java | 2 +- yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/OrderWebConfiguration.java | 24 ------------------------ yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java | 24 ++++++++++++++++++++++++ yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java | 2 +- yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java | 8 ++++++++ yudao-ui-admin/src/components/DocAlert/index.vue | 1 + yudao-ui-admin/src/utils/request.js | 7 +++++++ yudao-ui-admin/src/views/infra/build/RightPanel.vue | 4 ++-- yudao-ui-admin/src/views/mall/market/banner/index.vue | 1 + yudao-ui-admin/src/views/mall/product/brand/index.vue | 3 ++- yudao-ui-admin/src/views/mall/product/category/index.vue | 1 + yudao-ui-admin/src/views/mall/product/property/index.vue | 1 + yudao-ui-admin/src/views/mall/product/property/value.vue | 2 ++ yudao-ui-admin/src/views/mall/product/spu/index.vue | 2 ++ yudao-ui-admin/src/views/mall/promotion/coupon/index.vue | 2 ++ yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue | 1 + yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue | 1 + yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue | 1 + yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue | 1 + yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue | 1 + yudao-ui-admin/src/views/mall/trade/afterSale/index.vue | 1 + yudao-ui-admin/src/views/mall/trade/order/index.vue | 2 ++ 23 files changed, 67 insertions(+), 29 deletions(-) delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/OrderWebConfiguration.java create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java b/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java index 645444e..c01d419 100644 --- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java +++ b/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java @@ -44,6 +44,10 @@ public class BannerApplicationRunner implements ApplicationRunner { if (isNotPresent("cn.iocoder.yudao.module.mp.framework.mp.config.MpConfiguration")) { System.out.println("[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]"); } + // 微信公众号 + if (isNotPresent("cn.iocoder.yudao.module.trade.framework.web.config.TradeWebConfiguration")) { + System.out.println("[商城 yudao-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]"); + } }); } diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/package-info.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/package-info.java index 02e4c81..68c6711 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/package-info.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/package-info.java @@ -1,5 +1,5 @@ /** - * 属于 order 模块的 framework 封装 + * 属于 trade 模块的 framework 封装 * * @author 芋道源码 */ diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/OrderWebConfiguration.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/OrderWebConfiguration.java deleted file mode 100644 index d979dba..0000000 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/OrderWebConfiguration.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.iocoder.yudao.module.trade.framework.web.config; - -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; -import org.springdoc.core.GroupedOpenApi; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * order 模块的 web 组件的 Configuration - * - * @author 芋道源码 - */ -@Configuration(proxyBeanMethods = false) -public class OrderWebConfiguration { - - /** - * order 模块的 API 分组 - */ - @Bean - public GroupedOpenApi orderGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("order"); - } - -} diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java new file mode 100644 index 0000000..707eaa8 --- /dev/null +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.trade.framework.web.config; + +import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import org.springdoc.core.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * trade 模块的 web 组件的 Configuration + * + * @author 芋道源码 + */ +@Configuration(proxyBeanMethods = false) +public class TradeWebConfiguration { + + /** + * trade 模块的 API 分组 + */ + @Bean + public GroupedOpenApi tradeGroupedOpenApi() { + return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("trade"); + } + +} diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java index d383c9e..2081798 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java @@ -1,4 +1,4 @@ /** - * order 模块的 web 配置 + * trade 模块的 web 配置 */ package cn.iocoder.yudao.module.trade.framework.web; diff --git a/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java b/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java index 4cf1005..ab328b4 100644 --- a/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java +++ b/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java @@ -27,4 +27,12 @@ public class DefaultController { "[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]"); } + @RequestMapping(value = {"/admin-api/product/**", // 商品中心 + "/admin-api/trade/**", // 交易中心 + "/admin-api/promotion/**"}) // 营销中心 + public CommonResult mall404() { + return CommonResult.error(NOT_IMPLEMENTED.getCode(), + "[商城 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]"); + } + } diff --git a/yudao-ui-admin/src/components/DocAlert/index.vue b/yudao-ui-admin/src/components/DocAlert/index.vue index 1344b09..5692989 100644 --- a/yudao-ui-admin/src/components/DocAlert/index.vue +++ b/yudao-ui-admin/src/components/DocAlert/index.vue @@ -28,5 +28,6 @@ export default { diff --git a/yudao-ui-admin/src/utils/request.js b/yudao-ui-admin/src/utils/request.js index 525155f..a501686 100644 --- a/yudao-ui-admin/src/utils/request.js +++ b/yudao-ui-admin/src/utils/request.js @@ -119,6 +119,13 @@ service.interceptors.response.use(async res => { type: 'error' }) return Promise.reject(new Error(msg)) + } else if (code === 501) { + Message({ + type: 'error', + duration: 0, + message: msg + }) + return Promise.reject(new Error(msg)) } else if (code === 901) { Message({ type: 'error', diff --git a/yudao-ui-admin/src/views/infra/build/RightPanel.vue b/yudao-ui-admin/src/views/infra/build/RightPanel.vue index 127b703..f6fa610 100644 --- a/yudao-ui-admin/src/views/infra/build/RightPanel.vue +++ b/yudao-ui-admin/src/views/infra/build/RightPanel.vue @@ -545,7 +545,7 @@ -