From 2ad60c6703db7c524c2b91b13f4ff4363ee6ca43 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 3 Dec 2019 13:17:48 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A4=9A=E7=A7=9F=E6=88=B7=E8=A1=A8?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=AE=9E=E4=BD=93=E7=BB=A7=E6=89=BFTenantEnt?= =?UTF-8?q?ity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/RouterFunctionConfiguration.java | 4 ++-- .../core/log/controller/LogApiController.java | 17 ++--------------- .../core/log/controller/LogErrorController.java | 17 ++--------------- .../core/log/controller/LogUsualController.java | 17 ++--------------- .../org/springblade/resource/entity/Oss.java | 4 ++-- .../org/springblade/desk/entity/Notice.java | 4 ++-- .../org/springblade/system/entity/Dict.java | 2 +- .../org/springblade/system/entity/TopMenu.java | 4 ++-- 8 files changed, 15 insertions(+), 54 deletions(-) diff --git a/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java b/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java index cc2e89a0..df7efc60 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java @@ -56,8 +56,8 @@ public class RouterFunctionConfiguration { /** * 这里为支持的请求头，如果有自定义的header字段请自己添加 */ - private static final String ALLOWED_HEADERS = "X-Requested-With, Blade-Auth, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, username, client"; - private static final String ALLOWED_METHODS = "*"; + private static final String ALLOWED_HEADERS = "X-Requested-With, Tenant-Id, Blade-Auth, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, username, client"; + private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD"; private static final String ALLOWED_ORIGIN = "*"; private static final String ALLOWED_EXPOSE = "*"; private static final String MAX_AGE = "18000L"; diff --git a/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java b/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java index ab3fced2..58c0fe1d 100644 --- a/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java +++ b/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java @@ -18,25 +18,19 @@ package org.springblade.core.log.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import org.springblade.core.log.model.LogApi; -import org.springblade.core.log.model.LogApiVo; import org.springblade.core.log.service.ILogApiService; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 控制器 @@ -62,16 +56,9 @@ public class LogApiController { * 查询多条(分页) */ @GetMapping("/list") - public R> list(@ApiIgnore @RequestParam Map log, Query query) { + public R> list(@ApiIgnore @RequestParam Map log, Query query) { IPage pages = logService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(log, LogApi.class)); - List records = pages.getRecords().stream().map(logApi -> { - LogApiVo vo = BeanUtil.copy(logApi, LogApiVo.class); - vo.setStrId(Func.toStr(logApi.getId())); - return vo; - }).collect(Collectors.toList()); - IPage pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal()); - pageVo.setRecords(records); - return R.data(pageVo); + return R.data(pages); } } diff --git a/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java b/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java index debd5488..89792c0c 100644 --- a/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java +++ b/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java @@ -18,25 +18,19 @@ package org.springblade.core.log.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import org.springblade.core.log.model.LogError; -import org.springblade.core.log.model.LogErrorVo; import org.springblade.core.log.service.ILogErrorService; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 控制器 @@ -62,16 +56,9 @@ public class LogErrorController { * 查询多条(分页) */ @GetMapping("/list") - public R> list(@ApiIgnore @RequestParam Map logError, Query query) { + public R> list(@ApiIgnore @RequestParam Map logError, Query query) { IPage pages = errorLogService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(logError, LogError.class)); - List records = pages.getRecords().stream().map(logApi -> { - LogErrorVo vo = BeanUtil.copy(logApi, LogErrorVo.class); - vo.setStrId(Func.toStr(logApi.getId())); - return vo; - }).collect(Collectors.toList()); - IPage pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal()); - pageVo.setRecords(records); - return R.data(pageVo); + return R.data(pages); } } diff --git a/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java b/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java index a61fdb2a..35696c38 100644 --- a/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java +++ b/blade-ops/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java @@ -18,25 +18,19 @@ package org.springblade.core.log.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import org.springblade.core.log.model.LogUsual; -import org.springblade.core.log.model.LogUsualVo; import org.springblade.core.log.service.ILogUsualService; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 控制器 @@ -62,16 +56,9 @@ public class LogUsualController { * 查询多条(分页) */ @GetMapping("/list") - public R> list(@ApiIgnore @RequestParam Map log, Query query) { + public R> list(@ApiIgnore @RequestParam Map log, Query query) { IPage pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class)); - List records = pages.getRecords().stream().map(logApi -> { - LogUsualVo vo = BeanUtil.copy(logApi, LogUsualVo.class); - vo.setStrId(Func.toStr(logApi.getId())); - return vo; - }).collect(Collectors.toList()); - IPage pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal()); - pageVo.setRecords(records); - return R.data(pageVo); + return R.data(pages); } } diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/entity/Oss.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/entity/Oss.java index a8c4df42..d3e8cd40 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/entity/Oss.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/entity/Oss.java @@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; /** * 实体类 @@ -33,7 +33,7 @@ import org.springblade.core.mp.base.BaseEntity; @TableName("blade_oss") @EqualsAndHashCode(callSuper = true) @ApiModel(value = "Oss对象", description = "Oss对象") -public class Oss extends BaseEntity { +public class Oss extends TenantEntity { private static final long serialVersionUID = 1L; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java index 806c5bed..fc01ef94 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; @@ -32,7 +32,7 @@ import java.util.Date; @Data @TableName("blade_notice") @EqualsAndHashCode(callSuper = true) -public class Notice extends BaseEntity { +public class Notice extends TenantEntity { private static final long serialVersionUID = 1L; diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java index 68062c7a..a3814b98 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java @@ -65,7 +65,7 @@ public class Dict implements Serializable { * 字典值 */ @ApiModelProperty(value = "字典值") - private Integer dictKey; + private String dictKey; /** * 字典名称 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/TopMenu.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/TopMenu.java index e596c8c3..e2ae9e6c 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/TopMenu.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/TopMenu.java @@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; /** * 顶部菜单表实体类 @@ -33,7 +33,7 @@ import org.springblade.core.mp.base.BaseEntity; @TableName("blade_top_menu") @EqualsAndHashCode(callSuper = true) @ApiModel(value = "TopMenu对象", description = "顶部菜单表") -public class TopMenu extends BaseEntity { +public class TopMenu extends TenantEntity { private static final long serialVersionUID = 1L;