From 8231953e29bb6025b89c244d48c69bb9ce3d8057 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 09:37:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/store/modules/permission.js | 3 +
ruoyi-ui/src/components/HeaderSearch/index.vue | 4 +
ruoyi-ui/src/components/Editor/index.vue | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java | 5 +
ruoyi-ui/src/layout/components/AppMain.vue | 2
ruoyi-ui/src/layout/components/InnerLink/index.vue | 27 +++++++++
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 5 +
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java | 5 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 36 ++++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java | 29 +++++++++
ruoyi-ui/src/router/index.js | 1
13 files changed, 110 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
new file mode 100644
index 0000000..009219e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@@ -0,0 +1,29 @@
+package com.ruoyi.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 棣栭〉
+ *
+ * @author ruoyi
+ */
+@RestController
+public class SysIndexController
+{
+ /** 绯荤粺鍩虹閰嶇疆 */
+ @Autowired
+ private RuoYiConfig ruoyiConfig;
+
+ /**
+ * 璁块棶棣栭〉锛屾彁绀鸿
+ */
+ @RequestMapping("/")
+ public String index()
+ {
+ return StringUtils.format("娆㈣繋浣跨敤{}鍚庡彴绠＄悊妗嗘灦锛屽綋鍓嶇増鏈細v{}锛岃閫氳繃鍓嶇鍦板潃璁块棶銆�", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 00f1464..12f7c96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -2,7 +2,6 @@
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 378b4b3..b88929d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -209,7 +209,7 @@
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
# 鏍囬
- title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+ title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
# 鎻忚堪
description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
# 鐗堟湰
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 56b46ba..eda4ab6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -2,7 +2,7 @@
/**
* 鐢ㄦ埛甯搁噺淇℃伅
- *
+ *
* @author ruoyi
*/
public class UserConstants
@@ -57,6 +57,9 @@
/** ParentView缁勪欢鏍囪瘑 */
public final static String PARENT_VIEW = "ParentView";
+ /** InnerLink缁勪欢鏍囪瘑 */
+ public final static String INNER_LINK = "InnerLink";
+
/** 鏍￠獙杩斿洖缁撴灉鐮� */
public final static String UNIQUE = "0";
public final static String NOT_UNIQUE = "1";
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 920aa88..0a8337e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -100,12 +100,13 @@
.antMatchers("/login", "/captchaImage").anonymous()
.antMatchers(
HttpMethod.GET,
+ "/",
"/*.html",
"/**/*.html",
"/**/*.css",
- "/**/*.js"
+ "/**/*.js",
+ "/profile/**"
).permitAll()
- .antMatchers("/profile/**").anonymous()
.antMatchers("/common/download**").anonymous()
.antMatchers("/common/download/resource**").anonymous()
.antMatchers("/doc.html").anonymous()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index e389f5d..666c076 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -28,6 +28,11 @@
*/
private boolean noCache;
+ /**
+ * 鍐呴摼鍦板潃锛坔ttp(s)://寮�澶达級
+ */
+ private String link;
+
public MetaVo(String title, String icon) {
this.title = title;
this.icon = icon;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index f8b4706..ecdd31a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -135,7 +135,7 @@
router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu));
- router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
+ router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
List<SysMenu> cMenus = menu.getChildren();
if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
router.setAlwaysShow(true);
@@ -148,7 +148,19 @@
children.setPath(menu.getPath());
children.setComponent(menu.getComponent());
children.setName(StrUtil.upperFirst(menu.getPath()));
- children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
+ children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache()), menu.getPath()));
+ childrenList.add(children);
+ router.setChildren(childrenList);
+ } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
+ router.setMeta(null);
+ router.setPath("/inner");
+ List<RouterVo> childrenList = new ArrayList<RouterVo>();
+ RouterVo children = new RouterVo();
+ String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
+ children.setPath(routerPath);
+ children.setComponent(UserConstants.INNER_LINK);
+ children.setName(StringUtils.capitalize(routerPath));
+ children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
childrenList.add(children);
router.setChildren(childrenList);
}
@@ -305,6 +317,10 @@
*/
public String getRouterPath(SysMenu menu) {
String routerPath = menu.getPath();
+ // 鍐呴摼鎵撳紑澶栫綉鏂瑰紡
+ if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
+ routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
+ }
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
&& UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
@@ -327,7 +343,9 @@
String component = UserConstants.LAYOUT;
if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
component = menu.getComponent();
- } else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu)) {
+ } else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
+ component = UserConstants.INNER_LINK;
+ } else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu)) {
component = UserConstants.PARENT_VIEW;
}
return component;
@@ -345,6 +363,16 @@
}
/**
+ * 鏄惁涓哄唴閾剧粍浠�
+ *
+ * @param menu 鑿滃崟淇℃伅
+ * @return 缁撴灉
+ */
+ public boolean isInnerLink(SysMenu menu) {
+ return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
+ }
+
+ /**
* 鏄惁涓簆arent_view缁勪欢
*
* @param menu 鑿滃崟淇℃伅
@@ -357,7 +385,7 @@
/**
* 鏍规嵁鐖惰妭鐐圭殑ID鑾峰彇鎵�鏈夊瓙鑺傜偣
*
- * @param list 鍒嗙被琛�
+ * @param list 鍒嗙被琛�
* @param parentId 浼犲叆鐨勭埗鑺傜偣ID
* @return String
*/
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index bb3a924..98b9fa7 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -49,7 +49,7 @@
/* 绫诲瀷锛坆ase64鏍煎紡銆乽rl鏍煎紡锛� */
type: {
type: String,
- default: "",
+ default: "url",
}
},
data() {
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index ce9f305..c44eff5 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -70,9 +70,11 @@
this.show = false
},
change(val) {
+ const path = val.path;
if(this.ishttp(val.path)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
- window.open(val.path, "_blank");
+ const pindex = path.indexOf("http");
+ window.open(path.substr(pindex, path.length), "_blank");
} else {
this.$router.push(val.path)
}
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index a897638..0c6f4b7 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -51,7 +51,7 @@
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 15px;
+ padding-right: 17px;
}
}
</style>
diff --git a/ruoyi-ui/src/layout/components/InnerLink/index.vue b/ruoyi-ui/src/layout/components/InnerLink/index.vue
new file mode 100644
index 0000000..227ff2a
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/InnerLink/index.vue
@@ -0,0 +1,27 @@
+<script>
+export default {
+ data() {
+ return {};
+ },
+ render() {
+ const { $route: { meta: { link } }, } = this;
+ if ({ link }.link === "") {
+ return "404";
+ }
+ let url = { link }.link;
+ const height = document.documentElement.clientHeight - 94.5 + "px";
+ const style = { height: height };
+
+ return (
+ <div style={style}>
+ <iframe
+ src={url}
+ frameborder="no"
+ style="width: 100%; height: 100%"
+ scrolling="auto"
+ ></iframe>
+ </div>
+ );
+ },
+};
+</script>
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 4647d9c..c7b9371 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -6,6 +6,7 @@
/* Layout */
import Layout from '@/layout'
import ParentView from '@/components/ParentView';
+import InnerLink from '@/layout/components/InnerLink'
/**
* Note: 璺敱閰嶇疆椤�
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index aacfc8c..81026f3 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -2,6 +2,7 @@
import { getRouters } from '@/api/menu'
import Layout from '@/layout/index'
import ParentView from '@/components/ParentView';
+import InnerLink from '@/layout/components/InnerLink'
const permission = {
state: {
@@ -65,6 +66,8 @@
route.component = Layout
} else if (route.component === 'ParentView') {
route.component = ParentView
+ } else if (route.component === 'InnerLink') {
+ route.component = InnerLink
} else {
route.component = loadView(route.component)
}
--
Gitblit v1.9.3