From 65959ffc3e22a9696ee5d1f578de1eb8d29ddd21 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 1 Jun 2019 12:17:35 +0800 Subject: [PATCH] :tada: 2.0.3.RELEASE --- blade-auth/pom.xml | 2 +- .../auth/service/BladeUserDetails.java | 8 +-- .../service/BladeUserDetailsServiceImpl.java | 6 +-- .../auth/support/BladeJwtTokenEnhancer.java | 2 +- .../org/springblade/auth/utils/TokenUtil.java | 6 +-- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- blade-ops-api/blade-flow-api/pom.xml | 2 +- blade-ops-api/pom.xml | 4 +- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/blade-flow-design/pom.xml | 2 +- blade-ops/blade-flow/pom.xml | 2 +- blade-ops/blade-log/pom.xml | 2 +- blade-ops/blade-resource/pom.xml | 2 +- .../resource/builder/OssBuilder.java | 20 ++++---- .../resource/controller/OssController.java | 2 +- blade-ops/pom.xml | 4 +- blade-service-api/blade-desk-api/pom.xml | 2 +- blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- .../org/springblade/system/entity/Dept.java | 6 +-- .../org/springblade/system/entity/Role.java | 6 +-- .../org/springblade/system/entity/Tenant.java | 6 +-- blade-service-api/blade-user-api/pom.xml | 2 +- .../system/user/feign/IUserClient.java | 4 +- blade-service-api/pom.xml | 4 +- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-system/pom.xml | 2 +- .../system/controller/DeptController.java | 8 +-- .../system/controller/RoleController.java | 8 +-- .../system/controller/TenantController.java | 6 +-- .../springblade/system/mapper/DeptMapper.java | 4 +- .../springblade/system/mapper/DeptMapper.xml | 2 +- .../springblade/system/mapper/RoleMapper.java | 4 +- .../springblade/system/mapper/RoleMapper.xml | 2 +- .../system/service/IDeptService.java | 4 +- .../system/service/IRoleService.java | 4 +- .../system/service/impl/DeptServiceImpl.java | 4 +- .../system/service/impl/MenuServiceImpl.java | 2 +- .../system/service/impl/RoleServiceImpl.java | 4 +- .../service/impl/TenantServiceImpl.java | 14 ++--- blade-service/blade-user/pom.xml | 2 +- .../user/controller/UserController.java | 2 +- .../system/user/feign/UserClient.java | 4 +- .../system/user/mapper/UserMapper.java | 4 +- .../system/user/mapper/UserMapper.xml | 4 +- .../system/user/service/IUserService.java | 4 +- .../user/service/impl/UserServiceImpl.java | 6 +-- blade-service/pom.xml | 4 +- doc/nacos/blade.yaml | 2 +- doc/sql/bladex-saber-mysql.sql | 51 +++++-------------- doc/sql/bladex-sword-mysql.sql | 20 ++++---- doc/sql/bladex-tenantid-update.sql | 26 ++++++++++ pom.xml | 6 +-- script/docker/.env | 2 +- 56 files changed, 156 insertions(+), 157 deletions(-) create mode 100644 doc/sql/bladex-tenantid-update.sql diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 01bee748..c0329157 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE blade-auth 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 31bec9f6..bc296930 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 @@ -35,9 +35,9 @@ public class BladeUserDetails extends User { */ private Long userId; /** - * 租户编号 + * 租户ID */ - private String tenantCode; + private String tenantId; /** * 昵称 */ @@ -59,10 +59,10 @@ public class BladeUserDetails extends User { */ private String avatar; - 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 authorities) { + BladeUserDetails(Long userId, String tenantId, String name, String roleId, String roleName, String avatar, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection authorities) { super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); this.userId = userId; - this.tenantCode = tenantCode; + this.tenantId = tenantId; this.name = name; this.account = username; this.roleId = roleId; diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java index 307e59be..2f94dfaa 100644 --- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java +++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java @@ -49,15 +49,15 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { @SneakyThrows public UserDetails loadUserByUsername(String username) { HttpServletRequest request = WebUtil.getRequest(); - String tenantCode = Func.toStr(request.getHeader(TokenUtil.TENANT_HEADER_KEY), TokenUtil.DEFAULT_TENANT_CODE); - R result = userClient.userInfo(tenantCode, username); + String tenantId = Func.toStr(request.getHeader(TokenUtil.TENANT_HEADER_KEY), TokenUtil.DEFAULT_TENANT_ID); + R result = userClient.userInfo(tenantId, username); if (result.isSuccess()) { User user = result.getData().getUser(); if (user == null) { throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND); } return new BladeUserDetails(user.getId(), - user.getTenantCode(), user.getName(), user.getRoleId(), Func.join(result.getData().getRoles()), TokenUtil.DEFAULT_AVATAR, + user.getTenantId(), user.getName(), user.getRoleId(), Func.join(result.getData().getRoles()), TokenUtil.DEFAULT_AVATAR, username, AuthConstant.ENCRYPT + user.getPassword(), true, true, true, true, AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles()))); } else { diff --git a/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java b/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java index a3e314be..494dbc07 100644 --- a/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java +++ b/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java @@ -39,7 +39,7 @@ public class BladeJwtTokenEnhancer implements TokenEnhancer { info.put(TokenUtil.CLIENT_ID, TokenUtil.getClientIdFromHeader()); info.put(TokenUtil.USER_ID, principal.getUserId()); info.put(TokenUtil.ROLE_ID, principal.getRoleId()); - info.put(TokenUtil.TENANT_CODE, principal.getTenantCode()); + info.put(TokenUtil.TENANT_ID, principal.getTenantId()); info.put(TokenUtil.ACCOUNT, principal.getAccount()); info.put(TokenUtil.USER_NAME, principal.getUsername()); info.put(TokenUtil.NICK_NAME, principal.getName()); diff --git a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java index 94a0918c..f097ffa7 100644 --- a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java +++ b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java @@ -41,14 +41,14 @@ public class TokenUtil { public final static String USER_ID = TokenConstant.USER_ID; public final static String ROLE_ID = TokenConstant.ROLE_ID; public final static String ROLE_NAME = TokenConstant.ROLE_NAME; - public final static String TENANT_CODE = TokenConstant.TENANT_CODE; + public final static String TENANT_ID = TokenConstant.TENANT_ID; public final static String CLIENT_ID = TokenConstant.CLIENT_ID; public final static String LICENSE = TokenConstant.LICENSE; public final static String LICENSE_NAME = TokenConstant.LICENSE_NAME; - public final static String TENANT_HEADER_KEY = "Tenant-Code"; - public final static String DEFAULT_TENANT_CODE = "000000"; + public final static String TENANT_HEADER_KEY = "Tenant-Id"; + public final static String DEFAULT_TENANT_ID = "000000"; public final static String USER_NOT_FOUND = "用户名或密码错误"; public final static String HEADER_KEY = "Authorization"; public final static String HEADER_PREFIX = "Basic "; diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 5e1550bd..4234d604 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 0581fb1c..04cbc383 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-flow-api/pom.xml b/blade-ops-api/blade-flow-api/pom.xml index ce8b49a7..697479c1 100644 --- a/blade-ops-api/blade-flow-api/pom.xml +++ b/blade-ops-api/blade-flow-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index dfa838d6..eb8d5dc4 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 2.0.2.RELEASE + 2.0.3.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 76c946e6..9944d72f 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 0fc1434c..da8c36a9 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index 8469b1ff..2b2ecada 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index d2635531..fd9187e4 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index 37a18c64..b5e1fae4 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index b52c1229..28b2226c 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java index f4d99f1d..454bb800 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java @@ -67,14 +67,14 @@ public class OssBuilder { * @return OssTemplate */ public OssTemplate template() { - String tenantCode = SecureUtil.getTenantCode(); - Oss oss = getOss(tenantCode); - Oss ossCached = ossPool.get(tenantCode); - OssTemplate template = templatePool.get(tenantCode); + String tenantId = SecureUtil.getTenantId(); + Oss oss = getOss(tenantId); + Oss ossCached = ossPool.get(tenantId); + OssTemplate template = templatePool.get(tenantId); // 若为空或者不一致，则重新加载 if (Func.hasEmpty(template, ossCached) || !oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) { synchronized (OssBuilder.class) { - template = templatePool.get(tenantCode); + template = templatePool.get(tenantId); if (Func.hasEmpty(template, ossCached) || !oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) { OssRule ossRule; // 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启 @@ -88,8 +88,8 @@ public class OssBuilder { } else if (oss.getCategory() == OssEnum.QINIU.getCategory()) { template = QiniuBuilder.template(oss, ossRule); } - templatePool.put(tenantCode, template); - ossPool.put(tenantCode, oss); + templatePool.put(tenantId, template); + ossPool.put(tenantId, oss); } } } @@ -99,11 +99,11 @@ public class OssBuilder { /** * 获取对象存储实体 * - * @param tenantCode 租户编号 + * @param tenantId 租户ID * @return Role */ - public Oss getOss(String tenantCode) { - return CacheUtil.get(SYS_CACHE, OSS_CODE, tenantCode, () -> { + public Oss getOss(String tenantId) { + return CacheUtil.get(SYS_CACHE, OSS_CODE, tenantId, () -> { Oss o = ossMapper.selectOne(Wrappers.query().lambda().eq(Oss::getStatus, OssStatusEnum.ENABLE.getNum())); // 若为空则调用默认配置 if ((Func.isEmpty(o))) { diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java index 366e46af..cbfc3eab 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java @@ -132,7 +132,7 @@ public class OssController extends BladeController { @PostMapping("/enable") @ApiOperation(value = "配置启用", notes = "传入id", position = 7) public R enable(@ApiParam(value = "主键", required = true) @RequestParam Long id) { - CacheUtil.evict(SYS_CACHE, OssBuilder.OSS_CODE, SecureUtil.getTenantCode()); + CacheUtil.evict(SYS_CACHE, OssBuilder.OSS_CODE, SecureUtil.getTenantId()); return R.status(ossService.enable(id)); } diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 397d89b7..0c863271 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 blade-ops ${project.artifactId} - 2.0.2.RELEASE + 2.0.3.RELEASE pom diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index e3f307f3..93344b77 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 0eb9f6dc..da7aa800 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index d4488732..33b481ce 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 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 477eec72..46e23997 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 @@ -49,10 +49,10 @@ public class Dept implements Serializable { private Long id; /** - * 租户编号 + * 租户ID */ - @ApiModelProperty(value = "租户编号") - private String tenantCode; + @ApiModelProperty(value = "租户ID") + private String tenantId; /** * 父主键 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 915a1546..ba964cbb 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 @@ -49,10 +49,10 @@ public class Role implements Serializable { private Long id; /** - * 租户编号 + * 租户ID */ - @ApiModelProperty(value = "租户编号") - private String tenantCode; + @ApiModelProperty(value = "租户ID") + private String tenantId; /** * 父主键 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java index f7084119..e279c672 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java @@ -37,10 +37,10 @@ public class Tenant extends BaseEntity { private static final long serialVersionUID = 1L; /** - * 租户编号 + * 租户ID */ - @ApiModelProperty(value = "租户编号") - private String tenantCode; + @ApiModelProperty(value = "租户ID") + private String tenantId; /** * 租户名称 */ diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index c6cc3b12..580ef98e 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 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 522928e3..f60c8b21 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 @@ -51,11 +51,11 @@ public interface IUserClient { /** * 获取用户信息 * - * @param tenantCode 租户编号 + * @param tenantId 租户ID * @param account 账号 * @return */ @GetMapping(USER_INFO) - R userInfo(@RequestParam("tenantCode") String tenantCode, @RequestParam("account") String account); + R userInfo(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account); } diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 605dd55d..d6383ed1 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.0.2.RELEASE + 2.0.3.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 07a4fae5..205ea6da 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 08f60c4a..2c55008c 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 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 bed1d37d..3c94613e 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 @@ -77,7 +77,7 @@ public class DeptController extends BladeController { @ApiOperation(value = "列表", notes = "传入dept", position = 2) public R> list(@ApiIgnore @RequestParam Map dept, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(dept, Dept.class); - List list = deptService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Dept::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + List list = deptService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(DeptWrapper.build().listNodeVO(list)); } @@ -88,8 +88,8 @@ public class DeptController extends BladeController { */ @GetMapping("/tree") @ApiOperation(value = "树形结构", notes = "树形结构", position = 3) - public R> tree(String tenantCode, BladeUser bladeUser) { - List tree = deptService.tree(Func.toStr(tenantCode, bladeUser.getTenantCode())); + public R> tree(String tenantId, BladeUser bladeUser) { + List tree = deptService.tree(Func.toStr(tenantId, bladeUser.getTenantId())); return R.data(tree); } @@ -101,7 +101,7 @@ public class DeptController extends BladeController { @CacheEvict(cacheNames = {SYS_CACHE}) public R submit(@Valid @RequestBody Dept dept, BladeUser user) { if (Func.isEmpty(dept.getId())) { - dept.setTenantCode(user.getTenantCode()); + dept.setTenantId(user.getTenantId()); } return R.status(deptService.saveOrUpdate(dept)); } 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 cb6421e3..498aba38 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 @@ -77,7 +77,7 @@ public class RoleController extends BladeController { @ApiOperation(value = "列表", notes = "传入role", position = 2) public R> list(@ApiIgnore @RequestParam Map role, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(role, Role.class); - List list = roleService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Role::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + List list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(RoleWrapper.build().listNodeVO(list)); } @@ -86,8 +86,8 @@ public class RoleController extends BladeController { */ @GetMapping("/tree") @ApiOperation(value = "树形结构", notes = "树形结构", position = 3) - public R> tree(String tenantCode, BladeUser bladeUser) { - List tree = roleService.tree(Func.toStr(tenantCode, bladeUser.getTenantCode())); + public R> tree(String tenantId, BladeUser bladeUser) { + List tree = roleService.tree(Func.toStr(tenantId, bladeUser.getTenantId())); return R.data(tree); } @@ -99,7 +99,7 @@ public class RoleController extends BladeController { @CacheEvict(cacheNames = {SYS_CACHE}) public R submit(@Valid @RequestBody Role role, BladeUser user) { if (Func.isEmpty(role.getId())) { - role.setTenantCode(user.getTenantCode()); + role.setTenantId(user.getTenantId()); } return R.status(roleService.saveOrUpdate(role)); } 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 97e410fd..ae2919e8 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 @@ -66,14 +66,14 @@ public class TenantController extends BladeController { */ @GetMapping("/list") @ApiImplicitParams({ - @ApiImplicitParam(name = "tenantCode", value = "参数名称", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "tenantId", value = "参数名称", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "tenantName", value = "角色别名", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "contactNumber", value = "联系电话", paramType = "query", dataType = "string") }) @ApiOperation(value = "分页", notes = "传入tenant", position = 2) public R> list(@ApiIgnore @RequestParam Map tenant, Query query, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class); - IPage pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + IPage pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(pages); } @@ -84,7 +84,7 @@ public class TenantController extends BladeController { @ApiOperation(value = "下拉数据源", notes = "传入tenant", position = 3) public R> select(Tenant tenant, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(tenant); - List list = tenantService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + List list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(list); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java index c4ccec87..ee30b207 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java @@ -42,10 +42,10 @@ public interface DeptMapper extends BaseMapper { /** * 获取树形节点 * - * @param tenantCode + * @param tenantId * @return */ - List tree(String tenantCode); + List tree(String tenantId); /** * 获取部门名 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml index afb3e5d2..2c60cf74 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml @@ -34,7 +34,7 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java index ab4d880d..08f47376 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java @@ -42,11 +42,11 @@ public interface RoleMapper extends BaseMapper { /** * 获取树形节点 * - * @param tenantCode + * @param tenantId * @param excludeRole * @return */ - List tree(String tenantCode, String excludeRole); + List tree(String tenantId, String excludeRole); /** * 获取角色名 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml index 898ffd59..64a0533d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml @@ -33,7 +33,7 @@ diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java index 2d5cbc74..b915ad59 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java @@ -48,11 +48,11 @@ public interface IUserService extends BaseService { /** * 用户信息 * - * @param tenantCode + * @param tenantId * @param account * @return */ - UserInfo userInfo(String tenantCode, String account); + UserInfo userInfo(String tenantId, String account); /** * 给用户设置角色 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 cefcb20d..bf3b8b13 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 @@ -49,7 +49,7 @@ public class UserServiceImpl extends BaseServiceImpl implement if (Func.isNotEmpty(user.getPassword())) { user.setPassword(DigestUtil.encrypt(user.getPassword())); } - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantCode, Func.toStr(user.getTenantCode(), BladeConstant.ADMIN_TENANT_CODE)).eq(User::getAccount, user.getAccount())); + Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, Func.toStr(user.getTenantId(), BladeConstant.ADMIN_TENANT_ID)).eq(User::getAccount, user.getAccount())); if (cnt > 0) { throw new ApiException("当前用户已存在!"); } @@ -62,9 +62,9 @@ public class UserServiceImpl extends BaseServiceImpl implement } @Override - public UserInfo userInfo(String tenantCode, String account) { + public UserInfo userInfo(String tenantId, String account) { UserInfo userInfo = new UserInfo(); - User user = baseMapper.getUser(tenantCode, account); + User user = baseMapper.getUser(tenantId, account); userInfo.setUser(user); if (Func.isNotEmpty(user)) { List roleAlias = SysCache.getRoleAliases(user.getRoleId()); diff --git a/blade-service/pom.xml b/blade-service/pom.xml index c8e93ea1..b74d6bba 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 2.0.2.RELEASE + 2.0.3.RELEASE 4.0.0 blade-service ${project.artifactId} - 2.0.2.RELEASE + 2.0.3.RELEASE pom BladeX 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index a9183df8..933e6d91 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -84,6 +84,6 @@ blade: path-patterns: - /saber/** tenant: - column: tenant_code + column: tenant_id tables: - blade_notice diff --git a/doc/sql/bladex-saber-mysql.sql b/doc/sql/bladex-saber-mysql.sql index cd33b4ce..3850a24c 100644 --- a/doc/sql/bladex-saber-mysql.sql +++ b/doc/sql/bladex-saber-mysql.sql @@ -11,7 +11,7 @@ Target Server Version : 50723 File Encoding : 65001 - Date: 28/05/2019 12:31:30 + Date: 01/06/2019 09:36:00 */ SET NAMES utf8mb4; @@ -81,7 +81,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_dept`; CREATE TABLE `blade_dept` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '部门全称', @@ -127,7 +127,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_log_api`; CREATE TABLE `blade_log_api` ( `id` bigint(64) NOT NULL COMMENT '编号', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID', `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名', `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址', @@ -151,7 +151,7 @@ CREATE TABLE `blade_log_api` ( -- Records of blade_log_api -- ---------------------------- BEGIN; -INSERT INTO `blade_log_api` VALUES (1125388216836780034, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '128', '', '2019-05-06 21:13:54'), (1125388649185636354, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '16', '', '2019-05-06 21:15:37'), (1125388961841639426, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '10', '', '2019-05-06 21:16:52'), (1125389261314945025, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'password=admin&grant_type=password&scope=all&tenantCode=000000&type=account&username=admin', '11', '', '2019-05-06 21:18:03'), (1125583685718310913, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.129:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '70', '', '2019-05-07 10:10:38'), (1125642132849651714, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.129:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '353', '', '2019-05-07 14:02:53'), (1132819868877754369, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.133:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJhZG1pbiIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInVzZXJfaWQiOjExMjM1OTg4MjE3Mzg2NzUyMDEsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6IueuoeeQhuWRmCIsImF0aSI6IjY2YWEzMGViLTE2MjgtNDhkMS05Nzk4LTcyODcyNmRlNGU0MyIsImV4cCI6MTU1OTUyMjA3MiwianRpIjoiNzRkZmQ0MzctMWY3Ni00NmYxLWE1NDItNTZiZjQyMzVjYmU3IiwiYWNjb3VudCI6ImFkbWluIiwidGVuYW50X2NvZGUiOiIwMDAwMDAifQ.pGYtAWRfg_S-ygvsh0sBApdZ3Dl5SZxbRdgXZuScrNE&grant_type=refresh_token&scope=all', '34', 'admin', '2019-05-27 09:24:38'), (1132820719541325825, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.133:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '83', '', '2019-05-27 09:28:01'), (1132833327375843329, '000000', 'blade-api', 'smallchill-3.local', '172.20.10.9:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1MjUyODAsIm5iZiI6MTU1ODkyMDQ4MH0.FR0PxUxen-OP8w-dTzQuaScD1yE0gk1nRUhCFBWfTgI&grant_type=refresh_token&scope=all', '121', 'admin', '2019-05-27 10:18:07'), (1132892111276257282, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '550', '', '2019-05-27 14:11:42'), (1132900479285993474, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000', '4', '', '2019-05-27 14:44:57'), (1132900609296834562, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000', '0', '', '2019-05-27 14:45:28'), (1132900629660180482, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000', '0', '', '2019-05-27 14:45:33'), (1132901050319560705, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'password=admin&tenantCode=000000&username=admin', '570', '', '2019-05-27 14:47:13'), (1132926013730668545, '000000', 'blade-api', 'smallchill-3.local', '172.20.10.9:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '571', '', '2019-05-27 16:26:25'), (1132940401531314178, '000000', 'blade-api', 'smallchill-3.local', '172.20.10.9:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '791', '', '2019-05-27 17:23:35'), (1133000318514520065, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJhZG1pbiIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInVzZXJfaWQiOjExMjM1OTg4MjE3Mzg2NzUyMDEsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6IueuoeeQhuWRmCIsImF0aSI6Ijg3NDEwZjU2LWYxNWQtNDkwOC1iMmQyLWI4NWFmZTA0YjkzMCIsImV4cCI6MTU1OTU2NTA5MiwianRpIjoiN2Q1ZDUzYWItNTA4ZC00OTkwLWE1YTUtNmNkMGJhMjkwNDdhIiwiYWNjb3VudCI6ImFkbWluIiwidGVuYW50X2NvZGUiOiIwMDAwMDAifQ.qajWMJsROs8tePnt7nAgJQWYt3p33G-ENchzNBrT8O8&grant_type=refresh_token&scope=all', '10', 'admin', '2019-05-27 21:21:41'), (1133005264995639298, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'PostmanRuntime/7.11.0', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJhZG1pbiIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInVzZXJfaWQiOjExMjM1OTg4MjE3Mzg2NzUyMDEsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6IueuoeeQhuWRmCIsImF0aSI6Ijg3NDEwZjU2LWYxNWQtNDkwOC1iMmQyLWI4NWFmZTA0YjkzMCIsImV4cCI6MTU1OTU2NTA5MiwianRpIjoiN2Q1ZDUzYWItNTA4ZC00OTkwLWE1YTUtNmNkMGJhMjkwNDdhIiwiYWNjb3VudCI6ImFkbWluIiwidGVuYW50X2NvZGUiOiIwMDAwMDAifQ.qajWMJsROs8tePnt7nAgJQWYt3p33G-ENchzNBrT8O8&grant_type=refresh_token&scope=all', '27132', '', '2019-05-27 21:41:20'), (1133008462569488386, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '517', '', '2019-05-27 21:54:02'), (1133008992356220930, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'PostmanRuntime/7.11.0', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzAwNDIsIm5iZiI6MTU1ODk2NTI0Mn0.cJVe6V7vvFfd0mh5RALz5wJkzVwTFaTmuuz5_EgqnYY&grant_type=refresh_token&scope=all', '46', '', '2019-05-27 21:56:09'), (1133009172765818881, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'PostmanRuntime/7.11.0', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzAwNDIsIm5iZiI6MTU1ODk2NTI0Mn0.cJVe6V7vvFfd0mh5RALz5wJkzVwTFaTmuuz5_EgqnYY&grant_type=refresh_token&scope=all', '17', '', '2019-05-27 21:56:52'), (1133011599900491778, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzAwNDIsIm5iZiI6MTU1ODk2NTI0Mn0.cJVe6V7vvFfd0mh5RALz5wJkzVwTFaTmuuz5_EgqnYY&grant_type=refresh_token&scope=all', '45', 'admin', '2019-05-27 22:06:30'), (1133011641692536834, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA3OTAsIm5iZiI6MTU1ODk2NTk5MH0.NC3Bj0tJ4conrz_JRDQks_QQAX7Y2joi6Hh5gWfb0co&grant_type=refresh_token&scope=all', '11', 'admin', '2019-05-27 22:06:40'), (1133011683643965441, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MDAsIm5iZiI6MTU1ODk2NjAwMH0.2eTyuSgJ63ilTcPKODUR9GOaD8cuJ3gnO8bxj7jO65w&grant_type=refresh_token&scope=all', '12', 'admin', '2019-05-27 22:06:50'), (1133011725561839618, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MTAsIm5iZiI6MTU1ODk2NjAxMH0.GIGwSeYPVT6rWQigiXCYw_GJuEaCLtMyB5Mgyf1Po7c&grant_type=refresh_token&scope=all', '12', 'admin', '2019-05-27 22:07:00'), (1133011767500685314, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MjAsIm5iZiI6MTU1ODk2NjAyMH0.T374krTQL0CvQMvJ0Ff5ITGEzoBXE2YmY_jFQc-cM3k&grant_type=refresh_token&scope=all', '10', 'admin', '2019-05-27 22:07:10'), (1133011809452113921, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MzAsIm5iZiI6MTU1ODk2NjAzMH0.2YDrUuV_kYtbo64tp7K1f8AWUS4Q7M_eJ8dHn9YdJBM&grant_type=refresh_token&scope=all', '11', 'admin', '2019-05-27 22:07:20'), (1133011854775762946, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4NDAsIm5iZiI6MTU1ODk2NjA0MH0.25XM-F-3j8x7iNIQRbq010PFYDnocKyYnTdc_im4WcI&grant_type=refresh_token&scope=all', '12', 'admin', '2019-05-27 22:07:31'), (1133011893535326210, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4NTEsIm5iZiI6MTU1ODk2NjA1MX0.alREdRzJ9gSp1NaFaJvRg86n5A09OrcV_rT41Y8mAfA&grant_type=refresh_token&scope=all', '22', 'admin', '2019-05-27 22:07:40'), (1133024480889094145, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4NjAsIm5iZiI6MTU1ODk2NjA2MH0.6pgJyccPJCxQWhCdTwUpQvtNCIzzbe9bb3_mNVEwnoY&grant_type=refresh_token&scope=all', '35', 'admin', '2019-05-27 22:57:41'); +INSERT INTO `blade_log_api` VALUES (1125388216836780034, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '128', '', '2019-05-06 21:13:54'), (1125388649185636354, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '16', '', '2019-05-06 21:15:37'), (1125388961841639426, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '10', '', '2019-05-06 21:16:52'), (1125389261314945025, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'password=admin&grant_type=password&scope=all&tenantCode=000000&type=account&username=admin', '11', '', '2019-05-06 21:18:03'), (1125583685718310913, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.129:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '70', '', '2019-05-07 10:10:38'), (1125642132849651714, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.129:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '353', '', '2019-05-07 14:02:53'), (1132819868877754369, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.133:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJhZG1pbiIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInVzZXJfaWQiOjExMjM1OTg4MjE3Mzg2NzUyMDEsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6IueuoeeQhuWRmCIsImF0aSI6IjY2YWEzMGViLTE2MjgtNDhkMS05Nzk4LTcyODcyNmRlNGU0MyIsImV4cCI6MTU1OTUyMjA3MiwianRpIjoiNzRkZmQ0MzctMWY3Ni00NmYxLWE1NDItNTZiZjQyMzVjYmU3IiwiYWNjb3VudCI6ImFkbWluIiwidGVuYW50X2NvZGUiOiIwMDAwMDAifQ.pGYtAWRfg_S-ygvsh0sBApdZ3Dl5SZxbRdgXZuScrNE&grant_type=refresh_token&scope=all', '34', 'admin', '2019-05-27 09:24:38'), (1132820719541325825, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.133:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '83', '', '2019-05-27 09:28:01'), (1132833327375843329, '000000', 'blade-api', 'smallchill-3.local', '172.20.10.9:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1MjUyODAsIm5iZiI6MTU1ODkyMDQ4MH0.FR0PxUxen-OP8w-dTzQuaScD1yE0gk1nRUhCFBWfTgI&grant_type=refresh_token&scope=all', '121', 'admin', '2019-05-27 10:18:07'), (1132892111276257282, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '550', '', '2019-05-27 14:11:42'), (1132900479285993474, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000', '4', '', '2019-05-27 14:44:57'), (1132900609296834562, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000', '0', '', '2019-05-27 14:45:28'), (1132900629660180482, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000', '0', '', '2019-05-27 14:45:33'), (1132901050319560705, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.104:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '0:0:0:0:0:0:0:1', 'org.springblade.modules.auth.AuthController', 'token', 'password=admin&tenantCode=000000&username=admin', '570', '', '2019-05-27 14:47:13'), (1132926013730668545, '000000', 'blade-api', 'smallchill-3.local', '172.20.10.9:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '571', '', '2019-05-27 16:26:25'), (1132940401531314178, '000000', 'blade-api', 'smallchill-3.local', '172.20.10.9:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '791', '', '2019-05-27 17:23:35'), (1133000318514520065, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJhZG1pbiIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInVzZXJfaWQiOjExMjM1OTg4MjE3Mzg2NzUyMDEsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6IueuoeeQhuWRmCIsImF0aSI6Ijg3NDEwZjU2LWYxNWQtNDkwOC1iMmQyLWI4NWFmZTA0YjkzMCIsImV4cCI6MTU1OTU2NTA5MiwianRpIjoiN2Q1ZDUzYWItNTA4ZC00OTkwLWE1YTUtNmNkMGJhMjkwNDdhIiwiYWNjb3VudCI6ImFkbWluIiwidGVuYW50X2NvZGUiOiIwMDAwMDAifQ.qajWMJsROs8tePnt7nAgJQWYt3p33G-ENchzNBrT8O8&grant_type=refresh_token&scope=all', '10', 'admin', '2019-05-27 21:21:41'), (1133005264995639298, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'PostmanRuntime/7.11.0', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJhZG1pbiIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInVzZXJfaWQiOjExMjM1OTg4MjE3Mzg2NzUyMDEsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6IueuoeeQhuWRmCIsImF0aSI6Ijg3NDEwZjU2LWYxNWQtNDkwOC1iMmQyLWI4NWFmZTA0YjkzMCIsImV4cCI6MTU1OTU2NTA5MiwianRpIjoiN2Q1ZDUzYWItNTA4ZC00OTkwLWE1YTUtNmNkMGJhMjkwNDdhIiwiYWNjb3VudCI6ImFkbWluIiwidGVuYW50X2NvZGUiOiIwMDAwMDAifQ.qajWMJsROs8tePnt7nAgJQWYt3p33G-ENchzNBrT8O8&grant_type=refresh_token&scope=all', '27132', '', '2019-05-27 21:41:20'), (1133008462569488386, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '517', '', '2019-05-27 21:54:02'), (1133008992356220930, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'PostmanRuntime/7.11.0', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzAwNDIsIm5iZiI6MTU1ODk2NTI0Mn0.cJVe6V7vvFfd0mh5RALz5wJkzVwTFaTmuuz5_EgqnYY&grant_type=refresh_token&scope=all', '46', '', '2019-05-27 21:56:09'), (1133009172765818881, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'PostmanRuntime/7.11.0', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzAwNDIsIm5iZiI6MTU1ODk2NTI0Mn0.cJVe6V7vvFfd0mh5RALz5wJkzVwTFaTmuuz5_EgqnYY&grant_type=refresh_token&scope=all', '17', '', '2019-05-27 21:56:52'), (1133011599900491778, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzAwNDIsIm5iZiI6MTU1ODk2NTI0Mn0.cJVe6V7vvFfd0mh5RALz5wJkzVwTFaTmuuz5_EgqnYY&grant_type=refresh_token&scope=all', '45', 'admin', '2019-05-27 22:06:30'), (1133011641692536834, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA3OTAsIm5iZiI6MTU1ODk2NTk5MH0.NC3Bj0tJ4conrz_JRDQks_QQAX7Y2joi6Hh5gWfb0co&grant_type=refresh_token&scope=all', '11', 'admin', '2019-05-27 22:06:40'), (1133011683643965441, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MDAsIm5iZiI6MTU1ODk2NjAwMH0.2eTyuSgJ63ilTcPKODUR9GOaD8cuJ3gnO8bxj7jO65w&grant_type=refresh_token&scope=all', '12', 'admin', '2019-05-27 22:06:50'), (1133011725561839618, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MTAsIm5iZiI6MTU1ODk2NjAxMH0.GIGwSeYPVT6rWQigiXCYw_GJuEaCLtMyB5Mgyf1Po7c&grant_type=refresh_token&scope=all', '12', 'admin', '2019-05-27 22:07:00'), (1133011767500685314, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MjAsIm5iZiI6MTU1ODk2NjAyMH0.T374krTQL0CvQMvJ0Ff5ITGEzoBXE2YmY_jFQc-cM3k&grant_type=refresh_token&scope=all', '10', 'admin', '2019-05-27 22:07:10'), (1133011809452113921, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4MzAsIm5iZiI6MTU1ODk2NjAzMH0.2YDrUuV_kYtbo64tp7K1f8AWUS4Q7M_eJ8dHn9YdJBM&grant_type=refresh_token&scope=all', '11', 'admin', '2019-05-27 22:07:20'), (1133011854775762946, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4NDAsIm5iZiI6MTU1ODk2NjA0MH0.25XM-F-3j8x7iNIQRbq010PFYDnocKyYnTdc_im4WcI&grant_type=refresh_token&scope=all', '12', 'admin', '2019-05-27 22:07:31'), (1133011893535326210, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4NTEsIm5iZiI6MTU1ODk2NjA1MX0.alREdRzJ9gSp1NaFaJvRg86n5A09OrcV_rT41Y8mAfA&grant_type=refresh_token&scope=all', '22', 'admin', '2019-05-27 22:07:40'), (1133024480889094145, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'refresh_token=eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1c2VyIiwiYXVkIjoiYXVkaWVuY2UiLCJ1c2VyX2lkIjoiMTEyMzU5ODgyMTczODY3NTIwMSIsInRva2VuX3R5cGUiOiJyZWZyZXNoX3Rva2VuIiwiY2xpZW50X2lkIjoic2FiZXIiLCJleHAiOjE1NTk1NzA4NjAsIm5iZiI6MTU1ODk2NjA2MH0.6pgJyccPJCxQWhCdTwUpQvtNCIzzbe9bb3_mNVEwnoY&grant_type=refresh_token&scope=all', '35', 'admin', '2019-05-27 22:57:41'), (1133563688078794753, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.135:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantCode=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '537', '', '2019-05-29 10:40:18'), (1134633534702931970, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantId=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '552', '', '2019-06-01 09:31:30'), (1134633788810645505, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantId=000000&username=hr&password=hr&grant_type=password&scope=all&type=account', '21', '', '2019-06-01 09:32:30'), (1134634028762583042, '000000', 'blade-api', 'smallchill-3.local', '192.168.0.122:80', 'dev', '1', '登录用户验证', 'POST', '/blade-auth/oauth/token', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36', '127.0.0.1', 'org.springblade.modules.auth.AuthController', 'token', 'tenantId=000000&username=admin&password=admin&grant_type=password&scope=all&type=account', '9', '', '2019-06-01 09:33:28'); COMMIT; -- ---------------------------- @@ -160,7 +160,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_log_error`; CREATE TABLE `blade_log_error` ( `id` bigint(64) NOT NULL COMMENT '编号', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID', `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名', `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址', @@ -194,7 +194,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_log_usual`; CREATE TABLE `blade_log_usual` ( `id` bigint(64) NOT NULL COMMENT '编号', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID', `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名', `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址', @@ -236,7 +236,7 @@ CREATE TABLE `blade_menu` ( -- Records of blade_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_menu` VALUES (1123598815738675201, 0, 'desk', '工作台', 'menu', '/desk', 'iconfont iconicon_airplay', 1, 1, 0, 1, NULL, 0), (1123598815738675202, 1123598815738675201, 'notice', '通知公告', 'menu', '/desk/notice', 'iconfont iconicon_sms', 1, 1, 0, 1, NULL, 0), (1123598815738675203, 0, 'system', '系统管理', 'menu', '/system', 'iconfont iconicon_setting', 99, 1, 0, 1, NULL, 0), (1123598815738675204, 1123598815738675203, 'user', '用户管理', 'menu', '/system/user', 'iconfont iconicon_principal', 1, 1, 0, 1, NULL, 0), (1123598815738675205, 1123598815738675203, 'dept', '部门管理', 'menu', '/system/dept', 'iconfont iconicon_group', 2, 1, 0, 1, NULL, 0), (1123598815738675206, 1123598815738675203, 'dict', '字典管理', 'menu', '/system/dict', 'iconfont iconicon_addresslist', 3, 1, 0, 1, NULL, 0), (1123598815738675207, 1123598815738675203, 'menu', '菜单管理', 'menu', '/system/menu', 'iconfont iconicon_subordinate', 4, 1, 0, 1, NULL, 0), (1123598815738675208, 1123598815738675203, 'role', '角色管理', 'menu', '/system/role', 'iconfont iconicon_boss', 5, 1, 0, 1, NULL, 0), (1123598815738675209, 1123598815738675203, 'param', '参数管理', 'menu', '/system/param', 'iconfont iconicon_community_line', 6, 1, 0, 1, NULL, 0), (1123598815738675210, 0, 'monitor', '系统监控', 'menu', '/monitor', 'iconfont icon-yanzhengma', 3, 1, 0, 1, NULL, 0), (1123598815738675211, 1123598815738675210, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', 'iconfont iconicon_study', 1, 1, 0, 2, NULL, 0), (1123598815738675212, 1123598815738675210, 'admin', '服务治理', 'menu', 'http://localhost:7002', 'iconfont icon-canshu', 2, 1, 0, 2, NULL, 0), (1123598815738675213, 1123598815738675210, 'log', '日志管理', 'menu', '/monitor/log', 'iconfont iconicon_doc', 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', 'iconfont icon-wxbgongju', 4, 1, 0, 1, NULL, 0), (1123598815738675218, 1123598815738675217, 'code', '代码生成', 'menu', '/tool/code', 'iconfont iconicon_savememo', 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-develop/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', 'iconfont icon-quanxian', 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', 'iconfont iconicon_mobilephone', 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', 'iconfont iconicon_send', 5, 1, 0, 1, '', 0), (1123598815738675267, 1123598815738675266, 'flow_model', '模型管理', 'menu', '/flow/model', 'iconfont iconicon_discovery', 1, 1, 0, 1, '', 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', 'iconfont iconicon_cspace', 2, 1, 0, 1, '', 0), (1123598815738675274, 1123598815738675266, 'flow_manager', '流程管理', 'menu', '/flow/manager', 'iconfont iconicon_cloud_history', 3, 1, 0, 1, '', 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', 'iconfont iconicon_GPS', 4, 1, 0, 1, '', 0), (1123598815738675279, 1123598815738675278, 'flow_follow_delete', '删除', 'remove', '', 'remove', 1, 2, 2, 1, NULL, 0), (1123598815738675280, 0, 'work', '我的事务', 'work', '/work', 'iconfont iconicon_notice', 2, 1, 0, 1, '', 0), (1123598815738675281, 1123598815738675280, 'work_start', '发起事务', 'menu', '/work/start', 'iconfont iconicon_compile', 1, 1, 0, 1, '', 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', 'iconfont iconicon_ding', 2, 1, 0, 1, '', 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', 'iconfont iconicon_savememo', 2, 1, 0, 1, '', 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', 'iconfont iconicon_doc', 3, 1, 0, 1, '', 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', 'iconfont iconicon_dispose', 4, 1, 0, 1, '', 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), (1123598815738675298, 0, 'resource', '资源管理', 'menu', '/resource', 'iconfont iconicon_coinpurse_line', 6, 1, 0, 1, '', 0), (1123598815738675299, 1123598815738675298, 'oss', '对象存储', 'menu', '/resource/oss', 'iconfont iconicon_subordinate', 1, 1, 0, 1, '', 0), (1123598815738675301, 1123598815738675299, 'oss_add', '新增', 'add', '/resource/oss/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675302, 1123598815738675299, 'oss_edit', '修改', 'edit', '/resource/oss/edit', 'form', 2, 2, 2, 2, NULL, 0), (1123598815738675303, 1123598815738675299, 'oss_delete', '删除', 'delete', '/api/blade-resource/oss/remove', 'delete', 3, 2, 3, 3, NULL, 0), (1123598815738675304, 1123598815738675299, 'oss_view', '查看', 'view', '/resource/oss/view', 'file-text', 4, 2, 2, 2, NULL, 0), (1123598815738675305, 1123598815738675299, 'oss_enable', '启用', 'enable', '/api/blade-resource/oss/enable', 'key', 5, 2, 2, 2, NULL, 0); +INSERT INTO `blade_menu` VALUES (1123598815738675201, 0, 'desk', '工作台', 'menu', '/desk', 'iconfont iconicon_airplay', 1, 1, 0, 1, NULL, 0), (1123598815738675202, 1123598815738675201, 'notice', '通知公告', 'menu', '/desk/notice', 'iconfont iconicon_sms', 1, 1, 0, 1, NULL, 0), (1123598815738675203, 0, 'system', '系统管理', 'menu', '/system', 'iconfont iconicon_setting', 99, 1, 0, 1, NULL, 0), (1123598815738675204, 1123598815738675203, 'user', '用户管理', 'menu', '/system/user', 'iconfont iconicon_principal', 1, 1, 0, 1, NULL, 0), (1123598815738675205, 1123598815738675203, 'dept', '部门管理', 'menu', '/system/dept', 'iconfont iconicon_group', 2, 1, 0, 1, NULL, 0), (1123598815738675206, 1123598815738675203, 'dict', '字典管理', 'menu', '/system/dict', 'iconfont iconicon_addresslist', 3, 1, 0, 1, NULL, 0), (1123598815738675207, 1123598815738675203, 'menu', '菜单管理', 'menu', '/system/menu', 'iconfont iconicon_subordinate', 4, 1, 0, 1, NULL, 0), (1123598815738675208, 1123598815738675203, 'role', '角色管理', 'menu', '/system/role', 'iconfont iconicon_boss', 5, 1, 0, 1, NULL, 0), (1123598815738675209, 1123598815738675203, 'param', '参数管理', 'menu', '/system/param', 'iconfont iconicon_community_line', 6, 1, 0, 1, NULL, 0), (1123598815738675210, 0, 'monitor', '系统监控', 'menu', '/monitor', 'iconfont icon-yanzhengma', 3, 1, 0, 1, NULL, 0), (1123598815738675211, 1123598815738675210, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', 'iconfont iconicon_study', 1, 1, 0, 2, NULL, 0), (1123598815738675212, 1123598815738675210, 'admin', '服务治理', 'menu', 'http://localhost:7002', 'iconfont icon-canshu', 2, 1, 0, 2, NULL, 0), (1123598815738675213, 1123598815738675210, 'log', '日志管理', 'menu', '/monitor/log', 'iconfont iconicon_doc', 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', 'iconfont icon-wxbgongju', 4, 1, 0, 1, NULL, 0), (1123598815738675218, 1123598815738675217, 'code', '代码生成', 'menu', '/tool/code', 'iconfont iconicon_savememo', 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', 'iconfont icon-quanxian', 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', 'iconfont iconicon_mobilephone', 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', 'iconfont iconicon_send', 5, 1, 0, 1, '', 0), (1123598815738675267, 1123598815738675266, 'flow_model', '模型管理', 'menu', '/flow/model', 'iconfont iconicon_discovery', 1, 1, 0, 1, '', 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', 'iconfont iconicon_cspace', 2, 1, 0, 1, '', 0), (1123598815738675274, 1123598815738675266, 'flow_manager', '流程管理', 'menu', '/flow/manager', 'iconfont iconicon_cloud_history', 3, 1, 0, 1, '', 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', 'iconfont iconicon_GPS', 4, 1, 0, 1, '', 0), (1123598815738675279, 1123598815738675278, 'flow_follow_delete', '删除', 'remove', '', 'remove', 1, 2, 2, 1, NULL, 0), (1123598815738675280, 0, 'work', '我的事务', 'work', '/work', 'iconfont iconicon_notice', 2, 1, 0, 1, '', 0), (1123598815738675281, 1123598815738675280, 'work_start', '发起事务', 'menu', '/work/start', 'iconfont iconicon_compile', 1, 1, 0, 1, '', 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', 'iconfont iconicon_ding', 2, 1, 0, 1, '', 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', 'iconfont iconicon_savememo', 2, 1, 0, 1, '', 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', 'iconfont iconicon_doc', 3, 1, 0, 1, '', 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', 'iconfont iconicon_dispose', 4, 1, 0, 1, '', 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), (1123598815738675298, 0, 'resource', '资源管理', 'menu', '/resource', 'iconfont iconicon_coinpurse_line', 6, 1, 0, 1, '', 0), (1123598815738675299, 1123598815738675298, 'oss', '对象存储', 'menu', '/resource/oss', 'iconfont iconicon_subordinate', 1, 1, 0, 1, '', 0), (1123598815738675301, 1123598815738675299, 'oss_add', '新增', 'add', '/resource/oss/add', 'plus', 1, 2, 1, 1, NULL, 0), (1123598815738675302, 1123598815738675299, 'oss_edit', '修改', 'edit', '/resource/oss/edit', 'form', 2, 2, 2, 2, NULL, 0), (1123598815738675303, 1123598815738675299, 'oss_delete', '删除', 'delete', '/api/blade-resource/oss/remove', 'delete', 3, 2, 3, 3, NULL, 0), (1123598815738675304, 1123598815738675299, 'oss_view', '查看', 'view', '/resource/oss/view', 'file-text', 4, 2, 2, 2, NULL, 0), (1123598815738675305, 1123598815738675299, 'oss_enable', '启用', 'enable', '/api/blade-resource/oss/enable', 'key', 5, 2, 2, 2, NULL, 0); COMMIT; -- ---------------------------- @@ -245,7 +245,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_notice`; CREATE TABLE `blade_notice` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '发布时间', @@ -266,40 +266,13 @@ BEGIN; INSERT INTO `blade_notice` VALUES (1123598818738675223, '000000', '测试公告', 3, '2018-12-31 20:03:31', '222', 1123598821738675201, '2018-12-05 20:03:31', 1123598821738675201, '2018-12-28 11:10:51', 1, 0), (1123598818738675224, '000000', '测试公告2', 1, '2018-12-05 20:03:31', '333', 1123598821738675201, '2018-12-28 10:32:26', 1123598821738675201, '2018-12-28 11:10:34', 1, 0), (1123598818738675225, '000000', '测试公告3', 6, '2018-12-29 00:00:00', '11111', 1123598821738675201, '2018-12-28 11:03:44', 1123598821738675201, '2018-12-28 11:10:28', 1, 0); COMMIT; --- ---------------------------- --- Table structure for blade_notice_test --- ---------------------------- -DROP TABLE IF EXISTS `blade_notice_test`; -CREATE TABLE `blade_notice_test` ( - `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` bigint(64) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) 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 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; - --- ---------------------------- --- Records of blade_notice_test --- ---------------------------- -BEGIN; -INSERT INTO `blade_notice_test` VALUES (1123598818738675223, '000000', '测试公告', 3, '2018-12-31 20:03:31', '222', 1123598821738675201, '2018-12-05 20:03:31', 1123598821738675201, '2018-12-28 11:10:51', 1, 0), (1123598818738675224, '000000', '测试公告2', 1, '2018-12-05 20:03:31', '333', 1123598821738675201, '2018-12-28 10:32:26', 1123598821738675201, '2018-12-28 11:10:34', 1, 0), (1123598818738675225, '000000', '测试公告3', 6, '2018-12-29 00:00:00', '11111', 1123598821738675201, '2018-12-28 11:03:44', 1123598821738675201, '2018-12-28 11:10:28', 1, 0); -COMMIT; - -- ---------------------------- -- Table structure for blade_oss -- ---------------------------- DROP TABLE IF EXISTS `blade_oss`; CREATE TABLE `blade_oss` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `category` int(2) NULL DEFAULT NULL COMMENT '分类', `endpoint` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资源地址', `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'accessKey', @@ -376,7 +349,7 @@ CREATE TABLE `blade_process_leave` ( DROP TABLE IF EXISTS `blade_role`; CREATE TABLE `blade_role` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '排序', @@ -416,7 +389,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_tenant`; CREATE TABLE `blade_tenant` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '联系电话', @@ -443,7 +416,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_user`; CREATE TABLE `blade_user` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '密码', `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', diff --git a/doc/sql/bladex-sword-mysql.sql b/doc/sql/bladex-sword-mysql.sql index 5fc3a45f..f4282121 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: 28/05/2019 12:30:36 + Date: 01/06/2019 09:35:25 */ SET NAMES utf8mb4; @@ -81,7 +81,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_dept`; CREATE TABLE `blade_dept` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '部门全称', @@ -127,7 +127,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_log_api`; CREATE TABLE `blade_log_api` ( `id` bigint(64) NOT NULL COMMENT '编号', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID', `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名', `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址', @@ -153,7 +153,7 @@ CREATE TABLE `blade_log_api` ( DROP TABLE IF EXISTS `blade_log_error`; CREATE TABLE `blade_log_error` ( `id` bigint(64) NOT NULL COMMENT '编号', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID', `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名', `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址', @@ -190,7 +190,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_log_usual`; CREATE TABLE `blade_log_usual` ( `id` bigint(64) NOT NULL COMMENT '编号', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID', `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名', `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址', @@ -241,7 +241,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_notice`; CREATE TABLE `blade_notice` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '发布时间', @@ -268,7 +268,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_oss`; CREATE TABLE `blade_oss` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `category` int(2) NULL DEFAULT NULL COMMENT '分类', `endpoint` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资源地址', `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'accessKey', @@ -345,7 +345,7 @@ CREATE TABLE `blade_process_leave` ( DROP TABLE IF EXISTS `blade_role`; CREATE TABLE `blade_role` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '排序', @@ -385,7 +385,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_tenant`; CREATE TABLE `blade_tenant` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '联系电话', @@ -412,7 +412,7 @@ COMMIT; DROP TABLE IF EXISTS `blade_user`; CREATE TABLE `blade_user` ( `id` bigint(64) NOT NULL COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', + `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID', `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 '密码', `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', diff --git a/doc/sql/bladex-tenantid-update.sql b/doc/sql/bladex-tenantid-update.sql new file mode 100644 index 00000000..4915aa51 --- /dev/null +++ b/doc/sql/bladex-tenantid-update.sql @@ -0,0 +1,26 @@ +ALTER TABLE `blade_dept` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_log_api` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_log_error` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_log_usual` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_notice` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_oss` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_role` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_tenant` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; + +ALTER TABLE `blade_user` + CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`; diff --git a/pom.xml b/pom.xml index e1340136..4974860a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade BladeX - 2.0.2.RELEASE + 2.0.3.RELEASE pom - 2.0.2.RELEASE - 2.0.2.RELEASE + 2.0.3.RELEASE + 2.0.3.RELEASE 1.8 3.8.1 diff --git a/script/docker/.env b/script/docker/.env index 9b5fc716..e52177ea 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.0.2.RELEASE +TAG=2.0.3.RELEASE