From 6a753ae2a07fe1b1af9184387ea643263914a3d3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 8 Jan 2024 17:37:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/LauncherConstant.java | 4 ++-- .../org/springblade/system/service/impl/MenuServiceImpl.java | 1 + pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 64e190aa..12de8049 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -44,7 +44,7 @@ public interface LauncherConstant { /** * sentinel dev 地址 */ - String SENTINEL_DEV_ADDR = "192.168.10.100:8858"; + String SENTINEL_DEV_ADDR = "192.168.10.46:8858"; /** * sentinel prod 地址 @@ -59,7 +59,7 @@ public interface LauncherConstant { /** * seata dev 地址 */ - String SEATA_DEV_ADDR = "192.168.10.210:8091"; + String SEATA_DEV_ADDR = "192.168.10.46:8091"; /** diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java index 207e633d..2044a9cc 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java @@ -97,6 +97,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId))); } // 顶部菜单请求返回对应角色权限菜单 + else { // 角色配置对应菜单 List roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId)); diff --git a/pom.xml b/pom.xml index 8e7c349d..e8b1c5b1 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ logpm logpm - http://192.168.10.100:8081/repository/logpm-release/ + http://192.168.10.46:8081/nexus/repository/logpm-release/ From 215b750055cd9f53a031a655dbeb23efce590a88 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 8 Jan 2024 18:04:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0nacos?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/common/constant/LauncherConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 12de8049..aa723f71 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -28,7 +28,7 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.10.100:8848"; + String NACOS_DEV_ADDR = "192.168.10.46:8848"; /** From a103d5a456e7fda71a3da20945fc1301cbeb234a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 9 Jan 2024 13:33:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=AD=E9=97=B4=E4=BB=B6=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/LauncherConstant.java | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index aa723f71..ff328e5c 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -39,7 +39,7 @@ public interface LauncherConstant { /** * nacos test 地址 */ - String NACOS_TEST_ADDR = "172.30.0.48:8848"; + String NACOS_TEST_ADDR = "192.168.10.106:8848"; /** * sentinel dev 地址 @@ -54,7 +54,7 @@ public interface LauncherConstant { /** * sentinel test 地址 */ - String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; + String SENTINEL_TEST_ADDR = "192.168.10.106:8858"; /** * seata dev 地址 @@ -70,7 +70,7 @@ public interface LauncherConstant { /** * seata test 地址 */ - String SEATA_TEST_ADDR = "172.30.0.68:8091"; + String SEATA_TEST_ADDR = "192.168.10.106:8091"; /** * zipkin dev 地址 diff --git a/pom.xml b/pom.xml index e8b1c5b1..a5ce259d 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ logpm logpm - http://192.168.10.46:8081/nexus/repository/logpm-release/ + http://192.168.10.46:8081/repository/logpm-release/