From 1f533517587657492e58558f1e5bc080ceae67de Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sun, 19 Mar 2023 13:11:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=85=A8=E5=B1=80):=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E5=8D=87=E7=BA=A7=20=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=20Ant-Design-Vue3.x=20Vue3.2.x=20vite2.9.15=20BREAKIN?= =?UTF-8?q?G=20CHANGE:=20=E9=87=8D=E6=9E=84=E5=88=B0vben=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc-common-biz/src/main/resources/bootstrap.yml | 2 +- .../com/cloud/kicc/system/service/impl/MenuServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml index ef9f43c9..3245e7c3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: cloud: nacos: discovery: - ip: @profiles.ip@ + #ip: @profiles.ip@ server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java index 967be138..83222670 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java @@ -85,7 +85,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me // 外链配置,自动识别填充IFRAME (两种模式,跳转页面) } else if (StrUtil.equalsIgnoreCase(MenuEnum.MENU_C.getValue(), menu.getType()) && ReUtil.isMatch(RegexConstants.MATCHER_URL, menu.getPath())) { - menuVo.setComponent(MenuEnum.COMPONENT_IFRAME.getValue()); + menuVo.setComponent(MenuEnum.COMPONENT_PARENT_LAYOUT.getValue()); // 外链配置 (两种模式,内嵌页面) } else if (StrUtil.equalsIgnoreCase(MenuEnum.MENU_C.getValue(), menu.getType()) && ReUtil.isMatch(RegexConstants.MATCHER_URL, menu.getComponent())) {