⚡ 多租户表对应实体继承TenantEntity

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";

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<IPage<LogApiVo>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
+	public R<IPage<LogApi>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
 		IPage<LogApi> pages = logService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(log, LogApi.class));
-		List<LogApiVo> 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<LogApiVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
-		pageVo.setRecords(records);
-		return R.data(pageVo);
+		return R.data(pages);
 	}
 
 }

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<IPage<LogErrorVo>> list(@ApiIgnore @RequestParam Map<String, Object> logError, Query query) {
+	public R<IPage<LogError>> list(@ApiIgnore @RequestParam Map<String, Object> logError, Query query) {
 		IPage<LogError> pages = errorLogService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(logError, LogError.class));
-		List<LogErrorVo> 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<LogErrorVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
-		pageVo.setRecords(records);
-		return R.data(pageVo);
+		return R.data(pages);
 	}
 
 }

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<IPage<LogUsualVo>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
+	public R<IPage<LogUsual>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
 		IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class));
-		List<LogUsualVo> 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<LogUsualVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
-		pageVo.setRecords(records);
-		return R.data(pageVo);
+		return R.data(pages);
 	}
 
 }

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;
 

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;
 

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;
 
 	/**
 	 * 字典名称

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;