Browse Source

refactor(全局): 重构升级

升级依赖
Ant-Design-Vue3.x
Vue3.2.x
vite2.9.15
BREAKING CHANGE: 重构到vben最新分支
master
wangxiang 2 years ago
parent
commit
1f53351758
  1. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
  2. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java

2
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml

@ -7,7 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
ip: @profiles.ip@ #ip: @profiles.ip@
server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@

2
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<MenuMapper, Menu> implements Me
// 外链配置,自动识别填充IFRAME (两种模式,跳转页面) // 外链配置,自动识别填充IFRAME (两种模式,跳转页面)
} else if (StrUtil.equalsIgnoreCase(MenuEnum.MENU_C.getValue(), menu.getType()) && ReUtil.isMatch(RegexConstants.MATCHER_URL, menu.getPath())) { } 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())) { } else if (StrUtil.equalsIgnoreCase(MenuEnum.MENU_C.getValue(), menu.getType()) && ReUtil.isMatch(RegexConstants.MATCHER_URL, menu.getComponent())) {

Loading…
Cancel
Save