Browse Source

1.切换办公室修改nacos Ip

pull/1/head
pref_mail@163.com 2 years ago
parent
commit
a5c6f0bc24
  1. 4
      blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 2
      blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
  3. 2
      blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

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

@ -28,7 +28,7 @@ public interface LauncherConstant {
/** /**
* nacos dev 地址 * 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 地址 * sentinel dev 地址
*/ */
String SENTINEL_DEV_ADDR = "192.168.2.100:8858"; String SENTINEL_DEV_ADDR = "192.168.10.100:8858";
/** /**
* sentinel prod 地址 * sentinel prod 地址

2
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 @AllArgsConstructor
@RequestMapping("/dept") @RequestMapping("/dept")
@Api(value = "部门", tags = "部门") @Api(value = "部门", tags = "部门")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class DeptController extends BladeController { public class DeptController extends BladeController {
private final IDeptService deptService; private final IDeptService deptService;

2
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@ -105,7 +105,7 @@ public class TenantController extends BladeController {
@GetMapping("/select") @GetMapping("/select")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "下拉数据源", notes = "传入tenant") @ApiOperation(value = "下拉数据源", notes = "传入tenant")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN) // @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) { public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant); QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);

Loading…
Cancel
Save