Merge branch 'pre-production'

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

@@ -39,7 +39,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos test 地址
 	 */
-	String NACOS_TEST_ADDR = "192.168.2.106:8848";
+	String NACOS_TEST_ADDR = "192.168.2.110:8848";
 
 	/**
 	 * sentinel dev 地址
@@ -54,7 +54,7 @@ public interface LauncherConstant {
 	/**
 	 * sentinel test 地址
 	 */
-	String SENTINEL_TEST_ADDR = "192.168.2.106:8858";
+	String SENTINEL_TEST_ADDR = "192.168.2.110:8858";
 
 	/**
 	 * seata dev 地址
@@ -70,7 +70,7 @@ public interface LauncherConstant {
 	/**
 	 * seata test 地址
 	 */
-	String SEATA_TEST_ADDR = "192.168.2.106:8091";
+	String SEATA_TEST_ADDR = "192.168.2.110:8091";
 
 	/**
 	 * zipkin dev 地址

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/IDeptClient.java

@@ -74,6 +74,8 @@ public interface IDeptClient {
 	@GetMapping(API_PREFIX + "/getAncestorsByDeptId")
 	String getAncestorsByDeptId(@RequestParam("deptId") Long deptId);
 
+	@GetMapping(API_PREFIX + "/findEntityById")
+	Dept findEntityById(@RequestParam Long deptId);
 
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/DeptClient.java

@@ -94,4 +94,9 @@ public class DeptClient implements IDeptClient {
 		}
 		return null;
 	}
+
+	@Override
+	public Dept findEntityById(Long deptId) {
+		return service.getById(deptId);
+	}
 }