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())) {