From a5c6f0bc2437a4d30225f37f23ed883527c6ea07 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 31 Jul 2023 15:43:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=87=E6=8D=A2=E5=8A=9E=E5=85=AC=E5=AE=A4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos=20Ip?= 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/controller/DeptController.java | 2 +- .../org/springblade/system/controller/TenantController.java | 2 +- 3 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 d2baf02f..64e190aa 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.2.100:8848"; + String NACOS_DEV_ADDR = "192.168.10.100:8848"; /** @@ -44,7 +44,7 @@ public interface LauncherConstant { /** * sentinel dev 地址 */ - String SENTINEL_DEV_ADDR = "192.168.2.100:8858"; + String SENTINEL_DEV_ADDR = "192.168.10.100:8858"; /** * sentinel prod 地址 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index 658fdce9..107612c4 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -60,7 +60,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; @AllArgsConstructor @RequestMapping("/dept") @Api(value = "部门", tags = "部门") -@PreAuth(RoleConstant.HAS_ROLE_ADMIN) +//@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public class DeptController extends BladeController { private final IDeptService deptService; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java index 64401714..00685bdb 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java @@ -105,7 +105,7 @@ public class TenantController extends BladeController { @GetMapping("/select") @ApiOperationSupport(order = 3) @ApiOperation(value = "下拉数据源", notes = "传入tenant") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) +// @PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R> select(Tenant tenant, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(tenant); List list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);