From 1c0aa438fd0d7188ea1bb5f5f41403784e6aecb9 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Tue, 02 Feb 2021 15:29:44 +0800
Subject: [PATCH] 1.接口调整,权限
---
blade-ops/blade-resource/src/main/java/org/springblade/resource/config/CustomOssRule.java | 25 ++++++++++++
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java | 2
blade-ops/blade-resource/src/main/resources/application.yml | 18 ++++-----
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java | 5 ++
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 12 +++---
blade-ops/blade-resource/src/main/resources/application-dev.yml | 1
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 14 +++---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 1
blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java | 2
blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java | 5 ++
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java | 5 +-
11 files changed, 61 insertions(+), 29 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 1fed399..d7cbe23 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
@@ -41,7 +41,7 @@
/**
* nacos dev 地址
*/
- String NACOS_DEV_ADDR = "localhost:8848";
+ String NACOS_DEV_ADDR = "127.0.0.1:8848";
/**
* nacos prod 地址
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
index 8283ceb..22f81d0 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
@@ -31,6 +31,7 @@
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.WebUtil;
+import org.springblade.resource.config.CustomOssRule;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.service.IOssService;
@@ -95,9 +96,9 @@
OssRule ossRule;
// 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启
if (oss.getEndpoint().equals(ossProperties.getEndpoint()) && oss.getAccessKey().equals(ossProperties.getAccessKey()) && ossProperties.getTenantMode()) {
- ossRule = new BladeOssRule(Boolean.TRUE);
+ ossRule = new CustomOssRule(Boolean.TRUE);
} else {
- ossRule = new BladeOssRule(Boolean.FALSE);
+ ossRule = new CustomOssRule(Boolean.FALSE);
}
if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
template = MinioOssBuilder.template(oss, ossRule);
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java
index 2ac744b..6cb0a83 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java
@@ -18,6 +18,7 @@
import lombok.AllArgsConstructor;
import org.springblade.core.oss.props.OssProperties;
+import org.springblade.core.oss.rule.OssRule;
import org.springblade.resource.builder.oss.OssBuilder;
import org.springblade.resource.service.IOssService;
import org.springframework.context.annotation.Bean;
@@ -40,5 +41,9 @@
public OssBuilder ossBuilder() {
return new OssBuilder(ossProperties, ossService);
}
+ @Bean
+ public OssRule ossRule(){
+ return new CustomOssRule(ossProperties.getTenantMode());
+ }
}
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/CustomOssRule.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/CustomOssRule.java
new file mode 100644
index 0000000..9483818
--- /dev/null
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/CustomOssRule.java
@@ -0,0 +1,25 @@
+package org.springblade.resource.config;
+
+import jodd.util.StringPool;
+import lombok.AllArgsConstructor;
+import org.springblade.core.oss.rule.OssRule;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.FileUtil;
+import org.springblade.core.tool.utils.StringUtil;
+
+@AllArgsConstructor
+public class CustomOssRule implements OssRule {
+ private final Boolean tenantMode;
+ @Override
+ public String bucketName(String bucketName) {
+ String preFix=(tenantMode)? AuthUtil.getTenantId().concat(StringPool.DASH):StringPool.EMPTY;
+ return preFix+bucketName;
+ }
+
+ @Override
+ public String fileName(String originalFilename) {
+ return "upload/test"+StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID()
+ +StringPool.DOT+ FileUtil.getFileExtension(originalFilename);
+ }
+}
diff --git a/blade-ops/blade-resource/src/main/resources/application-dev.yml b/blade-ops/blade-resource/src/main/resources/application-dev.yml
index 2ef6032..97f23c8 100644
--- a/blade-ops/blade-resource/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-resource/src/main/resources/application-dev.yml
@@ -4,4 +4,3 @@
url: ${blade.datasource.dev.url}
username: ${blade.datasource.dev.username}
password: ${blade.datasource.dev.password}
-
diff --git a/blade-ops/blade-resource/src/main/resources/application.yml b/blade-ops/blade-resource/src/main/resources/application.yml
index d67f16e..8e175c9 100644
--- a/blade-ops/blade-resource/src/main/resources/application.yml
+++ b/blade-ops/blade-resource/src/main/resources/application.yml
@@ -1,13 +1,11 @@
#服务器端口
server:
port: 8010
-
-#oss配置
-oss:
- enabled: true
- name: minio
- tenant-mode: false
- endpoint: http://s16s652780.51mypc.cn:21403
- bucket-name: jfpt
- access-key: minioadmin
- secret-key: minioadmin
+ oss:
+ enabled: true
+ name: minio
+ tenant-mode: true
+ endpoint: https://s16s652780.51mypc.cn
+ access-key: minioadmin
+ secret-key: minioadmin
+ bucket-name: jfpt
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
index 772b6a1..745ce17 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -147,7 +147,10 @@
if (1 == dayWeek) {
cal.add(Calendar.DAY_OF_MONTH, -1);
}
- switch(type){
+ String type1 = type;
+ String substring = type1.substring(9, 10);
+ System.out.println(substring);
+ switch(substring){
case "0" :
//日
String times = sdf.format(cal.getTime());
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index fec7eec..89e4b28 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -141,6 +141,7 @@
* @param endTime
* @return
*/
+ @PostMapping("/selectList")
public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java
index 91c9ffd..ffc57c7 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java
@@ -48,7 +48,7 @@
@RequestMapping("/client")
@ApiIgnore
@Api(value = "应用管理", tags = "接口")
-@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public class AuthClientController extends BladeController {
private final IAuthClientService clientService;
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 58b16e5..4a81952 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
@@ -85,7 +85,7 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -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);
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 85eefb9..34b14e1 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -75,7 +75,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -102,7 +102,7 @@
})
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -119,7 +119,7 @@
})
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
@@ -154,7 +154,7 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "删除", notes = "传入id集合")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R remove(@RequestParam String ids) {
CacheUtil.clear(USER_CACHE);
return R.status(userService.removeUser(ids));
@@ -166,7 +166,7 @@
@PostMapping("/grant")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "权限设置", notes = "传入roleId集合以及menuId集合")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R grant(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
@ApiParam(value = "roleId集合", required = true) @RequestParam String roleIds) {
boolean temp = userService.grant(userIds, roleIds);
@@ -286,7 +286,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));
}
--
Gitblit v1.9.3