src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -149,9 +149,9 @@ SELECT IFNULL(A.lastmonth, 0) AS lastmonth, IFNULL(B.thismouth, 0) AS thismouth, IFNULL(A.amount, 0) AS lastamount, IFNULL(b.amount, 0) AS thisamount IFNULL(B.amount, 0) AS thisamount FROM ( SELECT COUNT SELECT COUNTb. (*) AS lastmonth, amount, deptid @@ -460,7 +460,7 @@ ) B ON A.deptid = B.deptid ) C LEFT JOIN blade_dept d ON C.deptid = d.id LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction where 1=1 LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> and C.jurisdiction =#{jurisdiction} </if> @@ -503,7 +503,7 @@ ) B ON A.dept_id = B.dept_id ) C LEFT JOIN blade_dept d ON C.dept_id = d.id LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction WHERE 1=1 LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction WHERE 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> and C.jurisdiction =#{jurisdiction} </if> @@ -540,7 +540,7 @@ GROUP BY dept_id, jurisdiction ) B ON A.dept_id = B.dept_id) C LEFT JOIN blade_dept d ON C.dept_id = d.id LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction where 1=1 LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> and C.jurisdiction =#{jurisdiction} </if> src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -56,7 +56,7 @@ @AllArgsConstructor @RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/role") @Api(value = "角色", tags = "角色") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public class RoleController extends BladeController { private final IRoleService roleService; src/main/java/org/springblade/modules/system/controller/TenantController.java
@@ -98,7 +98,7 @@ @GetMapping("/select") @ApiOperationSupport(order = 3) @ApiOperation(value = "下拉数据源", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) { 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); @@ -111,7 +111,7 @@ @GetMapping("/page") @ApiOperationSupport(order = 4) @ApiOperation(value = "分页", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<IPage<Tenant>> page(Tenant tenant, Query query) { IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant); return R.data(pages); @@ -123,7 +123,7 @@ @PostMapping("/submit") @ApiOperationSupport(order = 5) @ApiOperation(value = "新增或修改", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) public R submit(@Valid @RequestBody Tenant tenant) { return R.status(tenantService.submitTenant(tenant)); } @@ -135,7 +135,7 @@ @PostMapping("/remove") @ApiOperationSupport(order = 6) @ApiOperation(value = "逻辑删除", notes = "传入ids") @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(tenantService.removeTenant(Func.toLongList(ids))); } @@ -146,7 +146,7 @@ @PostMapping("/setting") @ApiOperationSupport(order = 7) @ApiOperation(value = "授权配置", notes = "传入ids,accountNumber,expireTime") @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) public R setting(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "账号额度") Integer accountNumber, @ApiParam(value = "过期时间") Date expireTime) { return R.status(tenantService.setting(accountNumber, expireTime, ids)); } @@ -171,7 +171,7 @@ @GetMapping("/find-by-name") @ApiOperationSupport(order = 9) @ApiOperation(value = "详情", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<List<Tenant>> findByName(String name) { List<Tenant> list = tenantService.list(Wrappers.<Tenant>query().lambda().like(Tenant::getTenantName, name)); return R.data(list); src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -300,7 +300,7 @@ @ApiOperationSupport(order = 17) @ApiOperation(value = "查看平台详情", notes = "传入id") @GetMapping("/platform-detail") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<UserVO> platformDetail(User user) { return R.data(userService.platformDetail(user)); } src/main/resources/application-dev.yml
@@ -3,8 +3,8 @@ redis: ##redis 单机环境配置 host: 127.0.0.1 port: 6379 password: port: 6378 password: redispsw database: 0 ssl: false ##redis 集群环境配置 @@ -13,9 +13,9 @@ # commandTimeout: 5000 datasource: # MySql url: jdbc:mysql://36.134.81.48:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true url: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root password: jfpt123 password: zhba0728 # PostgreSQL #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot #username: postgres @@ -41,7 +41,7 @@ ##是否启用分布式锁 enabled: false ##redis服务地址 address: redis://127.0.0.1:6379 address: redis://127.0.0.1:6378 #本地文件上传 file: remote-mode: true src/main/resources/application.yml
@@ -1,6 +1,6 @@ #服务器配置 server: port: 80 port: 82 undertow: # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 io-threads: 16
