From b440048ef933f7898cc0949ad1384de1d935ff9e Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Tue, 14 Nov 2023 10:28:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8E=B7=E5=8F=96=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=E4=B8=80=E4=B8=8Aid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/src/main/resources/bootstrap.yml | 5 +-- .../muyu/common/core/utils/ip/IpUtils.java | 6 ++-- muyu-gateway/src/main/resources/bootstrap.yml | 9 +++--- .../src/main/resources/bootstrap.yml | 5 +-- .../muyu-gen/src/main/resources/bootstrap.yml | 5 +-- .../muyu-job/src/main/resources/bootstrap.yml | 5 +-- .../service/impl/SysMenuServiceImpl.java | 32 ++++++++++++++++++- .../src/main/resources/bootstrap.yml | 5 +-- .../resources/mapper/system/SysUserMapper.xml | 2 +- .../src/main/resources/bootstrap.yml | 5 +-- pom.xml | 2 +- sql/ry_20230706.sql | 4 +-- sql/ry_config_20220929.sql | 2 +- 13 files changed, 62 insertions(+), 25 deletions(-) diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index b309a3d..26d58c1 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e47d9b61-1cb9-48b7-97b3-2692bfaf34a3 diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java index f7ad9bf..66fa70b 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java @@ -58,7 +58,7 @@ public class IpUtils { ip = request.getRemoteAddr(); } - return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip); + return "0:0:0:0:0:0:0:1".equals(ip) ? "115.159.67.205" : getMultistageReverseProxyIp(ip); } /** @@ -70,7 +70,7 @@ public class IpUtils { */ public static boolean internalIp (String ip) { byte[] addr = textToNumericFormatV4(ip); - return internalIp(addr) || "127.0.0.1".equals(ip); + return internalIp(addr) || "115.159.67.205".equals(ip); } /** @@ -197,7 +197,7 @@ public class IpUtils { return InetAddress.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { } - return "127.0.0.1"; + return "115.159.67.205"; } /** diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index d7367b4..9512c96 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,26 +14,27 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e47d9b61-1cb9-48b7-97b3-2692bfaf34a3 sentinel: # 取消控制台懒加载 eager: true transport: # 控制台地址 - dashboard: 127.0.0.1:8718 + dashboard: 115.159.67.205:8718 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 dataId: sentinel-muyu-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 0cb85bd..aa0cc41 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e47d9b61-1cb9-48b7-97b3-2692bfaf34a3 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index b628931..0578056 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e47d9b61-1cb9-48b7-97b3-2692bfaf34a3 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index 618f3e8..984635e 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e47d9b61-1cb9-48b7-97b3-2692bfaf34a3 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index e4e2ec8..f302c95 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -61,16 +61,46 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List selectMenuList (SysMenu menu, Long userId) { List menuList = null; + List all = null; // 管理员显示所有菜单信息 + boolean admin = SysUser.isAdmin(userId); if (SysUser.isAdmin(userId)) { - menuList = menuMapper.selectMenuList(menu); + if (admin){ + menuList = menuMapper.selectMenuList(menu); + } } else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); } + if (menuList.size()==1){ + SysMenu sysMenu = menuList.get(0); + this.getMenuList(menuList,sysMenu); + SysMenu sysMenu1 = new SysMenu(); + sysMenu1.setParams(menu.getParams()); + all=admin?menuMapper.selectMenuList(null):menuMapper.selectMenuList(sysMenu1); + List childList = this.getChildList(all, sysMenu); + menuList.addAll(childList); + } return menuList; } + + /** + * 递归找祖结点 + * @param menuList 菜单集合 + * @param menu 底层菜单 + */ + public void getMenuList(List menuList,SysMenu menu){ + if(menu.getParentId().equals(0L)){ + return; + }else { + SysMenu sysMenu = this.selectMenuById(menu.getParentId()); + menuList.add(sysMenu); + getMenuList(menuList,sysMenu); + } + } + + /** * 根据用户ID查询权限 * diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index a66fd4c..ed9533b 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,15 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 115.159.67.205:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e47d9b61-1cb9-48b7-97b3-2692bfaf34a3 logging: level: com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 6f633b7..7e13bfe 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -152,7 +152,7 @@