Merge branch 'dev' into pre-production

# Conflicts:
#	blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

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";
 
 
 	/**
@@ -39,12 +39,12 @@ public interface LauncherConstant {
 	/**
 	 * nacos test 地址
 	 */
-	String NACOS_TEST_ADDR = "172.16.128.146:8848";
+	String NACOS_TEST_ADDR = "192.168.10.106:8848";
 
 	/**
 	 * sentinel dev 地址
 	 */
-	String SENTINEL_DEV_ADDR = "192.168.10.100:8858";
+	String SENTINEL_DEV_ADDR = "192.168.10.46:8858";
 
 	/**
 	 * sentinel prod 地址
@@ -54,12 +54,12 @@ public interface LauncherConstant {
 	/**
 	 * sentinel test 地址
 	 */
-	String SENTINEL_TEST_ADDR = "172.16.128.146:8858";
+	String SENTINEL_TEST_ADDR = "192.168.10.106:8858";
 
 	/**
 	 * seata dev 地址
 	 */
-	String SEATA_DEV_ADDR = "192.168.10.210:8091";
+	String SEATA_DEV_ADDR = "192.168.10.46:8091";
 
 
 	/**
@@ -70,13 +70,13 @@ public interface LauncherConstant {
 	/**
 	 * seata test 地址
 	 */
-	String SEATA_TEST_ADDR = "172.16.128.146:8091";
+	String SEATA_TEST_ADDR = "192.168.10.106:8091";
 
 	/**
 	 * zipkin dev 地址
 	 */
 
-	String ZIPKIN_DEV_ADDR = "http://172.16.128.146:9411";
+	String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411";
 
 	/**
 	 * zipkin prod 地址
@@ -86,13 +86,13 @@ public interface LauncherConstant {
 	/**
 	 * zipkin test 地址
 	 */
-	String ZIPKIN_TEST_ADDR = "http://172.16.128.146:9411";
+	String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411";
 
 	/**
 	 * elk dev 地址
 	 */
 
-	String ELK_DEV_ADDR = "172.16.128.146:9000";
+	String ELK_DEV_ADDR = "127.0.0.1:9000";
 
 	/**
 	 * elk prod 地址

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -97,6 +97,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 			roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId)));
 		}
 		// 顶部菜单请求返回对应角色权限菜单
+
 		else {
 			// 角色配置对应菜单
 			List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId));

pom.xml

@@ -227,7 +227,7 @@
             <!--此名称要和.m2/settings.xml中设置的ID一致 -->
             <id>logpm</id>
             <name>logpm</name>
-            <url>http://192.168.10.100:8081/repository/logpm-release/</url>
+            <url>http://192.168.10.46:8081/repository/logpm-release/</url>
         </repository>