diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetails.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetails.java
index 678c5e88..31bec9f6 100644
--- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetails.java
+++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetails.java
@@ -33,7 +33,7 @@ public class BladeUserDetails extends User {
/**
* 用户id
*/
- private Integer userId;
+ private Long userId;
/**
* 租户编号
*/
@@ -59,7 +59,7 @@ public class BladeUserDetails extends User {
*/
private String avatar;
- BladeUserDetails(Integer userId, String tenantCode, String name, String roleId, String roleName, String avatar, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
+ BladeUserDetails(Long userId, String tenantCode, String name, String roleId, String roleName, String avatar, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
this.userId = userId;
this.tenantCode = tenantCode;
diff --git a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
index adfde2ca..f78813c5 100644
--- a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
+++ b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
@@ -68,7 +68,7 @@ public interface CommonConstant {
/**
* 顶级父节点id
*/
- Integer TOP_PARENT_ID = 0;
+ Long TOP_PARENT_ID = 0L;
/**
* 顶级父节点名称
diff --git a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/utils/TaskUtil.java b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/utils/TaskUtil.java
index e70103f3..334a9db2 100644
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/utils/TaskUtil.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/utils/TaskUtil.java
@@ -55,8 +55,8 @@ public class TaskUtil {
* @param taskUser 任务用户
* @return userId
*/
- public static Integer getUserId(String taskUser) {
- return Func.toInt(StringUtil.removePrefix(taskUser, TASK_USR_PREFIX));
+ public static Long getUserId(String taskUser) {
+ return Func.toLong(StringUtil.removePrefix(taskUser, TASK_USR_PREFIX));
}
/**
diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java
index f8abb7fe..ef49853f 100644
--- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java
+++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java
@@ -91,7 +91,7 @@ public class CodeController extends BladeController {
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids", position = 7)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(codeService.removeByIds(Func.toIntList(ids)));
+ return R.status(codeService.removeByIds(Func.toLongList(ids)));
}
/**
@@ -100,7 +100,7 @@ public class CodeController extends BladeController {
@PostMapping("/gen-code")
@ApiOperation(value = "代码生成", notes = "传入ids", position = 8)
public R genCode(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @RequestParam(defaultValue = "sword") String system) {
- Collection<Code> codes = codeService.listByIds(Func.toIntList(ids));
+ Collection<Code> codes = codeService.listByIds(Func.toLongList(ids));
codes.forEach(code -> {
BladeCodeGenerator generator = new BladeCodeGenerator();
generator.setSystemName(system);
diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Code.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Code.java
index 1d9c5951..236edbfb 100644
--- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Code.java
+++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Code.java
@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,9 +43,10 @@ public class Code implements Serializable {
/**
* 主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ID_WORKER)
+ private Long id;
/**
* 模块名称
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 d609e480..8dfe7834 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
@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,15 +43,17 @@ public class Dict implements Serializable {
/**
* 主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ID_WORKER)
+ private Long id;
/**
* 父主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "父主键")
- private Integer parentId;
+ private Long parentId;
/**
* 字典码
diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java
index 398f152f..7c8e2259 100644
--- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java
+++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java
@@ -17,6 +17,8 @@
package org.springblade.system.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -39,12 +41,14 @@ public class DictVO extends Dict implements INode {
/**
* 主键ID
*/
- private Integer id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 父节点ID
*/
- private Integer parentId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
/**
* 子孙节点
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java
index 828362d7..477eec72 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java
@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,9 +43,10 @@ public class Dept implements Serializable {
/**
* 主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ID_WORKER)
+ private Long id;
/**
* 租户编号
@@ -54,8 +57,9 @@ public class Dept implements Serializable {
/**
* 父主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "父主键")
- private Integer parentId;
+ private Long parentId;
/**
* 部门名
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Menu.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Menu.java
index aa932e9c..2e01f929 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Menu.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Menu.java
@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,15 +44,17 @@ public class Menu implements Serializable {
/**
* 主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ID_WORKER)
+ private Long id;
/**
* 菜单父主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "菜单父主键")
- private Integer parentId;
+ private Long parentId;
/**
* 菜单编号
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java
index 66a4158e..915a1546 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java
@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,9 +43,10 @@ public class Role implements Serializable {
/**
* 主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ID_WORKER)
+ private Long id;
/**
* 租户编号
@@ -54,8 +57,9 @@ public class Role implements Serializable {
/**
* 父主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "父主键")
- private Integer parentId;
+ private Long parentId;
/**
* 角色名
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/RoleMenu.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/RoleMenu.java
index 2eefc91d..65602a24 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/RoleMenu.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/RoleMenu.java
@@ -19,6 +19,8 @@ package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,21 +42,24 @@ public class RoleMenu implements Serializable {
/**
* 主键
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ID_WORKER)
+ private Long id;
/**
* 菜单id
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "菜单id")
- private Integer menuId;
+ private Long menuId;
/**
* 角色id
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "角色id")
- private Integer roleId;
+ private Long roleId;
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
index bbcf63e0..bbd8fa84 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
@@ -48,7 +48,7 @@ public interface ISysClient {
* @return Dept
*/
@GetMapping(DEPT)
- Dept getDept(@RequestParam("id") Integer id);
+ Dept getDept(@RequestParam("id") Long id);
/**
* 获取部门名
@@ -57,7 +57,7 @@ public interface ISysClient {
* @return 部门名
*/
@GetMapping(DEPT_NAME)
- String getDeptName(@RequestParam("id") Integer id);
+ String getDeptName(@RequestParam("id") Long id);
/**
* 获取角色
@@ -66,7 +66,7 @@ public interface ISysClient {
* @return Role
*/
@GetMapping(ROLE)
- Role getRole(@RequestParam("id") Integer id);
+ Role getRole(@RequestParam("id") Long id);
/**
* 获取角色名
@@ -75,7 +75,7 @@ public interface ISysClient {
* @return 角色名
*/
@GetMapping(ROLE_NAME)
- String getRoleName(@RequestParam("id") Integer id);
+ String getRoleName(@RequestParam("id") Long id);
/**
* 获取角色别名
@@ -84,6 +84,6 @@ public interface ISysClient {
* @return 角色别名
*/
@GetMapping(ROLE_ALIAS)
- String getRoleAlias(@RequestParam("id") Integer id);
+ String getRoleAlias(@RequestParam("id") Long id);
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
index 867e67f6..52927bed 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
@@ -29,27 +29,27 @@ import org.springframework.stereotype.Component;
public class ISysClientFallback implements ISysClient {
@Override
- public Dept getDept(Integer id) {
+ public Dept getDept(Long id) {
return null;
}
@Override
- public String getDeptName(Integer id) {
+ public String getDeptName(Long id) {
return null;
}
@Override
- public Role getRole(Integer id) {
+ public Role getRole(Long id) {
return null;
}
@Override
- public String getRoleName(Integer id) {
+ public String getRoleName(Long id) {
return null;
}
@Override
- public String getRoleAlias(Integer id) {
+ public String getRoleAlias(Long id) {
return null;
}
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java
index 85e49c9f..56d317f0 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java
@@ -17,6 +17,8 @@
package org.springblade.system.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -40,12 +42,14 @@ public class DeptVO extends Dept implements INode {
/**
* 主键ID
*/
- private Integer id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 父节点ID
*/
- private Integer parentId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
/**
* 子孙节点
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java
index 1f7f36b9..50221981 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java
@@ -17,6 +17,8 @@
package org.springblade.system.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -40,12 +42,14 @@ public class MenuVO extends Menu implements INode {
/**
* 主键ID
*/
- private Integer id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 父节点ID
*/
- private Integer parentId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
/**
* 子孙节点
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java
index 2f95d029..6453e42d 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java
@@ -17,6 +17,8 @@
package org.springblade.system.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -40,12 +42,14 @@ public class RoleVO extends Role implements INode {
/**
* 主键ID
*/
- private Integer id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 父节点ID
*/
- private Integer parentId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
/**
* 子孙节点
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java
index 8cf2f00a..764a74fd 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java
@@ -49,7 +49,7 @@ public class UserCache {
* @return
*/
public static User getUserByTaskUser(String taskUserId) {
- int userId = Func.toInt(StringUtil.removePrefix(taskUserId, TASK_USR_PREFIX));
+ Long userId = Func.toLong(StringUtil.removePrefix(taskUserId, TASK_USR_PREFIX));
return getUser(userId);
}
@@ -59,7 +59,7 @@ public class UserCache {
* @param userId 用户id
* @return
*/
- public static User getUser(Integer userId) {
+ public static User getUser(Long userId) {
User user = CacheUtil.get(USER_CACHE, USER_CACHE_ID_ + userId, User.class);
if (Func.isEmpty(user)) {
R<User> result = userClient.userInfoById(userId);
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
index b6fce9b6..522928e3 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
@@ -46,7 +46,7 @@ public interface IUserClient {
* @return
*/
@GetMapping(USER_INFO_BY_ID)
- R<User> userInfoById(@RequestParam("userId") Integer userId);
+ R<User> userInfoById(@RequestParam("userId") Long userId);
/**
* 获取用户信息
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java
index 81ea18b0..de191b68 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java
@@ -16,6 +16,8 @@
*/
package org.springblade.system.user.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,7 +37,8 @@ public class UserVO extends User {
/**
* 主键ID
*/
- private Integer id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 角色名
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java
index bd1212ed..ea6bc587 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java
@@ -45,7 +45,7 @@ public class LeaveController extends BladeController implements CacheNames {
* @param businessId 主键
*/
@GetMapping("detail")
- public R<ProcessLeave> detail(Integer businessId) {
+ public R<ProcessLeave> detail(Long businessId) {
ProcessLeave detail = leaveService.getById(businessId);
detail.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName());
return R.data(detail);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
index dc3bbf26..c66b97ef 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
@@ -112,7 +112,7 @@ public class NoticeController extends BladeController implements CacheNames {
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入notice", position = 7)
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- boolean temp = noticeService.deleteLogic(Func.toIntList(ids));
+ boolean temp = noticeService.deleteLogic(Func.toLongList(ids));
return R.status(temp);
}
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 06067e75..ed121852 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
@@ -104,7 +104,7 @@ public class AuthClientController extends BladeController {
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(clientService.deleteLogic(Func.toIntList(ids)));
+ return R.status(clientService.deleteLogic(Func.toLongList(ids)));
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index cc4c26cf..91810144 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -110,7 +110,7 @@ public class DeptController extends BladeController {
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids", position = 5)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(deptService.removeByIds(Func.toIntList(ids)));
+ return R.status(deptService.removeByIds(Func.toLongList(ids)));
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java
index 2a7c8272..5cc9fbfd 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java
@@ -108,7 +108,7 @@ public class DictController extends BladeController {
@CacheEvict(cacheNames = {DICT_LIST, DICT_VALUE}, allEntries = true)
@ApiOperation(value = "删除", notes = "传入ids", position = 7)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(dictService.removeByIds(Func.toIntList(ids)));
+ return R.status(dictService.removeByIds(Func.toLongList(ids)));
}
/**
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
index e701e58b..cb7c0147 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
@@ -106,7 +106,7 @@ public class MenuController extends BladeController {
@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
@ApiOperation(value = "删除", notes = "传入ids", position = 9)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(menuService.removeByIds(Func.toIntList(ids)));
+ return R.status(menuService.removeByIds(Func.toLongList(ids)));
}
/**
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java
index d0eb8f43..5c25f7ca 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java
@@ -93,7 +93,7 @@ public class ParamController extends BladeController {
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(paramService.deleteLogic(Func.toIntList(ids)));
+ return R.status(paramService.deleteLogic(Func.toLongList(ids)));
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
index 6d5e672a..a1505fe4 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
@@ -109,7 +109,7 @@ public class RoleController extends BladeController {
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids", position = 5)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(roleService.removeByIds(Func.toIntList(ids)));
+ return R.status(roleService.removeByIds(Func.toLongList(ids)));
}
/**
@@ -123,7 +123,7 @@ public class RoleController extends BladeController {
@ApiOperation(value = "权限设置", notes = "传入roleId集合以及menuId集合", position = 6)
public R grant(@ApiParam(value = "roleId集合", required = true) @RequestParam String roleIds,
@ApiParam(value = "menuId集合", required = true) @RequestParam String menuIds) {
- boolean temp = roleService.grant(Func.toIntList(roleIds), Func.toIntList(menuIds));
+ boolean temp = roleService.grant(Func.toLongList(roleIds), Func.toLongList(menuIds));
return R.status(temp);
}
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 14a665eb..fbb60e37 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
@@ -113,7 +113,7 @@ public class TenantController extends BladeController {
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 8)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(tenantService.deleteLogic(Func.toIntList(ids)));
+ return R.status(tenantService.deleteLogic(Func.toLongList(ids)));
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
index 87d5beee..937b151c 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
@@ -44,31 +44,31 @@ public class SysClient implements ISysClient {
@Override
@GetMapping(DEPT)
- public Dept getDept(Integer id) {
+ public Dept getDept(Long id) {
return deptService.getById(id);
}
@Override
@GetMapping(DEPT_NAME)
- public String getDeptName(Integer id) {
+ public String getDeptName(Long id) {
return deptService.getById(id).getDeptName();
}
@Override
@GetMapping(ROLE)
- public Role getRole(Integer id) {
+ public Role getRole(Long id) {
return roleService.getById(id);
}
@Override
@GetMapping(ROLE_NAME)
- public String getRoleName(Integer id) {
+ public String getRoleName(Long id) {
return roleService.getById(id).getRoleName();
}
@Override
@GetMapping(ROLE_ALIAS)
- public String getRoleAlias(Integer id) {
+ public String getRoleAlias(Long id) {
return roleService.getById(id).getRoleAlias();
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
index 250fd25a..d1fdbd4e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
@@ -60,7 +60,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @param roleId
* @return
*/
- List<MenuVO> grantTreeByRole(List<Integer> roleId);
+ List<MenuVO> grantTreeByRole(List<Long> roleId);
/**
* 所有菜单
@@ -75,7 +75,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @param roleId
* @return
*/
- List<Menu> roleMenu(List<Integer> roleId);
+ List<Menu> roleMenu(List<Long> roleId);
/**
* 菜单树形结构
@@ -83,7 +83,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @param roleId
* @return
*/
- List<Menu> routes(List<Integer> roleId);
+ List<Menu> routes(List<Long> roleId);
/**
* 按钮树形结构
@@ -91,7 +91,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @param roleId
* @return
*/
- List<Menu> buttons(List<Integer> roleId);
+ List<Menu> buttons(List<Long> roleId);
/**
* 获取配置的角色权限
@@ -99,5 +99,5 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @param roleIds
* @return
*/
- List<MenuDTO> authRoutes(List<Integer> roleIds);
+ List<MenuDTO> authRoutes(List<Long> roleIds);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java
index a37cac02..1b78479c 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java
@@ -55,6 +55,6 @@ public interface IRoleService extends IService<Role> {
* @param menuIds 菜单id集合
* @return 是否成功
*/
- boolean grant(@NotEmpty List<Integer> roleIds, @NotEmpty List<Integer> menuIds);
+ boolean grant(@NotEmpty List<Long> roleIds, @NotEmpty List<Long> menuIds);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
index fbdd0a2d..47287349 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
@@ -60,7 +60,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
@Override
public List<MenuVO> routes(String roleId) {
List<Menu> allMenus = baseMapper.allMenu();
- List<Menu> roleMenus = baseMapper.roleMenu(Func.toIntList(roleId));
+ List<Menu> roleMenus = baseMapper.roleMenu(Func.toLongList(roleId));
List<Menu> routes = new LinkedList<>(roleMenus);
roleMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
routes.sort(Comparator.comparing(Menu::getSort));
@@ -79,7 +79,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
@Override
public List<MenuVO> buttons(String roleId) {
- List<Menu> buttons = baseMapper.buttons(Func.toIntList(roleId));
+ List<Menu> buttons = baseMapper.buttons(Func.toLongList(roleId));
MenuWrapper menuWrapper = new MenuWrapper();
return menuWrapper.listNodeVO(buttons);
}
@@ -91,19 +91,19 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
@Override
public List<MenuVO> grantTree(BladeUser user) {
- return ForestNodeMerger.merge(user.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toIntList(user.getRoleId())));
+ return ForestNodeMerger.merge(user.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId())));
}
@Override
public List<String> roleTreeKeys(String roleIds) {
- List<RoleMenu> roleMenus = roleMenuService.list(Wrappers.<RoleMenu>query().lambda().in(RoleMenu::getRoleId, Func.toIntList(roleIds)));
+ List<RoleMenu> roleMenus = roleMenuService.list(Wrappers.<RoleMenu>query().lambda().in(RoleMenu::getRoleId, Func.toLongList(roleIds)));
return roleMenus.stream().map(roleMenu -> Func.toStr(roleMenu.getMenuId())).collect(Collectors.toList());
}
@Override
@Cacheable(cacheNames = AUTH_ROUTES, key = "#user.roleId")
public List<Kv> authRoutes(BladeUser user) {
- List<MenuDTO> routes = baseMapper.authRoutes(Func.toIntList(user.getRoleId()));
+ List<MenuDTO> routes = baseMapper.authRoutes(Func.toLongList(user.getRoleId()));
List<Kv> list = new ArrayList<>();
routes.forEach(route -> list.add(Kv.create().set(route.getPath(), Kv.create().set("authority", Func.toStrArray(route.getAlias())))));
return list;
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
index 9e4eb964..6a71d779 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
@@ -66,7 +66,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
@Override
- public boolean grant(@NotEmpty List<Integer> roleIds, @NotEmpty List<Integer> menuIds) {
+ public boolean grant(@NotEmpty List<Long> roleIds, @NotEmpty List<Long> menuIds) {
// 删除角色配置的菜单集合
roleMenuService.remove(Wrappers.<RoleMenu>update().lambda().in(RoleMenu::getRoleId, roleIds));
// 组装配置
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index 2df02eb4..c6443851 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -19,6 +19,7 @@ package org.springblade.system.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tenant.TenantId;
import org.springblade.core.tool.constant.BladeConstant;
@@ -65,7 +66,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
// 新建租户对应的默认角色
Role role = new Role();
role.setTenantCode(tenantCode);
- role.setParentId(0);
+ role.setParentId(CommonConstant.TOP_PARENT_ID);
role.setRoleName("管理员");
role.setRoleAlias("admin");
role.setSort(2);
@@ -74,7 +75,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
// 新建租户对应的默认部门
Dept dept = new Dept();
dept.setTenantCode(tenantCode);
- dept.setParentId(0);
+ dept.setParentId(CommonConstant.TOP_PARENT_ID);
dept.setDeptName(tenant.getTenantName());
dept.setFullName(tenant.getTenantName());
dept.setSort(2);
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 daa75a3f..7b4bc891 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
@@ -111,10 +111,10 @@ public class UserController {
* 删除
*/
@PostMapping("/remove")
- @ApiOperation(value = "删除", notes = "传入地基和", position = 5)
+ @ApiOperation(value = "删除", notes = "传入id集合", position = 5)
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R remove(@RequestParam String ids) {
- return R.status(userService.deleteLogic(Func.toIntList(ids)));
+ return R.status(userService.deleteLogic(Func.toLongList(ids)));
}
/**
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
index 1961bd63..9f143e84 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
@@ -37,7 +37,7 @@ public class UserClient implements IUserClient {
@Override
@GetMapping(USER_INFO_BY_ID)
- public R<User> userInfoById(Integer userId) {
+ public R<User> userInfoById(Long userId) {
return R.data(service.getById(userId));
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 4734f421..75cd3aec 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -75,7 +75,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
public boolean grant(String userIds, String roleIds) {
User user = new User();
user.setRoleId(roleIds);
- return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toIntList(userIds)));
+ return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
}
@Override
@@ -83,7 +83,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
User user = new User();
user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
user.setUpdateTime(LocalDateTime.now());
- return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toIntList(userIds)));
+ return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
}
@Override
diff --git a/doc/sql/bladex-sword-mysql.sql b/doc/sql/bladex-sword-mysql.sql
index 23057675..d4d43338 100644
--- a/doc/sql/bladex-sword-mysql.sql
+++ b/doc/sql/bladex-sword-mysql.sql
@@ -11,7 +11,7 @@
Target Server Version : 50723
File Encoding : 65001
- Date: 01/05/2019 23:05:28
+ Date: 06/05/2019 16:04:41
*/
SET NAMES utf8mb4;
@@ -22,7 +22,7 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
DROP TABLE IF EXISTS `blade_client`;
CREATE TABLE `blade_client` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`client_id` varchar(48) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户端id',
`client_secret` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户端密钥',
`resource_ids` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资源集合',
@@ -34,20 +34,20 @@ CREATE TABLE `blade_client` (
`refresh_token_validity` int(11) NOT NULL COMMENT '刷新令牌过期秒数',
`additional_information` varchar(4096) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加说明',
`autoapprove` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '自动授权',
- `create_user` int(11) NULL DEFAULT NULL COMMENT '创建人',
+ `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_user` int(11) NULL DEFAULT NULL COMMENT '修改人',
+ `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`status` int(2) NOT NULL COMMENT '状态',
`is_deleted` int(2) NOT NULL COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_client
-- ----------------------------
BEGIN;
-INSERT INTO `blade_client` VALUES (1, 'sword', 'sword_secret', NULL, 'all', 'refresh_token,password,authorization_code', 'http://localhost:8888', NULL, 3600, 604800, NULL, NULL, 1, '2019-03-24 10:40:55', 1, '2019-03-24 10:40:59', 1, 0), (2, 'saber', 'saber_secret', NULL, 'all', 'refresh_token,password,authorization_code', 'http://localhost:8080', NULL, 3600, 604800, NULL, NULL, 1, '2019-03-24 10:42:29', 1, '2019-03-24 10:42:32', 1, 0);
+INSERT INTO `blade_client` VALUES (1123598815738675201, 'sword', 'sword_secret', NULL, 'all', 'refresh_token,password,authorization_code', 'http://localhost:8888', NULL, 3600, 604800, NULL, NULL, 1123598815738675201, '2019-03-24 10:40:55', 1123598815738675201, '2019-03-24 10:40:59', 1, 0), (1123598815738675202, 'saber', 'saber_secret', NULL, 'all', 'refresh_token,password,authorization_code', 'http://localhost:8080', NULL, 3600, 604800, NULL, NULL, 1123598815738675201, '2019-03-24 10:42:29', 1123598815738675201, '2019-03-24 10:42:32', 1, 0);
COMMIT;
-- ----------------------------
@@ -55,7 +55,7 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_code`;
CREATE TABLE `blade_code` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`service_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务名称',
`code_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模块名称',
`table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '表名',
@@ -66,13 +66,13 @@ CREATE TABLE `blade_code` (
`web_path` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '前端路径',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_code
-- ----------------------------
BEGIN;
-INSERT INTO `blade_code` VALUES (1, 'blade-demo', '通知公告', 'blade_notice', 'blade_', 'id', 'org.springblade.desktop', 'D:\\Develop\\WorkSpace\\Git\\SpringBlade\\blade-ops\\blade-develop', 'D:\\Develop\\WorkSpace\\Git\\Sword', 0);
+INSERT INTO `blade_code` VALUES (1123598815738675201, 'blade-demo', '通知公告', 'blade_notice', 'blade_', 'id', 'org.springblade.desktop', 'D:\\Develop\\WorkSpace\\Git\\SpringBlade\\blade-ops\\blade-develop', 'D:\\Develop\\WorkSpace\\Git\\Sword', 0);
COMMIT;
-- ----------------------------
@@ -80,22 +80,22 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_dept`;
CREATE TABLE `blade_dept` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
- `parent_id` int(11) NULL DEFAULT 0 COMMENT '父主键',
+ `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
`dept_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门名',
`full_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门全称',
`sort` int(11) NULL DEFAULT NULL COMMENT '排序',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_dept
-- ----------------------------
BEGIN;
-INSERT INTO `blade_dept` VALUES (1, '000000', 0, '刀锋科技', '江苏刀锋科技有限公司', 1, NULL, 0), (2, '000000', 1, '常州刀锋', '常州刀锋科技有限公司', 1, NULL, 0), (3, '000000', 1, '苏州刀锋', '苏州刀锋科技有限公司', 1, NULL, 0);
+INSERT INTO `blade_dept` VALUES (1123598815738675201, '000000', 0, '刀锋科技', '江苏刀锋科技有限公司', 1, NULL, 0), (1123598815738675202, '000000', 1123598815738675201, '常州刀锋', '常州刀锋科技有限公司', 1, NULL, 0), (1123598815738675203, '000000', 1123598815738675201, '苏州刀锋', '苏州刀锋科技有限公司', 1, NULL, 0);
COMMIT;
-- ----------------------------
@@ -103,8 +103,8 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_dict`;
CREATE TABLE `blade_dict` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `parent_id` int(11) NULL DEFAULT 0 COMMENT '父主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
+ `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典码',
`dict_key` int(2) NULL DEFAULT NULL COMMENT '字典值',
`dict_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典名称',
@@ -112,13 +112,13 @@ CREATE TABLE `blade_dict` (
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典备注',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_dict
-- ----------------------------
BEGIN;
-INSERT INTO `blade_dict` VALUES (1, 0, 'sex', -1, '性别', 1, NULL, 0), (2, 1, 'sex', 1, '男', 1, NULL, 0), (3, 1, 'sex', 2, '女', 2, NULL, 0), (4, 0, 'notice', -1, '通知类型', 2, NULL, 0), (5, 4, 'notice', 1, '发布通知', 1, NULL, 0), (6, 4, 'notice', 2, '批转通知', 2, NULL, 0), (7, 4, 'notice', 3, '转发通知', 3, NULL, 0), (8, 4, 'notice', 4, '指示通知', 4, NULL, 0), (9, 4, 'notice', 5, '任免通知', 5, NULL, 0), (10, 4, 'notice', 6, '事务通知', 6, NULL, 0), (11, 0, 'menu_category', -1, '菜单类型', 3, NULL, 0), (12, 11, 'menu_category', 1, '菜单', 1, NULL, 0), (13, 11, 'menu_category', 2, '按钮', 2, NULL, 0), (14, 0, 'button_func', -1, '按钮功能', 4, NULL, 0), (15, 14, 'button_func', 1, '工具栏', 1, NULL, 0), (16, 14, 'button_func', 2, '操作栏', 2, NULL, 0), (17, 14, 'button_func', 3, '工具操作栏', 3, NULL, 0), (18, 0, 'yes_no', -1, '是否', 5, NULL, 0), (19, 18, 'yes_no', 1, '否', 1, NULL, 0), (20, 18, 'yes_no', 2, '是', 2, NULL, 0), (21, 0, 'flow', -1, '流程类型', 5, NULL, 0), (22, 21, 'flow', 1, '请假流程', 1, NULL, 0), (23, 21, 'flow', 2, '报销流程', 2, NULL, 0);
+INSERT INTO `blade_dict` VALUES (1123598815738675201, 0, 'sex', -1, '性别', 1, NULL, 0), (1123598815738675202, 1123598815738675201, 'sex', 1, '男', 1, NULL, 0), (1123598815738675203, 1123598815738675201, 'sex', 2, '女', 2, NULL, 0), (1123598815738675204, 0, 'notice', -1, '通知类型', 2, NULL, 0), (1123598815738675205, 1123598815738675204, 'notice', 1, '发布通知', 1, NULL, 0), (1123598815738675206, 1123598815738675204, 'notice', 2, '批转通知', 2, NULL, 0), (1123598815738675207, 1123598815738675204, 'notice', 3, '转发通知', 3, NULL, 0), (1123598815738675208, 1123598815738675204, 'notice', 4, '指示通知', 4, NULL, 0), (1123598815738675209, 1123598815738675204, 'notice', 5, '任免通知', 5, NULL, 0), (1123598815738675210, 1123598815738675204, 'notice', 6, '事务通知', 6, NULL, 0), (1123598815738675211, 0, 'menu_category', -1, '菜单类型', 3, NULL, 0), (1123598815738675212, 1123598815738675211, 'menu_category', 1, '菜单', 1, NULL, 0), (1123598815738675213, 1123598815738675211, 'menu_category', 2, '按钮', 2, NULL, 0), (1123598815738675214, 0, 'button_func', -1, '按钮功能', 4, NULL, 0), (1123598815738675215, 1123598815738675214, 'button_func', 1, '工具栏', 1, NULL, 0), (1123598815738675216, 1123598815738675214, 'button_func', 2, '操作栏', 2, NULL, 0), (1123598815738675217, 1123598815738675214, 'button_func', 3, '工具操作栏', 3, NULL, 0), (1123598815738675218, 0, 'yes_no', -1, '是否', 5, NULL, 0), (1123598815738675219, 1123598815738675218, 'yes_no', 1, '否', 1, NULL, 0), (1123598815738675220, 1123598815738675218, 'yes_no', 2, '是', 2, NULL, 0), (1123598815738675221, 0, 'flow', -1, '流程类型', 5, NULL, 0), (1123598815738675222, 1123598815738675221, 'flow', 1, '请假流程', 1, NULL, 0), (1123598815738675223, 1123598815738675221, 'flow', 2, '报销流程', 2, NULL, 0);
COMMIT;
-- ----------------------------
@@ -202,8 +202,8 @@ CREATE TABLE `blade_log_usual` (
-- ----------------------------
DROP TABLE IF EXISTS `blade_menu`;
CREATE TABLE `blade_menu` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `parent_id` int(11) NULL DEFAULT 0 COMMENT '父级菜单',
+ `id` bigint(64) NOT NULL COMMENT '主键',
+ `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父级菜单',
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单编号',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单名称',
`alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单别名',
@@ -216,13 +216,13 @@ CREATE TABLE `blade_menu` (
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 98 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_menu
-- ----------------------------
BEGIN;
-INSERT INTO `blade_menu` VALUES (1, 0, 'desk', '工作台', 'menu', '/desk', 'desktop', 1, 1, 0, 1, NULL, 0), (2, 1, 'notice', '通知公告', 'menu', '/desk/notice', NULL, 1, 1, 0, 1, NULL, 0), (3, 0, 'system', '系统管理', 'menu', '/system', 'setting', 99, 1, 0, 1, NULL, 0), (4, 3, 'user', '用户管理', 'menu', '/system/user', NULL, 1, 1, 0, 1, NULL, 0), (5, 3, 'dept', '部门管理', 'menu', '/system/dept', NULL, 2, 1, 0, 1, NULL, 0), (6, 3, 'dict', '字典管理', 'menu', '/system/dict', NULL, 3, 1, 0, 1, NULL, 0), (7, 3, 'menu', '菜单管理', 'menu', '/system/menu', NULL, 4, 1, 0, 1, NULL, 0), (8, 3, 'role', '角色管理', 'menu', '/system/role', NULL, 5, 1, 0, 1, NULL, 0), (9, 3, 'param', '参数管理', 'menu', '/system/param', NULL, 6, 1, 0, 1, NULL, 0), (10, 0, 'monitor', '系统监控', 'menu', '/monitor', 'fund', 3, 1, 0, 1, NULL, 0), (11, 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', NULL, 1, 1, 0, 2, NULL, 0), (12, 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, 2, 1, 0, 2, NULL, 0), (13, 10, 'log', '日志管理', 'menu', '/monitor/log', NULL, 3, 1, 0, 1, NULL, 0), (14, 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, 0, 'tool', '研发工具', 'menu', '/tool', 'tool', 4, 1, 0, 1, NULL, 0), (18, 17, 'code', '代码生成', 'menu', '/tool/code', NULL, 1, 1, 0, 1, NULL, 0), (19, 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0), (61, 3, 'client', '应用管理', 'menu', '/system/client', NULL, 8, 1, 0, 1, NULL, 0), (62, 61, 'client_add', '新增', 'add', '/system/client/add', 'plus', 1, 2, 1, 1, NULL, 0), (63, 61, 'client_edit', '修改', 'edit', '/system/client/edit', 'form', 2, 2, 2, 2, NULL, 0), (64, 61, 'client_delete', '删除', 'delete', '/api/blade-system/client/remove', 'delete', 3, 2, 3, 3, NULL, 0), (65, 61, 'client_view', '查看', 'view', '/system/client/view', 'file-text', 4, 2, 2, 2, NULL, 0), (66, 0, 'flow', '流程管理', 'menu', '/flow', 'stock', 5, 1, 0, 1, NULL, 0), (67, 66, 'flow_model', '模型管理', 'menu', '/flow/model', NULL, 1, 1, 0, 1, NULL, 0), (68, 67, 'flow_model_create', '创建', 'create', '', 'plus', 1, 2, 1, 1, NULL, 0), (69, 67, 'flow_model_update', '编辑', 'update', '', 'form', 2, 2, 2, 1, NULL, 0), (70, 67, 'flow_model_deploy', '部署', 'deploy', '', 'cloud-upload', 3, 2, 2, 1, NULL, 0), (71, 67, 'flow_model_download', '下载', 'download', '', 'download', 4, 2, 2, 1, NULL, 0), (72, 67, 'flow_model_delete', '删除', 'delete', '/api/blade-flow/model/remove', 'delete', 5, 2, 3, 1, NULL, 0), (73, 66, 'flow_deploy', '流程部署', 'menu', '/flow/deploy', NULL, 2, 1, 0, 1, NULL, 0), (74, 66, 'flow_manager', '流程管理', 'menu', '/flow/manager', NULL, 3, 1, 0, 1, NULL, 0), (75, 74, 'flow_manager_state', '变更状态', 'state', '', 'plus', 1, 2, 2, 1, NULL, 0), (76, 74, 'flow_manager_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (77, 74, 'flow_manager_remove', '删除', 'remove', '', 'delete', 3, 2, 3, 1, NULL, 0), (78, 66, 'flow_follow', '流程跟踪', 'menu', '/flow/follow', NULL, 4, 1, 0, 1, NULL, 0), (79, 78, 'flow_follow_delete', '删除', 'remove', '', 'remove', 1, 2, 2, 1, NULL, 0), (80, 0, 'work', '我的事务', 'work', '/work', 'bell', 2, 1, 0, 1, NULL, 0), (81, 80, 'work_start', '发起事务', 'menu', '/work/start', NULL, 1, 1, 0, 1, NULL, 0), (82, 81, 'work_start_flow', '发起', 'flow', '', 'flow', 1, 2, 2, 1, NULL, 0), (83, 81, 'work_start_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (84, 80, 'work_claim', '待签事务', 'menu', '/work/claim', NULL, 2, 1, 0, 1, NULL, 0), (85, 84, 'work_claim_sign', '签收', 'sign', '', 'sign', 1, 2, 2, 1, NULL, 0), (86, 84, 'work_claim_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (87, 84, 'work_claim_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (88, 80, 'work_todo', '待办事务', 'menu', '/work/todo', NULL, 2, 1, 0, 1, NULL, 0), (89, 88, 'work_todo_handle', '办理', 'handle', '', 'handle', 1, 2, 2, 1, NULL, 0), (90, 88, 'work_todo_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (91, 88, 'work_todo_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (92, 80, 'work_send', '已发事务', 'menu', '/work/send', NULL, 3, 1, 0, 1, NULL, 0), (93, 92, 'work_send_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (94, 92, 'work_send_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0), (95, 80, 'work_done', '办结事务', 'menu', '/work/done', NULL, 4, 1, 0, 1, NULL, 0), (96, 95, 'work_done_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (97, 95, 'work_done_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu` VALUES (1123598815738675201, 0, 'desk', '工作台', 'menu', '/desk', 'desktop', 1, 1, 0, 1, NULL, 0), (1123598815738675202, 1123598815738675201, 'notice', '通知公告', 'menu', '/desk/notice', NULL, 1, 1, 0, 1, NULL, 0), (1123598815738675203, 0, 'system', '系统管理', 'menu', '/system', 'setting', 99, 1, 0, 1, NULL, 0), (1123598815738675204, 1123598815738675203, 'user', '用户管理', 'menu', '/system/user', NULL, 1, 1, 0, 1, NULL, 0), (1123598815738675205, 1123598815738675203, 'dept', '部门管理', 'menu', '/system/dept', NULL, 2, 1, 0, 1, NULL, 0), (1123598815738675206, 1123598815738675203, 'dict', '字典管理', 'menu', '/system/dict', NULL, 3, 1, 0, 1, NULL, 0), (1123598815738675207, 1123598815738675203, 'menu', '菜单管理', 'menu', '/system/menu', NULL, 4, 1, 0, 1, NULL, 0), (1123598815738675208, 1123598815738675203, 'role', '角色管理', 'menu', '/system/role', NULL, 5, 1, 0, 1, NULL, 0), (1123598815738675209, 1123598815738675203, 'param', '参数管理', 'menu', '/system/param', NULL, 6, 1, 0, 1, NULL, 0), (1123598815738675210, 0, 'monitor', '系统监控', 'menu', '/monitor', 'fund', 3, 1, 0, 1, NULL, 0), (1123598815738675211, 1123598815738675210, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', NULL, 1, 1, 0, 2, NULL, 0), (1123598815738675212, 1123598815738675210, 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, 2, 1, 0, 2, NULL, 0), (1123598815738675213, 1123598815738675210, 'log', '日志管理', 'menu', '/monitor/log', NULL, 3, 1, 0, 1, NULL, 0), (1123598815738675214, 1123598815738675213, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (1123598815738675215, 1123598815738675213, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (1123598815738675216, 1123598815738675213, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (1123598815738675217, 0, 'tool', '研发工具', 'menu', '/tool', 'tool', 4, 1, 0, 1, NULL, 0), (1123598815738675218, 1123598815738675217, 'code', '代码生成', 'menu', '/tool/code', NULL, 1, 1, 0, 1, NULL, 0), (1123598815738675219, 1123598815738675202, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675220, 1123598815738675202, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675221, 1123598815738675202, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675222, 1123598815738675202, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675223, 1123598815738675204, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675224, 1123598815738675204, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675225, 1123598815738675204, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675226, 1123598815738675204, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (1123598815738675227, 1123598815738675204, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (1123598815738675228, 1123598815738675204, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (1123598815738675229, 1123598815738675205, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675230, 1123598815738675205, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675231, 1123598815738675205, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675232, 1123598815738675205, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675233, 1123598815738675206, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675234, 1123598815738675206, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675235, 1123598815738675206, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675236, 1123598815738675206, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675237, 1123598815738675207, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675238, 1123598815738675207, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675239, 1123598815738675207, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675240, 1123598815738675207, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675241, 1123598815738675208, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675242, 1123598815738675208, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675243, 1123598815738675208, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675244, 1123598815738675208, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675245, 1123598815738675209, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675246, 1123598815738675209, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675247, 1123598815738675209, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675248, 1123598815738675209, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675249, 1123598815738675214, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675250, 1123598815738675215, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675251, 1123598815738675216, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675252, 1123598815738675218, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675253, 1123598815738675218, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675254, 1123598815738675218, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675255, 1123598815738675218, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675256, 1123598815738675203, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (1123598815738675257, 1123598815738675256, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675258, 1123598815738675256, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675259, 1123598815738675256, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675260, 1123598815738675256, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0), (1123598815738675261, 1123598815738675203, 'client', '应用管理', 'menu', '/system/client', NULL, 8, 1, 0, 1, NULL, 0), (1123598815738675262, 1123598815738675261, 'client_add', '新增', 'add', '/system/client/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675263, 1123598815738675261, 'client_edit', '修改', 'edit', '/system/client/edit', 'form', 2, 2, 2, 2, NULL, 0), (1123598815738675264, 1123598815738675261, 'client_delete', '删除', 'delete', '/api/blade-system/client/remove', 'delete', 3, 2, 3, 3, NULL, 0), (1123598815738675265, 1123598815738675261, 'client_view', '查看', 'view', '/system/client/view', 'file-text', 4, 2, 2, 2, NULL, 0), (1123598815738675266, 0, 'flow', '流程管理', 'menu', '/flow', 'stock', 5, 1, 0, 1, NULL, 0), (1123598815738675267, 1123598815738675266, 'flow_model', '模型管理', 'menu', '/flow/model', NULL, 1, 1, 0, 1, NULL, 0), (1123598815738675268, 1123598815738675267, 'flow_model_create', '创建', 'create', '', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675269, 1123598815738675267, 'flow_model_update', '编辑', 'update', '', 'form', 2, 2, 2, 1, NULL, 0), (1123598815738675270, 1123598815738675267, 'flow_model_deploy', '部署', 'deploy', '', 'cloud-upload', 3, 2, 2, 1, NULL, 0), (1123598815738675271, 1123598815738675267, 'flow_model_download', '下载', 'download', '', 'download', 4, 2, 2, 1, NULL, 0), (1123598815738675272, 1123598815738675267, 'flow_model_delete', '删除', 'delete', '/api/blade-flow/model/remove', 'delete', 5, 2, 3, 1, NULL, 0), (1123598815738675273, 1123598815738675266, 'flow_deploy', '流程部署', 'menu', '/flow/deploy', NULL, 2, 1, 0, 1, NULL, 0), (1123598815738675274, 1123598815738675266, 'flow_manager', '流程管理', 'menu', '/flow/manager', NULL, 3, 1, 0, 1, NULL, 0), (1123598815738675275, 1123598815738675274, 'flow_manager_state', '变更状态', 'state', '', 'plus', 1, 2, 2, 1, NULL, 0), (1123598815738675276, 1123598815738675274, 'flow_manager_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (1123598815738675277, 1123598815738675274, 'flow_manager_remove', '删除', 'remove', '', 'delete', 3, 2, 3, 1, NULL, 0), (1123598815738675278, 1123598815738675266, 'flow_follow', '流程跟踪', 'menu', '/flow/follow', NULL, 4, 1, 0, 1, NULL, 0), (1123598815738675279, 1123598815738675278, 'flow_follow_delete', '删除', 'remove', '', 'remove', 1, 2, 2, 1, NULL, 0), (1123598815738675280, 0, 'work', '我的事务', 'work', '/work', 'bell', 2, 1, 0, 1, NULL, 0), (1123598815738675281, 1123598815738675280, 'work_start', '发起事务', 'menu', '/work/start', NULL, 1, 1, 0, 1, NULL, 0), (1123598815738675282, 1123598815738675281, 'work_start_flow', '发起', 'flow', '', 'flow', 1, 2, 2, 1, NULL, 0), (1123598815738675283, 1123598815738675281, 'work_start_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (1123598815738675284, 1123598815738675280, 'work_claim', '待签事务', 'menu', '/work/claim', NULL, 2, 1, 0, 1, NULL, 0), (1123598815738675285, 1123598815738675284, 'work_claim_sign', '签收', 'sign', '', 'sign', 1, 2, 2, 1, NULL, 0), (1123598815738675286, 1123598815738675284, 'work_claim_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (1123598815738675287, 1123598815738675284, 'work_claim_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (1123598815738675288, 1123598815738675280, 'work_todo', '待办事务', 'menu', '/work/todo', NULL, 2, 1, 0, 1, NULL, 0), (1123598815738675289, 1123598815738675288, 'work_todo_handle', '办理', 'handle', '', 'handle', 1, 2, 2, 1, NULL, 0), (1123598815738675290, 1123598815738675288, 'work_todo_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (1123598815738675291, 1123598815738675288, 'work_todo_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (1123598815738675292, 1123598815738675280, 'work_send', '已发事务', 'menu', '/work/send', NULL, 3, 1, 0, 1, NULL, 0), (1123598815738675293, 1123598815738675292, 'work_send_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (1123598815738675294, 1123598815738675292, 'work_send_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0), (1123598815738675295, 1123598815738675280, 'work_done', '办结事务', 'menu', '/work/done', NULL, 4, 1, 0, 1, NULL, 0), (1123598815738675296, 1123598815738675295, 'work_done_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (1123598815738675297, 1123598815738675295, 'work_done_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0);
COMMIT;
-- ----------------------------
@@ -230,26 +230,26 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_notice`;
CREATE TABLE `blade_notice` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
`title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
`category` int(11) NULL DEFAULT NULL COMMENT '类型',
`release_time` datetime(0) NULL DEFAULT NULL COMMENT '发布时间',
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容',
- `create_user` int(11) NULL DEFAULT NULL COMMENT '创建人',
+ `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_user` int(11) NULL DEFAULT NULL COMMENT '修改人',
+ `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`status` int(2) NULL DEFAULT NULL COMMENT '状态',
`is_deleted` int(2) NULL DEFAULT NULL COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_notice
-- ----------------------------
BEGIN;
-INSERT INTO `blade_notice` VALUES (23, '000000', '测试公告', 3, '2018-12-31 20:03:31', '222', 1, '2018-12-05 20:03:31', 1, '2018-12-28 11:10:51', 1, 0), (24, '000000', '测试公告2', 1, '2018-12-05 20:03:31', '333', 1, '2018-12-28 10:32:26', 1, '2018-12-28 11:10:34', 1, 0), (25, '000000', '测试公告3', 6, '2018-12-29 00:00:00', '11111', 1, '2018-12-28 11:03:44', 1, '2018-12-28 11:10:28', 1, 0);
+INSERT INTO `blade_notice` VALUES (1123598815738675223, '000000', '测试公告', 3, '2018-12-31 20:03:31', '222', 1123598815738675201, '2018-12-05 20:03:31', 1123598815738675201, '2018-12-28 11:10:51', 1, 0), (1123598815738675224, '000000', '测试公告2', 1, '2018-12-05 20:03:31', '333', 1123598815738675201, '2018-12-28 10:32:26', 1123598815738675201, '2018-12-28 11:10:34', 1, 0), (1123598815738675225, '000000', '测试公告3', 6, '2018-12-29 00:00:00', '11111', 1123598815738675201, '2018-12-28 11:03:44', 1123598815738675201, '2018-12-28 11:10:28', 1, 0);
COMMIT;
-- ----------------------------
@@ -257,25 +257,25 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_param`;
CREATE TABLE `blade_param` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`param_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名',
`param_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数键',
`param_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数值',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
- `create_user` int(11) NULL DEFAULT NULL COMMENT '创建人',
+ `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_user` int(11) NULL DEFAULT NULL COMMENT '修改人',
+ `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`status` int(2) NULL DEFAULT NULL COMMENT '状态',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_param
-- ----------------------------
BEGIN;
-INSERT INTO `blade_param` VALUES (1, '是否开启注册功能', 'account.registerUser', 'true', '开启注册', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0), (2, '账号初始密码', 'account.initPassword', '123456', '初始密码', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0);
+INSERT INTO `blade_param` VALUES (1123598815738675201, '是否开启注册功能', 'account.registerUser', 'true', '开启注册', 1123598815738675201, '2018-12-28 12:19:01', 1123598815738675201, '2018-12-28 12:19:01', 1, 0), (1123598815738675202, '账号初始密码', 'account.initPassword', '123456', '初始密码', 1123598815738675201, '2018-12-28 12:19:01', 1123598815738675201, '2018-12-28 12:19:01', 1, 0);
COMMIT;
-- ----------------------------
@@ -283,7 +283,7 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_process_leave`;
CREATE TABLE `blade_process_leave` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号',
+ `id` bigint(64) NOT NULL COMMENT '编号',
`process_definition_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程定义主键',
`process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例主键',
`start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
@@ -298,28 +298,28 @@ CREATE TABLE `blade_process_leave` (
`status` int(2) NULL DEFAULT NULL COMMENT '状态',
`is_deleted` int(2) NULL DEFAULT NULL COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Table structure for blade_role
-- ----------------------------
DROP TABLE IF EXISTS `blade_role`;
CREATE TABLE `blade_role` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
- `parent_id` int(11) NULL DEFAULT 0 COMMENT '父主键',
+ `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
`role_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色名',
`sort` int(11) NULL DEFAULT NULL COMMENT '排序',
`role_alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色别名',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_role
-- ----------------------------
BEGIN;
-INSERT INTO `blade_role` VALUES (1, '000000', 0, '超级管理员', 1, 'administrator', 0), (2, '000000', 0, '用户', 2, 'user', 0), (3, '000000', 2, '人事', 1, 'hr', 0), (4, '000000', 2, '经理', 2, 'manager', 0), (5, '000000', 2, '老板', 3, 'boss', 0);
+INSERT INTO `blade_role` VALUES (1123598815738675201, '000000', 0, '超级管理员', 1, 'administrator', 0), (1123598815738675202, '000000', 0, '用户', 2, 'user', 0), (1123598815738675203, '000000', 1123598815738675202, '人事', 1, 'hr', 0), (1123598815738675204, '000000', 1123598815738675202, '经理', 2, 'manager', 0), (1123598815738675205, '000000', 1123598815738675202, '老板', 3, 'boss', 0);
COMMIT;
-- ----------------------------
@@ -327,17 +327,17 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_role_menu`;
CREATE TABLE `blade_role_menu` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `menu_id` int(11) NULL DEFAULT NULL COMMENT '菜单id',
- `role_id` int(11) NULL DEFAULT NULL COMMENT '角色id',
+ `id` bigint(64) NOT NULL COMMENT '主键',
+ `menu_id` bigint(64) NULL DEFAULT NULL COMMENT '菜单id',
+ `role_id` bigint(64) NULL DEFAULT NULL COMMENT '角色id',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 259 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_role_menu
-- ----------------------------
BEGIN;
-INSERT INTO `blade_role_menu` VALUES (66, 1, 1), (67, 2, 1), (68, 3, 1), (69, 4, 1), (70, 5, 1), (71, 6, 1), (72, 7, 1), (73, 8, 1), (74, 9, 1), (75, 10, 1), (76, 11, 1), (77, 12, 1), (78, 13, 1), (79, 14, 1), (80, 15, 1), (81, 16, 1), (82, 17, 1), (83, 18, 1), (84, 19, 1), (85, 20, 1), (86, 21, 1), (87, 22, 1), (88, 23, 1), (89, 24, 1), (90, 25, 1), (91, 26, 1), (92, 27, 1), (93, 28, 1), (94, 29, 1), (95, 30, 1), (96, 31, 1), (97, 32, 1), (98, 33, 1), (99, 34, 1), (100, 35, 1), (101, 36, 1), (102, 37, 1), (103, 38, 1), (104, 39, 1), (105, 40, 1), (106, 41, 1), (107, 42, 1), (108, 43, 1), (109, 44, 1), (110, 45, 1), (111, 46, 1), (112, 47, 1), (113, 48, 1), (114, 49, 1), (115, 50, 1), (116, 51, 1), (117, 52, 1), (118, 53, 1), (119, 54, 1), (120, 55, 1), (121, 56, 1), (122, 57, 1), (123, 58, 1), (124, 59, 1), (125, 60, 1), (126, 61, 1), (127, 62, 1), (128, 63, 1), (129, 64, 1), (130, 65, 1), (131, 66, 1), (132, 67, 1), (133, 68, 1), (134, 69, 1), (135, 70, 1), (136, 71, 1), (137, 72, 1), (138, 73, 1), (139, 74, 1), (140, 75, 1), (141, 76, 1), (142, 77, 1), (143, 78, 1), (144, 79, 1), (145, 80, 1), (146, 81, 1), (147, 82, 1), (148, 83, 1), (149, 84, 1), (150, 85, 1), (151, 86, 1), (152, 87, 1), (153, 88, 1), (154, 89, 1), (155, 90, 1), (156, 91, 1), (157, 92, 1), (158, 93, 1), (159, 94, 1), (160, 95, 1), (161, 96, 1), (162, 97, 1), (163, 1, 2), (164, 2, 2), (165, 19, 2), (166, 20, 2), (167, 21, 2), (168, 22, 2), (169, 80, 2), (170, 81, 2), (171, 82, 2), (172, 83, 2), (173, 84, 2), (174, 85, 2), (175, 86, 2), (176, 87, 2), (177, 88, 2), (178, 89, 2), (179, 90, 2), (180, 91, 2), (181, 92, 2), (182, 93, 2), (183, 94, 2), (184, 95, 2), (185, 96, 2), (186, 97, 2), (187, 1, 3), (188, 2, 3), (189, 19, 3), (190, 20, 3), (191, 21, 3), (192, 22, 3), (193, 80, 3), (194, 81, 3), (195, 82, 3), (196, 83, 3), (197, 84, 3), (198, 85, 3), (199, 86, 3), (200, 87, 3), (201, 88, 3), (202, 89, 3), (203, 90, 3), (204, 91, 3), (205, 92, 3), (206, 93, 3), (207, 94, 3), (208, 95, 3), (209, 96, 3), (210, 97, 3), (211, 1, 4), (212, 2, 4), (213, 19, 4), (214, 20, 4), (215, 21, 4), (216, 22, 4), (217, 80, 4), (218, 81, 4), (219, 82, 4), (220, 83, 4), (221, 84, 4), (222, 85, 4), (223, 86, 4), (224, 87, 4), (225, 88, 4), (226, 89, 4), (227, 90, 4), (228, 91, 4), (229, 92, 4), (230, 93, 4), (231, 94, 4), (232, 95, 4), (233, 96, 4), (234, 97, 4), (235, 1, 5), (236, 2, 5), (237, 19, 5), (238, 20, 5), (239, 21, 5), (240, 22, 5), (241, 80, 5), (242, 81, 5), (243, 82, 5), (244, 83, 5), (245, 84, 5), (246, 85, 5), (247, 86, 5), (248, 87, 5), (249, 88, 5), (250, 89, 5), (251, 90, 5), (252, 91, 5), (253, 92, 5), (254, 93, 5), (255, 94, 5), (256, 95, 5), (257, 96, 5), (258, 97, 5);
+INSERT INTO `blade_role_menu` VALUES (1123598815738675266, 1123598815738675201, 1123598815738675201), (1123598815738675267, 1123598815738675202, 1123598815738675201), (1123598815738675268, 1123598815738675203, 1123598815738675201), (1123598815738675269, 1123598815738675204, 1123598815738675201), (1123598815738675270, 1123598815738675205, 1123598815738675201), (1123598815738675271, 1123598815738675206, 1123598815738675201), (1123598815738675272, 1123598815738675207, 1123598815738675201), (1123598815738675273, 1123598815738675208, 1123598815738675201), (1123598815738675274, 1123598815738675209, 1123598815738675201), (1123598815738675275, 1123598815738675210, 1123598815738675201), (1123598815738675276, 1123598815738675211, 1123598815738675201), (1123598815738675277, 1123598815738675212, 1123598815738675201), (1123598815738675278, 1123598815738675213, 1123598815738675201), (1123598815738675279, 1123598815738675214, 1123598815738675201), (1123598815738675280, 1123598815738675215, 1123598815738675201), (1123598815738675281, 1123598815738675216, 1123598815738675201), (1123598815738675282, 1123598815738675217, 1123598815738675201), (1123598815738675283, 1123598815738675218, 1123598815738675201), (1123598815738675284, 1123598815738675219, 1123598815738675201), (1123598815738675285, 1123598815738675220, 1123598815738675201), (1123598815738675286, 1123598815738675221, 1123598815738675201), (1123598815738675287, 1123598815738675222, 1123598815738675201), (1123598815738675288, 1123598815738675223, 1123598815738675201), (1123598815738675289, 1123598815738675224, 1123598815738675201), (1123598815738675290, 1123598815738675225, 1123598815738675201), (1123598815738675291, 1123598815738675226, 1123598815738675201), (1123598815738675292, 1123598815738675227, 1123598815738675201), (1123598815738675293, 1123598815738675228, 1123598815738675201), (1123598815738675294, 1123598815738675229, 1123598815738675201), (1123598815738675295, 1123598815738675230, 1123598815738675201), (1123598815738675296, 1123598815738675231, 1123598815738675201), (1123598815738675297, 1123598815738675232, 1123598815738675201), (1123598815738675298, 1123598815738675233, 1123598815738675201), (1123598815738675299, 1123598815738675234, 1123598815738675201), (1123598815738675300, 1123598815738675235, 1123598815738675201), (1123598815738675301, 1123598815738675236, 1123598815738675201), (1123598815738675302, 1123598815738675237, 1123598815738675201), (1123598815738675303, 1123598815738675238, 1123598815738675201), (1123598815738675304, 1123598815738675239, 1123598815738675201), (1123598815738675305, 1123598815738675240, 1123598815738675201), (1123598815738675306, 1123598815738675241, 1123598815738675201), (1123598815738675307, 1123598815738675242, 1123598815738675201), (1123598815738675308, 1123598815738675243, 1123598815738675201), (1123598815738675309, 1123598815738675244, 1123598815738675201), (1123598815738675310, 1123598815738675245, 1123598815738675201), (1123598815738675311, 1123598815738675246, 1123598815738675201), (1123598815738675312, 1123598815738675247, 1123598815738675201), (1123598815738675313, 1123598815738675248, 1123598815738675201), (1123598815738675314, 1123598815738675249, 1123598815738675201), (1123598815738675315, 1123598815738675250, 1123598815738675201), (1123598815738675316, 1123598815738675251, 1123598815738675201), (1123598815738675317, 1123598815738675252, 1123598815738675201), (1123598815738675318, 1123598815738675253, 1123598815738675201), (1123598815738675319, 1123598815738675254, 1123598815738675201), (1123598815738675320, 1123598815738675255, 1123598815738675201), (1123598815738675321, 1123598815738675256, 1123598815738675201), (1123598815738675322, 1123598815738675257, 1123598815738675201), (1123598815738675323, 1123598815738675258, 1123598815738675201), (1123598815738675324, 1123598815738675259, 1123598815738675201), (1123598815738675325, 1123598815738675260, 1123598815738675201), (1123598815738675326, 1123598815738675261, 1123598815738675201), (1123598815738675327, 1123598815738675262, 1123598815738675201), (1123598815738675328, 1123598815738675263, 1123598815738675201), (1123598815738675329, 1123598815738675264, 1123598815738675201), (1123598815738675330, 1123598815738675265, 1123598815738675201), (1123598815738675331, 1123598815738675266, 1123598815738675201), (1123598815738675332, 1123598815738675267, 1123598815738675201), (1123598815738675333, 1123598815738675268, 1123598815738675201), (1123598815738675334, 1123598815738675269, 1123598815738675201), (1123598815738675335, 1123598815738675270, 1123598815738675201), (1123598815738675336, 1123598815738675271, 1123598815738675201), (1123598815738675337, 1123598815738675272, 1123598815738675201), (1123598815738675338, 1123598815738675273, 1123598815738675201), (1123598815738675339, 1123598815738675274, 1123598815738675201), (1123598815738675340, 1123598815738675275, 1123598815738675201), (1123598815738675341, 1123598815738675276, 1123598815738675201), (1123598815738675342, 1123598815738675277, 1123598815738675201), (1123598815738675343, 1123598815738675278, 1123598815738675201), (1123598815738675344, 1123598815738675279, 1123598815738675201), (1123598815738675345, 1123598815738675280, 1123598815738675201), (1123598815738675346, 1123598815738675281, 1123598815738675201), (1123598815738675347, 1123598815738675282, 1123598815738675201), (1123598815738675348, 1123598815738675283, 1123598815738675201), (1123598815738675349, 1123598815738675284, 1123598815738675201), (1123598815738675350, 1123598815738675285, 1123598815738675201), (1123598815738675351, 1123598815738675286, 1123598815738675201), (1123598815738675352, 1123598815738675287, 1123598815738675201), (1123598815738675353, 1123598815738675288, 1123598815738675201), (1123598815738675354, 1123598815738675289, 1123598815738675201), (1123598815738675355, 1123598815738675290, 1123598815738675201), (1123598815738675356, 1123598815738675291, 1123598815738675201), (1123598815738675357, 1123598815738675292, 1123598815738675201), (1123598815738675358, 1123598815738675293, 1123598815738675201), (1123598815738675359, 1123598815738675294, 1123598815738675201), (1123598815738675360, 1123598815738675295, 1123598815738675201), (1123598815738675361, 1123598815738675296, 1123598815738675201), (1123598815738675362, 1123598815738675297, 1123598815738675201), (1123598815738675363, 1123598815738675201, 1123598815738675202), (1123598815738675364, 1123598815738675202, 1123598815738675202), (1123598815738675365, 1123598815738675219, 1123598815738675202), (1123598815738675366, 1123598815738675220, 1123598815738675202), (1123598815738675367, 1123598815738675221, 1123598815738675202), (1123598815738675368, 1123598815738675222, 1123598815738675202), (1123598815738675369, 1123598815738675280, 1123598815738675202), (1123598815738675370, 1123598815738675281, 1123598815738675202), (1123598815738675371, 1123598815738675282, 1123598815738675202), (1123598815738675372, 1123598815738675283, 1123598815738675202), (1123598815738675373, 1123598815738675284, 1123598815738675202), (1123598815738675374, 1123598815738675285, 1123598815738675202), (1123598815738675375, 1123598815738675286, 1123598815738675202), (1123598815738675376, 1123598815738675287, 1123598815738675202), (1123598815738675377, 1123598815738675288, 1123598815738675202), (1123598815738675378, 1123598815738675289, 1123598815738675202), (1123598815738675379, 1123598815738675290, 1123598815738675202), (1123598815738675380, 1123598815738675291, 1123598815738675202), (1123598815738675381, 1123598815738675292, 1123598815738675202), (1123598815738675382, 1123598815738675293, 1123598815738675202), (1123598815738675383, 1123598815738675294, 1123598815738675202), (1123598815738675384, 1123598815738675295, 1123598815738675202), (1123598815738675385, 1123598815738675296, 1123598815738675202), (1123598815738675386, 1123598815738675297, 1123598815738675202), (1123598815738675387, 1123598815738675201, 1123598815738675203), (1123598815738675388, 1123598815738675202, 1123598815738675203), (1123598815738675389, 1123598815738675219, 1123598815738675203), (1123598815738675390, 1123598815738675220, 1123598815738675203), (1123598815738675391, 1123598815738675221, 1123598815738675203), (1123598815738675392, 1123598815738675222, 1123598815738675203), (1123598815738675393, 1123598815738675280, 1123598815738675203), (1123598815738675394, 1123598815738675281, 1123598815738675203), (1123598815738675395, 1123598815738675282, 1123598815738675203), (1123598815738675396, 1123598815738675283, 1123598815738675203), (1123598815738675397, 1123598815738675284, 1123598815738675203), (1123598815738675398, 1123598815738675285, 1123598815738675203), (1123598815738675399, 1123598815738675286, 1123598815738675203), (1123598815738675400, 1123598815738675287, 1123598815738675203), (1123598815738675401, 1123598815738675288, 1123598815738675203), (1123598815738675402, 1123598815738675289, 1123598815738675203), (1123598815738675403, 1123598815738675290, 1123598815738675203), (1123598815738675404, 1123598815738675291, 1123598815738675203), (1123598815738675405, 1123598815738675292, 1123598815738675203), (1123598815738675406, 1123598815738675293, 1123598815738675203), (1123598815738675407, 1123598815738675294, 1123598815738675203), (1123598815738675408, 1123598815738675295, 1123598815738675203), (1123598815738675409, 1123598815738675296, 1123598815738675203), (1123598815738675410, 1123598815738675297, 1123598815738675203), (1123598815738675411, 1123598815738675201, 1123598815738675204), (1123598815738675412, 1123598815738675202, 1123598815738675204), (1123598815738675413, 1123598815738675219, 1123598815738675204), (1123598815738675414, 1123598815738675220, 1123598815738675204), (1123598815738675415, 1123598815738675221, 1123598815738675204), (1123598815738675416, 1123598815738675222, 1123598815738675204), (1123598815738675417, 1123598815738675280, 1123598815738675204), (1123598815738675418, 1123598815738675281, 1123598815738675204), (1123598815738675419, 1123598815738675282, 1123598815738675204), (1123598815738675420, 1123598815738675283, 1123598815738675204), (1123598815738675421, 1123598815738675284, 1123598815738675204), (1123598815738675422, 1123598815738675285, 1123598815738675204), (1123598815738675423, 1123598815738675286, 1123598815738675204), (1123598815738675424, 1123598815738675287, 1123598815738675204), (1123598815738675425, 1123598815738675288, 1123598815738675204), (1123598815738675426, 1123598815738675289, 1123598815738675204), (1123598815738675427, 1123598815738675290, 1123598815738675204), (1123598815738675428, 1123598815738675291, 1123598815738675204), (1123598815738675429, 1123598815738675292, 1123598815738675204), (1123598815738675430, 1123598815738675293, 1123598815738675204), (1123598815738675431, 1123598815738675294, 1123598815738675204), (1123598815738675432, 1123598815738675295, 1123598815738675204), (1123598815738675433, 1123598815738675296, 1123598815738675204), (1123598815738675434, 1123598815738675297, 1123598815738675204), (1123598815738675435, 1123598815738675201, 1123598815738675205), (1123598815738675436, 1123598815738675202, 1123598815738675205), (1123598815738675437, 1123598815738675219, 1123598815738675205), (1123598815738675438, 1123598815738675220, 1123598815738675205), (1123598815738675439, 1123598815738675221, 1123598815738675205), (1123598815738675440, 1123598815738675222, 1123598815738675205), (1123598815738675441, 1123598815738675280, 1123598815738675205), (1123598815738675442, 1123598815738675281, 1123598815738675205), (1123598815738675443, 1123598815738675282, 1123598815738675205), (1123598815738675444, 1123598815738675283, 1123598815738675205), (1123598815738675445, 1123598815738675284, 1123598815738675205), (1123598815738675446, 1123598815738675285, 1123598815738675205), (1123598815738675447, 1123598815738675286, 1123598815738675205), (1123598815738675448, 1123598815738675287, 1123598815738675205), (1123598815738675449, 1123598815738675288, 1123598815738675205), (1123598815738675450, 1123598815738675289, 1123598815738675205), (1123598815738675451, 1123598815738675290, 1123598815738675205), (1123598815738675452, 1123598815738675291, 1123598815738675205), (1123598815738675453, 1123598815738675292, 1123598815738675205), (1123598815738675454, 1123598815738675293, 1123598815738675205), (1123598815738675455, 1123598815738675294, 1123598815738675205), (1123598815738675456, 1123598815738675295, 1123598815738675205), (1123598815738675457, 1123598815738675296, 1123598815738675205), (1123598815738675458, 1123598815738675297, 1123598815738675205);
COMMIT;
-- ----------------------------
@@ -345,26 +345,26 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_tenant`;
CREATE TABLE `blade_tenant` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户编号',
`tenant_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户名称',
`linkman` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人',
`contact_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话',
`address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系地址',
- `create_user` int(11) NULL DEFAULT NULL COMMENT '创建人',
+ `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_user` int(11) NULL DEFAULT NULL COMMENT '修改人',
+ `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`status` int(2) NULL DEFAULT NULL COMMENT '状态',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_tenant
-- ----------------------------
BEGIN;
-INSERT INTO `blade_tenant` VALUES (1, '000000', '管理组', 'admin', '666666', '管理组', 1, '2019-01-01 00:00:39', 1, '2019-01-01 00:00:39', 1, 0);
+INSERT INTO `blade_tenant` VALUES (1123598815738675201, '000000', '管理组', 'admin', '666666', '管理组', 1123598815738675201, '2019-01-01 00:00:39', 1123598815738675201, '2019-01-01 00:00:39', 1, 0);
COMMIT;
-- ----------------------------
@@ -372,7 +372,7 @@ COMMIT;
-- ----------------------------
DROP TABLE IF EXISTS `blade_user`;
CREATE TABLE `blade_user` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `id` bigint(64) NOT NULL COMMENT '主键',
`tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
`account` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '账号',
`password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
@@ -384,20 +384,20 @@ CREATE TABLE `blade_user` (
`sex` smallint(6) NULL DEFAULT NULL COMMENT '性别',
`role_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色id',
`dept_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门id',
- `create_user` int(11) NULL DEFAULT NULL COMMENT '创建人',
+ `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_user` int(11) NULL DEFAULT NULL COMMENT '修改人',
+ `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`status` int(2) NULL DEFAULT NULL COMMENT '状态',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
-- ----------------------------
-- Records of blade_user
-- ----------------------------
BEGIN;
-INSERT INTO `blade_user` VALUES (1, '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', 'admin@bladex.vip', '22233322', '2018-08-08 00:00:00', 1, '1', '1', 1, '2018-08-08 00:00:00', 1, '2018-08-08 00:00:00', 1, 0), (2, '000000', 'hr', '5e79b90f7bba52d54115f086e48f539016a27ec6', '人事', '人事', NULL, NULL, NULL, NULL, '3', '1', 1, '2019-04-27 17:03:10', 1, '2019-04-27 17:03:10', 1, 0), (3, '000000', 'manager', 'dfbaa3b61caa3a319f463cc165085aa8c822d2ce', '经理', '经理', NULL, NULL, NULL, NULL, '4', '1', 1, '2019-04-27 17:03:38', 1, '2019-04-27 17:03:38', 1, 0), (4, '000000', 'boss', 'abe57d23e18f7ad8ea99c86e430c90a05119a9d3', '老板', '老板', NULL, NULL, NULL, NULL, '5', '1', 1, '2019-04-27 17:03:55', 1, '2019-04-27 17:03:55', 1, 0);
+INSERT INTO `blade_user` VALUES (1123598815738675201, '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', 'admin@bladex.vip', '22233322', '2018-08-08 00:00:00', 1, '1123598815738675201', '1123598815738675201', 1123598815738675201, '2018-08-08 00:00:00', 1123598815738675201, '2018-08-08 00:00:00', 1, 0), (1123598815738675202, '000000', 'hr', '5e79b90f7bba52d54115f086e48f539016a27ec6', '人事', '人事', NULL, NULL, NULL, NULL, '1123598815738675203', '1123598815738675201', 1123598815738675201, '2019-04-27 17:03:10', 1123598815738675201, '2019-04-27 17:03:10', 1, 0), (1123598815738675203, '000000', 'manager', 'dfbaa3b61caa3a319f463cc165085aa8c822d2ce', '经理', '经理', NULL, NULL, NULL, NULL, '1123598815738675204', '1123598815738675201', 1123598815738675201, '2019-04-27 17:03:38', 1123598815738675201, '2019-04-27 17:03:38', 1, 0), (1123598815738675204, '000000', 'boss', 'abe57d23e18f7ad8ea99c86e430c90a05119a9d3', '老板', '老板', NULL, NULL, NULL, NULL, '1123598815738675205', '1123598815738675201', 1123598815738675201, '2019-04-27 17:03:55', 1123598815738675201, '2019-04-27 17:03:55', 1, 0);
COMMIT;
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/doc/sql/bladex-update-RC9.sql b/doc/sql/bladex-update-RC9.sql
index 6ae1af4d..2e7453c5 100644
--- a/doc/sql/bladex-update-RC9.sql
+++ b/doc/sql/bladex-update-RC9.sql
@@ -98,24 +98,24 @@ UPDATE `blade_menu` set `sort` = 99 WHERE `code` = 'system';
INSERT INTO `blade_dict`(`parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`)
VALUES (0, 'flow', -1, '流程类型', 5, NULL, 0);
set @dictid = (SELECT LAST_INSERT_ID());
-INSERT INTO `bladex`.`blade_dict`(`parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`)
+INSERT INTO `blade_dict`(`parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`)
VALUES (@dictid, 'flow', 1, '请假流程', 1, NULL, 0);
-INSERT INTO `bladex`.`blade_dict`(`parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`)
+INSERT INTO `blade_dict`(`parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`)
VALUES (@dictid, 'flow', 2, '报销流程', 2, NULL, 0);
-- ----------------------------
-- 用户数据增加
-- ----------------------------
-INSERT INTO `bladex`.`blade_user`(`tenant_code`, `account`, `password`, `name`, `real_name`, `email`, `phone`, `birthday`, `sex`, `role_id`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`, `status`, `is_deleted`) VALUES ('000000', 'hr', '5e79b90f7bba52d54115f086e48f539016a27ec6', '人事', '人事', NULL, NULL, NULL, NULL, '3', '1', 1, '2019-04-27 17:03:10', 1, '2019-04-27 17:03:10', 1, 0);
-INSERT INTO `bladex`.`blade_user`(`tenant_code`, `account`, `password`, `name`, `real_name`, `email`, `phone`, `birthday`, `sex`, `role_id`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`, `status`, `is_deleted`) VALUES ('000000', 'manager', 'dfbaa3b61caa3a319f463cc165085aa8c822d2ce', '经理', '经理', NULL, NULL, NULL, NULL, '4', '1', 1, '2019-04-27 17:03:38', 1, '2019-04-27 17:03:38', 1, 0);
-INSERT INTO `bladex`.`blade_user`(`tenant_code`, `account`, `password`, `name`, `real_name`, `email`, `phone`, `birthday`, `sex`, `role_id`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`, `status`, `is_deleted`) VALUES ('000000', 'boss', 'abe57d23e18f7ad8ea99c86e430c90a05119a9d3', '老板', '老板', NULL, NULL, NULL, NULL, '5', '1', 1, '2019-04-27 17:03:55', 1, '2019-04-27 17:03:55', 1, 0);
+INSERT INTO `blade_user`(`tenant_code`, `account`, `password`, `name`, `real_name`, `email`, `phone`, `birthday`, `sex`, `role_id`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`, `status`, `is_deleted`) VALUES ('000000', 'hr', '5e79b90f7bba52d54115f086e48f539016a27ec6', '人事', '人事', NULL, NULL, NULL, NULL, '3', '1', 1, '2019-04-27 17:03:10', 1, '2019-04-27 17:03:10', 1, 0);
+INSERT INTO `blade_user`(`tenant_code`, `account`, `password`, `name`, `real_name`, `email`, `phone`, `birthday`, `sex`, `role_id`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`, `status`, `is_deleted`) VALUES ('000000', 'manager', 'dfbaa3b61caa3a319f463cc165085aa8c822d2ce', '经理', '经理', NULL, NULL, NULL, NULL, '4', '1', 1, '2019-04-27 17:03:38', 1, '2019-04-27 17:03:38', 1, 0);
+INSERT INTO `blade_user`(`tenant_code`, `account`, `password`, `name`, `real_name`, `email`, `phone`, `birthday`, `sex`, `role_id`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`, `status`, `is_deleted`) VALUES ('000000', 'boss', 'abe57d23e18f7ad8ea99c86e430c90a05119a9d3', '老板', '老板', NULL, NULL, NULL, NULL, '5', '1', 1, '2019-04-27 17:03:55', 1, '2019-04-27 17:03:55', 1, 0);
-- ----------------------------
-- 角色数据增加
-- ----------------------------
-INSERT INTO `bladex`.`blade_role`(`tenant_code`, `parent_id`, `role_name`, `sort`, `role_alias`, `is_deleted`) VALUES ('000000', 2, '人事', 1, 'hr', 0);
-INSERT INTO `bladex`.`blade_role`(`tenant_code`, `parent_id`, `role_name`, `sort`, `role_alias`, `is_deleted`) VALUES ('000000', 2, '经理', 2, 'manager', 0);
-INSERT INTO `bladex`.`blade_role`(`tenant_code`, `parent_id`, `role_name`, `sort`, `role_alias`, `is_deleted`) VALUES ('000000', 2, '老板', 3, 'boss', 0);
+INSERT INTO `blade_role`(`tenant_code`, `parent_id`, `role_name`, `sort`, `role_alias`, `is_deleted`) VALUES ('000000', 2, '人事', 1, 'hr', 0);
+INSERT INTO `blade_role`(`tenant_code`, `parent_id`, `role_name`, `sort`, `role_alias`, `is_deleted`) VALUES ('000000', 2, '经理', 2, 'manager', 0);
+INSERT INTO `blade_role`(`tenant_code`, `parent_id`, `role_name`, `sort`, `role_alias`, `is_deleted`) VALUES ('000000', 2, '老板', 3, 'boss', 0);
-- ----------------------------
-- 增加业务流程表
@@ -140,3 +140,47 @@ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
SET FOREIGN_KEY_CHECKS = 1;
+
+-- ----------------------------
+-- 修改表主键为long类型
+-- ----------------------------
+ALTER TABLE `blade_notice`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `content`,
+ MODIFY COLUMN `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人' AFTER `create_time`;
+ALTER TABLE `blade_client`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `autoapprove`,
+ MODIFY COLUMN `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人' AFTER `create_time`;
+ALTER TABLE `blade_code`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST;
+ALTER TABLE `blade_dept`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键' AFTER `tenant_code`;
+ALTER TABLE `blade_dict`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键' AFTER `id`;
+ALTER TABLE `blade_menu`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父级菜单' AFTER `id`;
+ALTER TABLE `blade_param`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `remark`,
+ MODIFY COLUMN `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人' AFTER `create_time`;
+ALTER TABLE `blade_process_leave`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '编号' FIRST;
+ALTER TABLE `blade_role`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键' AFTER `tenant_code`;
+ALTER TABLE `blade_role_menu`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `menu_id` bigint(64) NULL DEFAULT NULL COMMENT '菜单id' AFTER `id`,
+ MODIFY COLUMN `role_id` bigint(64) NULL DEFAULT NULL COMMENT '角色id' AFTER `menu_id`;
+ALTER TABLE `blade_tenant`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `address`,
+ MODIFY COLUMN `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人' AFTER `create_time`;
+ALTER TABLE `blade_user`
+ MODIFY COLUMN `id` bigint(64) NOT NULL COMMENT '主键' FIRST,
+ MODIFY COLUMN `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `dept_id`,
+ MODIFY COLUMN `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人' AFTER `create_time`;