From 800f0bf027672003009b341c13fbd5ea8d6390f5 Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 7 Mar 2019 17:55:25 +0800 Subject: [PATCH] :tada: 2.0.0.RC6 --- LICENSE | 12 +- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- .../main/resources/templates/sword/edit.js.vm | 2 +- .../test/resources/templates/sword/edit.js.vm | 2 +- blade-ops/pom.xml | 2 +- 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 + blade-service-api/blade-user-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 +- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-log/pom.xml | 2 +- blade-service/blade-system/pom.xml | 2 +- .../system/controller/DeptController.java | 12 +- .../system/controller/RoleController.java | 13 +- .../system/controller/TenantController.java | 81 +- .../springblade/system/mapper/DeptMapper.java | 3 +- .../springblade/system/mapper/DeptMapper.xml | 3 + .../springblade/system/mapper/RoleMapper.java | 3 +- .../springblade/system/mapper/RoleMapper.xml | 3 + .../system/service/IDeptService.java | 3 +- .../system/service/IRoleService.java | 3 +- .../system/service/ITenantService.java | 10 +- .../system/service/impl/DeptServiceImpl.java | 4 +- .../system/service/impl/RoleServiceImpl.java | 4 +- .../service/impl/TenantServiceImpl.java | 58 +- blade-service/blade-user/pom.xml | 2 +- .../user/controller/UserController.java | 8 +- blade-service/pom.xml | 4 +- doc/sql/bladex-oracle.sql | 1109 ----------------- doc/sql/bladex-saber-mysql.sql | 20 +- doc/sql/bladex-sword-mysql.sql | 18 +- doc/sql/bladex-tenant-mysql-update-RC5.sql | 8 - pom.xml | 6 +- script/docker/.env | 2 +- 41 files changed, 204 insertions(+), 1231 deletions(-) delete mode 100644 doc/sql/bladex-oracle.sql diff --git a/LICENSE b/LICENSE index e7fe70ab..ea1bf7bf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ BladeX商业授权许可协议 一、 知识产权： -BladeX系列产品知识产权归如梦技术团队独立所有 +BladeX系列产品知识产权归BladeX团队独立所有 二、 许可： 1. 在您完全接受并遵守本协议的基础上，本协议授予您使用BladeX的某些权利和非独占性许可。 @@ -20,14 +20,14 @@ BladeX系列产品知识产权归如梦技术团队独立所有 您在使用本产品或服务时，不得将本产品产品或服务用于任何非法用途或本协议条款、条件和声明禁止的用途。 五、 免责说明： -1. 本产品按“现状”授予许可，您须自行承担使用本产品的风险。如梦技术团队不对此提供任何明示、暗示或任何其它形式的担保和表示。在任何情况下，对于因使用或无法使用本软件而导致的任何损失（包括但不仅限于商业利润损失、业务中断或业务信息丢失），如梦技术团队无需向您或任何第三方负责，即使如梦技术团队已被告知可能会造成此类损失。在任何情况下， 如梦技术团队均不就任何直接的、间接的、附带的、后果性的、特别的、惩戒性的和处罚性的损害赔偿承担任何责任，无论该主张是基于保证、合同、侵权（包括疏忽）或是基于其他原因作出。 +1. 本产品按“现状”授予许可，您须自行承担使用本产品的风险。BladeX团队不对此提供任何明示、暗示或任何其它形式的担保和表示。在任何情况下，对于因使用或无法使用本软件而导致的任何损失（包括但不仅限于商业利润损失、业务中断或业务信息丢失），BladeX团队无需向您或任何第三方负责，即使BladeX团队已被告知可能会造成此类损失。在任何情况下， BladeX团队均不就任何直接的、间接的、附带的、后果性的、特别的、惩戒性的和处罚性的损害赔偿承担任何责任，无论该主张是基于保证、合同、侵权（包括疏忽）或是基于其他原因作出。 2. 本产品可能内置有第三方服务，您应自行评估使用这些第三方服务的风险，由使用此类第三方服务而产生的纠纷，全部责任由您自行承担。 -3. 如梦技术团队不对使用本产品构建的网站中任何信息内容以及导致的任何版权纠纷、法律争议和后果承担任何责任，全部责任由您自行承担。 -4. 如梦技术团队可能会经常提供产品更新或升级，但如梦技术团队没有为根据本协议许可的产品提供维护或更新的责任。 +3. BladeX团队不对使用本产品构建的网站中任何信息内容以及导致的任何版权纠纷、法律争议和后果承担任何责任，全部责任由您自行承担。 +4. BladeX团队可能会经常提供产品更新或升级，但BladeX团队没有为根据本协议许可的产品提供维护或更新的责任。 六、 权利和所有权的保留： -如梦技术团队保留所有未在本协议中明确授予您的所有权利。如梦技术团队保留随时更新本协议的权利，并只需公示于对应产品项目的LICENSE文件，无需征得您的事先同意且无需另行通知，更新后的内容应于公示即时生效。您可以随时访问产品地址并查阅最新版许可条款，在更新生效后您继续使用本产品则被视作您已接受了新的条款。 +BladeX团队保留所有未在本协议中明确授予您的所有权利。BladeX团队保留随时更新本协议的权利，并只需公示于对应产品项目的LICENSE文件，无需征得您的事先同意且无需另行通知，更新后的内容应于公示即时生效。您可以随时访问产品地址并查阅最新版许可条款，在更新生效后您继续使用本产品则被视作您已接受了新的条款。 七、 协议终止 1. 您一旦开始复制、下载、安装或者使用本产品，即被视为完全理解并接受本协议的各项条款，在享有上述条款授予的许可权力同时，也受到相关的约束和限制，本协议许可范围以外的行为，将直接违反本协议并构成侵权。 -2. 一旦您违反本协议的条款，如梦技术团队随时可能终止本协议、收回许可和授权，并要求您承担相应法律和经济责任。 +2. 一旦您违反本协议的条款，BladeX团队随时可能终止本协议、收回许可和授权，并要求您承担相应法律和经济责任。 diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 4615edbb..b8906a5c 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.0.0.RC5 + 2.0.0.RC6 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 32e07755..b03390a8 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 13d09bbf..4eb67210 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 39132dc4..6bb30ae2 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.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 4124f0a9..2e71d1e1 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.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-ops/blade-develop/src/main/resources/templates/sword/edit.js.vm b/blade-ops/blade-develop/src/main/resources/templates/sword/edit.js.vm index b47ddd1d..ba2657c6 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/sword/edit.js.vm +++ b/blade-ops/blade-develop/src/main/resources/templates/sword/edit.js.vm @@ -10,7 +10,7 @@ const FormItem = Form.Item; @connect(({ $!{table.entityPath}, loading }) => ({ $!{table.entityPath}, - submitting: loading.effects['code/submit'], + submitting: loading.effects['$!{table.entityPath}/submit'], })) @Form.create() class $!{entity}Edit extends PureComponent { diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm index b47ddd1d..ba2657c6 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm @@ -10,7 +10,7 @@ const FormItem = Form.Item; @connect(({ $!{table.entityPath}, loading }) => ({ $!{table.entityPath}, - submitting: loading.effects['code/submit'], + submitting: loading.effects['$!{table.entityPath}/submit'], })) @Form.create() class $!{entity}Edit extends PureComponent { diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index bf966df6..18a42118 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 6ac3d41d..07d42043 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.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index af20f783..3a0b49f8 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.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 8233f9e5..e6d471f5 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.0.RC5 + 2.0.0.RC6 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 88c9f787..828362d7 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 @@ -45,6 +45,12 @@ public class Dept implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; + /** + * 租户编号 + */ + @ApiModelProperty(value = "租户编号") + private String tenantCode; + /** * 父主键 */ 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 2255f4c0..66a4158e 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 @@ -45,6 +45,12 @@ public class Role implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; + /** + * 租户编号 + */ + @ApiModelProperty(value = "租户编号") + private String tenantCode; + /** * 父主键 */ diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 902ab84b..1530b1f7 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.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index cd2f41b7..780a9b99 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.0.RC5 + 2.0.0.RC6 4.0.0 blade-service-api ${project.artifactId} - 2.0.0.RC5 + 2.0.0.RC6 pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 68a1d37b..9e757645 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.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index a9126d3f..44199906 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.0.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index dd7993b5..f8ea3894 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.0.RC5 + 2.0.0.RC6 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 965a0a8b..979480c8 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 @@ -16,11 +16,14 @@ */ package org.springblade.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.INode; import org.springblade.core.tool.utils.Func; import org.springblade.system.entity.Dept; @@ -67,8 +70,9 @@ public class DeptController extends BladeController { @ApiImplicitParam(name = "fullName", value = "部门全称", paramType = "query", dataType = "string") }) @ApiOperation(value = "列表", notes = "传入dept", position = 2) - public R> list(@ApiIgnore @RequestParam Map dept) { - List list = deptService.list(Condition.getQueryWrapper(dept, Dept.class)); + 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); DeptWrapper deptWrapper = new DeptWrapper(); return R.data(deptWrapper.listNodeVO(list)); } @@ -80,8 +84,8 @@ public class DeptController extends BladeController { */ @GetMapping("/tree") @ApiOperation(value = "树形结构", notes = "树形结构", position = 3) - public R> tree() { - List tree = deptService.tree(); + public R> tree(String tenantCode) { + List tree = deptService.tree(tenantCode); return R.data(tree); } 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 4e36d168..ea90e8a6 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 @@ -16,13 +16,15 @@ */ package org.springblade.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.INode; -import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; import org.springblade.system.entity.Role; import org.springblade.system.service.IRoleService; @@ -68,8 +70,9 @@ public class RoleController extends BladeController { @ApiImplicitParam(name = "roleAlias", value = "角色别名", paramType = "query", dataType = "string") }) @ApiOperation(value = "列表", notes = "传入role", position = 2) - public R> list(@ApiIgnore @RequestParam Map role) { - List list = roleService.list(Condition.getQueryWrapper(role, Role.class)); + 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); RoleWrapper roleWrapper = new RoleWrapper(roleService); return R.data(roleWrapper.listNodeVO(list)); } @@ -79,8 +82,8 @@ public class RoleController extends BladeController { */ @GetMapping("/tree") @ApiOperation(value = "树形结构", notes = "树形结构", position = 3) - public R> tree() { - List tree = roleService.tree(); + public R> tree(String tenantCode) { + List tree = roleService.tree(tenantCode); return R.data(tree); } 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 9bd532ff..a3b1cf9c 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 @@ -16,15 +16,16 @@ */ package org.springblade.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.Func; import org.springblade.system.entity.Tenant; import org.springblade.system.service.ITenantService; @@ -32,9 +33,11 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; +import java.util.List; +import java.util.Map; /** - * 控制器 + * 控制器 * * @author Chill */ @@ -48,8 +51,8 @@ public class TenantController extends BladeController { private ITenantService tenantService; /** - * 详情 - */ + * 详情 + */ @GetMapping("/detail") @ApiOperation(value = "详情", notes = "传入tenant", position = 1) public R detail(Tenant tenant) { @@ -58,61 +61,59 @@ public class TenantController extends BladeController { } /** - * 分页 - */ + * 分页 + */ @GetMapping("/list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "tenantCode", 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(Tenant tenant, Query query) { - IPage pages = tenantService.page(Condition.getPage(query), Condition.getQueryWrapper(tenant)); + 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); return R.data(pages); } /** - * 自定义分页 - */ + * 下拉数据源 + */ + @GetMapping("/select") + @ApiOperation(value = "下拉数据源", notes = "传入tenant", position = 3) + public R> select(Tenant tenant) { + List list = tenantService.list(Condition.getQueryWrapper(tenant)); + return R.data(list); + } + + /** + * 自定义分页 + */ @GetMapping("/page") - @ApiOperation(value = "分页", notes = "传入tenant", position = 3) + @ApiOperation(value = "分页", notes = "传入tenant", position = 4) public R> page(Tenant tenant, Query query) { IPage pages = tenantService.selectTenantPage(Condition.getPage(query), tenant); return R.data(pages); } /** - * 新增 - */ - @PostMapping("/save") - @ApiOperation(value = "新增", notes = "传入tenant", position = 4) - public R save(@Valid @RequestBody Tenant tenant) { - return R.status(tenantService.save(tenant)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperation(value = "修改", notes = "传入tenant", position = 5) - public R update(@Valid @RequestBody Tenant tenant) { - return R.status(tenantService.updateById(tenant)); - } - - /** - * 新增或修改 - */ + * 新增或修改 + */ @PostMapping("/submit") - @ApiOperation(value = "新增或修改", notes = "传入tenant", position = 6) + @ApiOperation(value = "新增或修改", notes = "传入tenant", position = 7) public R submit(@Valid @RequestBody Tenant tenant) { - return R.status(tenantService.saveOrUpdate(tenant)); + return R.status(tenantService.saveTenant(tenant)); } - + /** - * 删除 - */ + * 删除 + */ @PostMapping("/remove") - @ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids", position = 8) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(tenantService.deleteLogic(Func.toIntList(ids))); } - + } 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 0740f58e..b5eef8ab 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,8 +42,9 @@ public interface DeptMapper extends BaseMapper { /** * 获取树形节点 * + * @param tenantCode * @return */ - List tree(); + List tree(String tenantCode); } 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 b7b9a3a9..6458be5a 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 @@ -33,6 +33,9 @@ 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 f96c3060..0f061978 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,8 +42,9 @@ public interface RoleMapper extends BaseMapper { /** * 获取树形节点 * + * @param tenantCode * @return */ - List tree(); + List tree(String tenantCode); } 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 c79484fe..241102c8 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 @@ -32,6 +32,9 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java index 61753af6..2a8e8511 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java @@ -42,8 +42,9 @@ public interface IDeptService extends IService { /** * 树形结构 * + * @param tenantCode * @return */ - List tree(); + List tree(String tenantCode); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java index ed82e6c1..a37cac02 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java @@ -43,9 +43,10 @@ public interface IRoleService extends IService { /** * 树形结构 * + * @param tenantCode * @return */ - List tree(); + List tree(String tenantCode); /** * 权限配置 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java index 0e5b5e2f..ed68f714 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java @@ -21,7 +21,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.system.entity.Tenant; /** - * 服务类 + * 服务类 * * @author Chill */ @@ -36,4 +36,12 @@ public interface ITenantService extends BaseService { */ IPage selectTenantPage(IPage page, Tenant tenant); + /** + * 新增 + * + * @param tenant + * @return + */ + boolean saveTenant(Tenant tenant); + } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java index 421f69a0..c5985578 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java @@ -41,8 +41,8 @@ public class DeptServiceImpl extends ServiceImpl implements ID } @Override - public List tree() { - return ForestNodeMerger.merge(baseMapper.tree()); + public List tree(String tenantCode) { + return ForestNodeMerger.merge(baseMapper.tree(tenantCode)); } } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index c6b29fc7..a40e071b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -52,8 +52,8 @@ public class RoleServiceImpl extends ServiceImpl implements IR } @Override - public List tree() { - return ForestNodeMerger.merge(baseMapper.tree()); + public List tree(String tenantCode) { + return ForestNodeMerger.merge(baseMapper.tree(tenantCode)); } @Override diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java index 8a490ad8..d4068463 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java @@ -17,23 +17,79 @@ package org.springblade.system.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tenant.TenantId; +import org.springblade.core.tool.constant.BladeConstant; +import org.springblade.core.tool.utils.Func; +import org.springblade.system.entity.Dept; +import org.springblade.system.entity.Role; import org.springblade.system.entity.Tenant; +import org.springblade.system.mapper.DeptMapper; +import org.springblade.system.mapper.RoleMapper; import org.springblade.system.mapper.TenantMapper; import org.springblade.system.service.ITenantService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; /** - * 服务实现类 + * 服务实现类 * * @author Chill */ @Service +@AllArgsConstructor public class TenantServiceImpl extends BaseServiceImpl implements ITenantService { + private final TenantId tenantId; + private final RoleMapper roleMapper; + private final DeptMapper deptMapper; + @Override public IPage selectTenantPage(IPage page, Tenant tenant) { return page.setRecords(baseMapper.selectTenantPage(page, tenant)); } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean saveTenant(Tenant tenant) { + if (Func.isEmpty(tenant.getId())) { + List tenants = baseMapper.selectList(Wrappers.query().lambda().eq(Tenant::getIsDeleted, BladeConstant.DB_NOT_DELETED)); + List codes = tenants.stream().map(Tenant::getTenantCode).collect(Collectors.toList()); + String tenantCode = getTenantCode(codes); + tenant.setTenantCode(tenantCode); + // 新建租户对应的默认角色 + Role role = new Role(); + role.setTenantCode(tenantCode); + role.setParentId(1); + role.setRoleName("管理员"); + role.setRoleAlias("admin"); + role.setSort(2); + role.setIsDeleted(0); + roleMapper.insert(role); + // 新建租户对应的默认部门 + Dept dept = new Dept(); + dept.setTenantCode(tenantCode); + dept.setParentId(0); + dept.setDeptName(tenant.getTenantName()); + dept.setFullName(tenant.getTenantName()); + dept.setSort(2); + dept.setIsDeleted(0); + deptMapper.insert(dept); + } + return super.saveOrUpdate(tenant); + } + + private String getTenantCode(List codes) { + String code = tenantId.generate(); + if (codes.contains(code)) { + return getTenantCode(codes); + } + return code; + } + } diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 84376cf4..79d978c7 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.0.0.RC5 + 2.0.0.RC6 4.0.0 diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java index ab24c10f..54ecc53f 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -17,6 +17,7 @@ package org.springblade.system.user.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,7 +26,9 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.feign.IDictClient; @@ -73,8 +76,9 @@ public class UserController { @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string") }) @ApiOperation(value = "列表", notes = "传入account和realName", position = 2) - public R> list(@ApiIgnore @RequestParam Map user, Query query) { - IPage pages = userService.page(Condition.getPage(query), Condition.getQueryWrapper(user, User.class)); + public R> list(@ApiIgnore @RequestParam Map user, Query query, BladeUser bladeUser) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); + IPage pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(User::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); UserWrapper userWrapper = new UserWrapper(userService, dictClient); return R.data(userWrapper.pageVO(pages)); } diff --git a/blade-service/pom.xml b/blade-service/pom.xml index ca81321f..d974624f 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ blade-service ${project.artifactId} - 2.0.0.RC5 + 2.0.0.RC6 pom BladeX 微服务集合 org.springblade BladeX - 2.0.0.RC5 + 2.0.0.RC6 diff --git a/doc/sql/bladex-oracle.sql b/doc/sql/bladex-oracle.sql deleted file mode 100644 index 36a776e4..00000000 --- a/doc/sql/bladex-oracle.sql +++ /dev/null @@ -1,1109 +0,0 @@ -/* - Navicat Premium Data Transfer - - Source Server : bladex - Source Server Type : Oracle - Source Server Version : 110200 - Source Host : 192.168.1.182:1521 - Source Schema : BLADEX - - Target Server Type : Oracle - Target Server Version : 110200 - File Encoding : 65001 - - Date: 01/03/2019 13:50:03 -*/ - - --- ---------------------------- --- Table structure for BLADE_CODE --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_CODE"; -CREATE TABLE "BLADEX"."BLADE_CODE" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "SERVICE_NAME" NVARCHAR2(64) , - "CODE_NAME" NVARCHAR2(64) , - "TABLE_NAME" NVARCHAR2(64) , - "TABLE_PREFIX" NVARCHAR2(64) , - "PK_NAME" NVARCHAR2(32) , - "PACKAGE_NAME" NVARCHAR2(500) , - "API_PATH" NCLOB , - "WEB_PATH" NCLOB , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."SERVICE_NAME" IS '服务名称'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."CODE_NAME" IS '模块名称'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."TABLE_NAME" IS '表名'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."TABLE_PREFIX" IS '表前缀'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."PK_NAME" IS '主键名'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."PACKAGE_NAME" IS '后端包名'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."API_PATH" IS '后端路径'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."WEB_PATH" IS '前端路径'; -COMMENT ON COLUMN "BLADEX"."BLADE_CODE"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_CODE --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_CODE" VALUES ('1', '000000', 'blade-demo', '通知公告', 'blade_notice', 'blade_', 'id', 'org.springblade.desktop', 'D:\Develop\Git\SpringBlade\blade-ops\blade-develop', 'D:\Develop\Git\Saber', '0'); - --- ---------------------------- --- Table structure for BLADE_DEPT --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_DEPT"; -CREATE TABLE "BLADEX"."BLADE_DEPT" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "PARENT_ID" NUMBER(11) DEFAULT 0 , - "DEPT_NAME" NVARCHAR2(45) , - "FULL_NAME" NVARCHAR2(45) , - "SORT" NUMBER(11) , - "REMARK" NVARCHAR2(255) , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."PARENT_ID" IS '父主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."DEPT_NAME" IS '部门名'; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."FULL_NAME" IS '部门全程'; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."SORT" IS '排序'; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."REMARK" IS '备注'; -COMMENT ON COLUMN "BLADEX"."BLADE_DEPT"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_DEPT --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_DEPT" VALUES ('4', '000000', '1', '杭州刀锋', '杭州刀锋', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DEPT" VALUES ('5', '000000', '1', '福建刀锋', '福建刀锋', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DEPT" VALUES ('1', '000000', '0', '刀锋科技', '江苏刀锋科技有限公司', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DEPT" VALUES ('2', '000000', '1', '常州刀锋', '常州刀锋科技有限公司', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DEPT" VALUES ('3', '000000', '1', '苏州刀锋', '苏州刀锋科技有限公司', '1', NULL, '0'); - --- ---------------------------- --- Table structure for BLADE_DICT --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_DICT"; -CREATE TABLE "BLADEX"."BLADE_DICT" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "PARENT_ID" NUMBER(11) DEFAULT 0 , - "CODE" NVARCHAR2(255) , - "DICT_KEY" NUMBER(11) , - "DICT_VALUE" NVARCHAR2(255) , - "SORT" NUMBER(11) , - "REMARK" NVARCHAR2(255) , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."PARENT_ID" IS '父主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."CODE" IS '字典码'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."DICT_KEY" IS '字典值'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."DICT_VALUE" IS '字典名称'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."SORT" IS '排序'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."REMARK" IS '字典备注'; -COMMENT ON COLUMN "BLADEX"."BLADE_DICT"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_DICT --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('1', '000000', '0', 'sex', '-1', '性别', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('2', '000000', '1', 'sex', '1', '男', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('3', '000000', '1', 'sex', '2', '女', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('4', '000000', '0', 'notice', '-1', '通知类型', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('5', '000000', '4', 'notice', '1', '发布通知', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('6', '000000', '4', 'notice', '2', '批转通知', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('7', '000000', '4', 'notice', '3', '转发通知', '3', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('8', '000000', '4', 'notice', '4', '指示通知', '4', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('9', '000000', '4', 'notice', '5', '任免通知', '5', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('10', '000000', '4', 'notice', '6', '事务通知', '6', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('11', '000000', '0', 'menu_category', '-1', '菜单类型', '3', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('12', '000000', '11', 'menu_category', '1', '菜单', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('13', '000000', '11', 'menu_category', '2', '按钮', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('14', '000000', '0', 'button_func', '-1', '按钮功能', '4', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('15', '000000', '14', 'button_func', '1', '工具栏', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('16', '000000', '14', 'button_func', '2', '操作栏', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('17', '000000', '14', 'button_func', '3', '工具操作栏', '3', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('18', '000000', '0', 'yes_no', '-1', '是否', '5', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('19', '000000', '18', 'yes_no', '1', '否', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('20', '000000', '18', 'yes_no', '2', '是', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('21', '000000', '0', 'is_enable', '-1', '是否启用', '0', NULL, NULL); -INSERT INTO "BLADEX"."BLADE_DICT" VALUES ('22', '000000', '0', 'is_enable', '-1', '是否启用', '0', NULL, '1'); - - --- ---------------------------- --- Table structure for BLADE_LOG_API --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_LOG_API"; -CREATE TABLE "BLADEX"."BLADE_LOG_API" ( - "ID" NUMBER(20) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "SERVICE_ID" NVARCHAR2(32) , - "SERVER_HOST" NVARCHAR2(255) , - "SERVER_IP" NVARCHAR2(255) , - "ENV" NVARCHAR2(255) , - "TYPE" NCHAR(1) DEFAULT 1 , - "TITLE" NVARCHAR2(255) , - "METHOD" NVARCHAR2(10) , - "REQUEST_URI" NVARCHAR2(255) , - "USER_AGENT" NVARCHAR2(1000) , - "REMOTE_IP" NVARCHAR2(255) , - "METHOD_CLASS" NVARCHAR2(255) , - "METHOD_NAME" NVARCHAR2(255) , - "PARAMS" NCLOB , - "TIME" NVARCHAR2(64) , - "CREATE_BY" NVARCHAR2(64) , - "CREATE_TIME" DATE -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."ID" IS '编号'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."SERVICE_ID" IS '服务ID'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."SERVER_HOST" IS '服务器名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."SERVER_IP" IS '服务器IP地址'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."ENV" IS '服务器环境'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."TYPE" IS '日志类型'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."TITLE" IS '日志标题'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."METHOD" IS '操作方式'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."REQUEST_URI" IS '请求URI'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."USER_AGENT" IS '用户代理'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."REMOTE_IP" IS '操作IP地址'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."METHOD_CLASS" IS '方法类'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."METHOD_NAME" IS '方法名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."PARAMS" IS '操作提交的数据'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."TIME" IS '执行时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."CREATE_BY" IS '创建者'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_API"."CREATE_TIME" IS '创建时间'; - --- ---------------------------- --- Table structure for BLADE_LOG_ERROR --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_LOG_ERROR"; -CREATE TABLE "BLADEX"."BLADE_LOG_ERROR" ( - "ID" NUMBER(20) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "SERVICE_ID" NVARCHAR2(32) , - "SERVER_HOST" NVARCHAR2(255) , - "SERVER_IP" NVARCHAR2(255) , - "ENV" NVARCHAR2(255) , - "METHOD" NVARCHAR2(10) , - "REQUEST_URI" NVARCHAR2(255) , - "USER_AGENT" NVARCHAR2(1000) , - "STACK_TRACE" NCLOB , - "EXCEPTION_NAME" NVARCHAR2(255) , - "MESSAGE" NCLOB , - "LINE_NUMBER" NUMBER(11) , - "METHOD_CLASS" NVARCHAR2(255) , - "FILE_NAME" NVARCHAR2(1000) , - "METHOD_NAME" NVARCHAR2(255) , - "PARAMS" NCLOB , - "CREATE_BY" NVARCHAR2(64) , - "CREATE_TIME" DATE -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."ID" IS '编号'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."SERVICE_ID" IS '服务ID'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."SERVER_HOST" IS '服务器名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."SERVER_IP" IS '服务器IP地址'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."ENV" IS '系统环境'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."METHOD" IS '操作方式'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."REQUEST_URI" IS '请求URI'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."USER_AGENT" IS '用户代理'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."STACK_TRACE" IS '堆栈'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."EXCEPTION_NAME" IS '异常名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."MESSAGE" IS '异常信息'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."LINE_NUMBER" IS '错误行数'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."METHOD_CLASS" IS '方法类'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."FILE_NAME" IS '文件名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."METHOD_NAME" IS '方法名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."PARAMS" IS '操作提交的数据'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."CREATE_BY" IS '创建者'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_ERROR"."CREATE_TIME" IS '创建时间'; - --- ---------------------------- --- Table structure for BLADE_LOG_USUAL --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_LOG_USUAL"; -CREATE TABLE "BLADEX"."BLADE_LOG_USUAL" ( - "ID" NUMBER(20) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "SERVICE_ID" NVARCHAR2(32) , - "SERVER_HOST" NVARCHAR2(255) , - "SERVER_IP" NVARCHAR2(255) , - "ENV" NVARCHAR2(255) , - "LOG_LEVEL" NVARCHAR2(10) , - "LOG_ID" NVARCHAR2(100) , - "LOG_DATA" NCLOB , - "METHOD" NVARCHAR2(10) , - "REQUEST_URI" NVARCHAR2(255) , - "USER_AGENT" NVARCHAR2(1000) , - "PARAMS" NCLOB , - "CREATE_BY" NVARCHAR2(64) , - "CREATE_TIME" DATE -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."ID" IS '编号'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."SERVICE_ID" IS '服务ID'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."SERVER_HOST" IS '服务器名'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."SERVER_IP" IS '服务器IP地址'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."ENV" IS '系统环境'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."LOG_LEVEL" IS '日志级别'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."LOG_ID" IS '日志业务id'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."LOG_DATA" IS '日志数据'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."METHOD" IS '操作方式'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."REQUEST_URI" IS '请求URI'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."USER_AGENT" IS '用户代理'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."PARAMS" IS '操作提交的数据'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."CREATE_BY" IS '创建者'; -COMMENT ON COLUMN "BLADEX"."BLADE_LOG_USUAL"."CREATE_TIME" IS '创建时间'; - --- ---------------------------- --- Table structure for BLADE_MENU --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_MENU"; -CREATE TABLE "BLADEX"."BLADE_MENU" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "PARENT_ID" NUMBER(11) DEFAULT 0 , - "CODE" NVARCHAR2(255) , - "NAME" NVARCHAR2(255) , - "ALIAS" NVARCHAR2(255) , - "PATH" NVARCHAR2(255) , - "SOURCE" NVARCHAR2(255) , - "SORT" NUMBER(11) , - "CATEGORY" NUMBER(11) , - "ACTION" NUMBER(11) DEFAULT 0 , - "IS_OPEN" NUMBER(11) DEFAULT 0 , - "REMARK" NVARCHAR2(255) , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."PARENT_ID" IS '父级菜单'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."CODE" IS '菜单编号'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."NAME" IS '菜单名称'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."ALIAS" IS '菜单别名'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."PATH" IS '请求地址'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."SOURCE" IS '菜单资源'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."SORT" IS '排序'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."CATEGORY" IS '菜单类型'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."ACTION" IS '操作按钮类型'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."IS_OPEN" IS '是否打开新页面'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."REMARK" IS '备注'; -COMMENT ON COLUMN "BLADEX"."BLADE_MENU"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_MENU --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('57', '000000', '0', 'viewTop', 'viewTop', 'viewTop', '/viewTop', NULL, '0', '1', '0', '0', NULL, '1'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('1', '000000', '0', 'desk', '工作台', 'menu', '/desk', 'desktop', '1', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('2', '000000', '1', 'notice', '通知公告', 'menu', '/desk/notice', NULL, '1', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('3', '000000', '0', 'system', '系统管理', 'menu', '/system', 'setting', '2', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('4', '000000', '3', 'user', '用户管理', 'menu', '/system/user', NULL, '1', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('5', '000000', '3', 'dept', '部门管理', 'menu', '/system/dept', NULL, '2', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('6', '000000', '3', 'dict', '字典管理', 'menu', '/system/dict', NULL, '3', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('7', '000000', '3', 'menu', '菜单管理', 'menu', '/system/menu', NULL, '4', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('8', '000000', '3', 'role', '角色管理', 'menu', '/system/role', NULL, '5', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('9', '000000', '3', 'param', '参数管理', 'menu', '/system/param', NULL, '6', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('10', '000000', '0', 'monitor', '系统监控', 'menu', '/monitor', 'fund', '3', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('11', '000000', '10', 'doc', '接口文档', 'menu', 'http://localhost:8800/doc.html', NULL, '1', '1', '0', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('12', '000000', '10', 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, '2', '1', '0', '2', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('13', '000000', '10', 'log', '日志管理', 'menu', '/monitor/log', NULL, '3', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('14', '000000', '13', 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, '1', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('15', '000000', '13', 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, '2', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('16', '000000', '13', 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, '3', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('17', '000000', '0', 'tool', '研发工具', 'menu', '/tool', 'tool', '4', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('18', '000000', '17', 'code', '代码生成', 'menu', '/tool/code', NULL, '1', '1', '0', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('19', '000000', '2', 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('20', '000000', '2', 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('21', '000000', '2', 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('22', '000000', '2', 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('23', '000000', '4', 'user_add', '新增', 'add', '/system/user/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('24', '000000', '4', 'user_edit', '修改', 'edit', '/system/user/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('25', '000000', '4', 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('26', '000000', '4', 'user_role', '角色配置', 'role', NULL, 'user-add', '4', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('27', '000000', '4', 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', '5', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('28', '000000', '4', 'user_view', '查看', 'view', '/system/user/view', 'file-text', '6', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('29', '000000', '5', 'dept_add', '新增', 'add', '/system/dept/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('30', '000000', '5', 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('31', '000000', '5', 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('32', '000000', '5', 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('33', '000000', '6', 'dict_add', '新增', 'add', '/system/dict/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('34', '000000', '6', 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('35', '000000', '6', 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('36', '000000', '6', 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('37', '000000', '7', 'menu_add', '新增', 'add', '/system/menu/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('38', '000000', '7', 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('39', '000000', '7', 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('40', '000000', '7', 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('41', '000000', '8', 'role_add', '新增', 'add', '/system/role/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('42', '000000', '8', 'role_edit', '修改', 'edit', '/system/role/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('43', '000000', '8', 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('44', '000000', '8', 'role_view', '查看', 'view', '/system/role/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('45', '000000', '9', 'param_add', '新增', 'add', '/system/param/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('46', '000000', '9', 'param_edit', '修改', 'edit', '/system/param/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('47', '000000', '9', 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('48', '000000', '9', 'param_view', '查看', 'view', '/system/param/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('49', '000000', '14', 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('50', '000000', '15', 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('51', '000000', '16', 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', '4', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('52', '000000', '18', 'code_add', '新增', 'add', '/tool/code/add', 'plus', '1', '2', '1', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('53', '000000', '18', 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', '2', '2', '2', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('54', '000000', '18', 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', '3', '2', '3', '1', NULL, '0'); -INSERT INTO "BLADEX"."BLADE_MENU" VALUES ('55', '000000', '18', 'code_view', '查看', 'view', '/tool/code/view', 'file-text', '4', '2', '2', '1', NULL, '0'); - --- ---------------------------- --- Table structure for BLADE_NOTICE --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_NOTICE"; -CREATE TABLE "BLADEX"."BLADE_NOTICE" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "TITLE" NVARCHAR2(255) , - "CATEGORY" NUMBER(11) , - "RELEASE_TIME" DATE , - "CONTENT" NVARCHAR2(255) , - "CREATE_USER" NUMBER(11) , - "CREATE_TIME" DATE , - "UPDATE_USER" NUMBER(11) , - "UPDATE_TIME" DATE , - "STATUS" NUMBER(11) , - "IS_DELETED" NUMBER(11) -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."TITLE" IS '标题'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."CATEGORY" IS '类型'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."RELEASE_TIME" IS '发布时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."CONTENT" IS '内容'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."CREATE_USER" IS '创建人'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."CREATE_TIME" IS '创建时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."UPDATE_USER" IS '修改人'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."UPDATE_TIME" IS '修改时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."STATUS" IS '状态'; -COMMENT ON COLUMN "BLADEX"."BLADE_NOTICE"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_NOTICE --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_NOTICE" VALUES ('3', '通告测试', '-1', TO_DATE('2019-03-01 12:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '通告测试', '1', TO_DATE('2019-03-01 12:21:08', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2019-03-01 12:21:08', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); - --- ---------------------------- --- Table structure for BLADE_PARAM --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_PARAM"; -CREATE TABLE "BLADEX"."BLADE_PARAM" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "PARAM_NAME" NVARCHAR2(255) , - "PARAM_KEY" NVARCHAR2(255) , - "PARAM_VALUE" NVARCHAR2(255) , - "REMARK" NVARCHAR2(255) , - "CREATE_USER" NUMBER(11) , - "CREATE_TIME" DATE , - "UPDATE_USER" NUMBER(11) , - "UPDATE_TIME" DATE , - "STATUS" NUMBER(11) , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."PARAM_NAME" IS '参数名'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."PARAM_KEY" IS '参数键'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."PARAM_VALUE" IS '参数值'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."REMARK" IS '备注'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."CREATE_USER" IS '创建人'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."CREATE_TIME" IS '创建时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."UPDATE_USER" IS '修改人'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."UPDATE_TIME" IS '修改时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."STATUS" IS '状态'; -COMMENT ON COLUMN "BLADEX"."BLADE_PARAM"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_PARAM --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_PARAM" VALUES ('3', '000000', '默认账号', 'account.initAccount', 'admin10', NULL, '1', TO_DATE('2019-03-01 13:39:45', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2019-03-01 13:39:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', '1'); -INSERT INTO "BLADEX"."BLADE_PARAM" VALUES ('1', '000000', '是否开启注册功能', 'account.registerUser', 'true', '开启注册', '1', TO_DATE('2018-12-28 12:19:01', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2018-12-28 12:19:01', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); -INSERT INTO "BLADEX"."BLADE_PARAM" VALUES ('2', '000000', '账号初始密码', 'account.initPassword', '123456', '初始密码', '1', TO_DATE('2018-12-28 12:19:01', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2018-12-28 12:19:01', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); - --- ---------------------------- --- Table structure for BLADE_ROLE --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_ROLE"; -CREATE TABLE "BLADEX"."BLADE_ROLE" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "PARENT_ID" NUMBER(11) DEFAULT 0 , - "ROLE_NAME" NVARCHAR2(255) , - "SORT" NUMBER(11) , - "ROLE_ALIAS" NVARCHAR2(255) , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE"."PARENT_ID" IS '父主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE"."ROLE_NAME" IS '角色名'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE"."SORT" IS '排序'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE"."ROLE_ALIAS" IS '角色别名'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_ROLE --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_ROLE" VALUES ('1', '000000', '0', '超级管理员', '1', 'admin', '0'); -INSERT INTO "BLADEX"."BLADE_ROLE" VALUES ('2', '000000', '0', '系统管理员', '0', 'system', '0'); - --- ---------------------------- --- Table structure for BLADE_ROLE_MENU --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_ROLE_MENU"; -CREATE TABLE "BLADEX"."BLADE_ROLE_MENU" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "MENU_ID" NUMBER(11) , - "ROLE_ID" NUMBER(11) -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE_MENU"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE_MENU"."MENU_ID" IS '菜单id'; -COMMENT ON COLUMN "BLADEX"."BLADE_ROLE_MENU"."ROLE_ID" IS '角色id'; - --- ---------------------------- --- Records of BLADE_ROLE_MENU --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('1', '000000', '1', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('2', '000000', '2', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('3', '000000', '3', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('4', '000000', '4', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('5', '000000', '5', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('6', '000000', '6', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('7', '000000', '7', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('8', '000000', '8', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('9', '000000', '9', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('10', '000000', '10', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('11', '000000', '11', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('12', '000000', '12', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('13', '000000', '13', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('14', '000000', '14', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('15', '000000', '15', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('16', '000000', '16', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('17', '000000', '17', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('18', '000000', '18', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('19', '000000', '19', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('20', '000000', '20', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('21', '000000', '21', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('22', '000000', '22', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('23', '000000', '23', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('24', '000000', '24', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('25', '000000', '25', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('26', '000000', '26', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('27', '000000', '27', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('28', '000000', '28', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('29', '000000', '29', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('30', '000000', '30', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('31', '000000', '31', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('32', '000000', '32', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('33', '000000', '33', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('34', '000000', '34', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('35', '000000', '35', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('36', '000000', '36', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('37', '000000', '37', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('38', '000000', '38', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('39', '000000', '39', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('40', '000000', '40', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('41', '000000', '41', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('42', '000000', '42', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('43', '000000', '43', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('44', '000000', '44', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('45', '000000', '45', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('46', '000000', '46', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('47', '000000', '47', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('48', '000000', '48', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('49', '000000', '49', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('50', '000000', '50', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('51', '000000', '51', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('52', '000000', '52', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('53', '000000', '53', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('54', '000000', '54', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('55', '000000', '55', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('56', '000000', '56', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('57', '000000', '57', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('58', '000000', '58', '1'); -INSERT INTO "BLADEX"."BLADE_ROLE_MENU" VALUES ('59', '000000', '59', '1'); - --- ---------------------------- --- Table structure for BLADE_USER --- ---------------------------- -DROP TABLE "BLADEX"."BLADE_USER"; -CREATE TABLE "BLADEX"."BLADE_USER" ( - "ID" NUMBER(11) NOT NULL , - "TENANT_CODE" NVARCHAR2(12) , - "ACCOUNT" NVARCHAR2(45) , - "PASSWORD" NVARCHAR2(45) , - "NAME" NVARCHAR2(20) , - "REAL_NAME" NVARCHAR2(10) , - "EMAIL" NVARCHAR2(45) , - "PHONE" NVARCHAR2(45) , - "BIRTHDAY" DATE , - "SEX" NUMBER(6) , - "ROLE_ID" NVARCHAR2(255) , - "DEPT_ID" NVARCHAR2(255) , - "CREATE_USER" NUMBER(11) , - "CREATE_TIME" DATE , - "UPDATE_USER" NUMBER(11) , - "UPDATE_TIME" DATE , - "STATUS" NUMBER(11) , - "IS_DELETED" NUMBER(11) DEFAULT 0 -) -TABLESPACE "USERS" -LOGGING -NOCOMPRESS -PCTFREE 10 -INITRANS 1 -STORAGE ( - INITIAL 65536 - NEXT 1048576 - MINEXTENTS 1 - MAXEXTENTS 2147483645 - BUFFER_POOL DEFAULT -) -PARALLEL 1 -NOCACHE -DISABLE ROW MOVEMENT -; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."ID" IS '主键'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."ACCOUNT" IS '账号'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."PASSWORD" IS '密码'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."NAME" IS '昵称'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."REAL_NAME" IS '真名'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."EMAIL" IS '邮箱'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."PHONE" IS '手机'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."BIRTHDAY" IS '生日'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."SEX" IS '性别'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."ROLE_ID" IS '角色id'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."DEPT_ID" IS '部门id'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."CREATE_USER" IS '创建人'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."CREATE_TIME" IS '创建时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."UPDATE_USER" IS '修改人'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."UPDATE_TIME" IS '修改时间'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."STATUS" IS '状态'; -COMMENT ON COLUMN "BLADEX"."BLADE_USER"."IS_DELETED" IS '是否已删除'; - --- ---------------------------- --- Records of BLADE_USER --- ---------------------------- -INSERT INTO "BLADEX"."BLADE_USER" VALUES ('3', '000000', 'admin02', '10470c3b4b1fed12c3baac014be15fac67c6e815', 'admin02', 'admin02', NULL, '15605912555', NULL, '1', '1', '2', '1', TO_DATE('2019-03-01 12:59:06', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2019-03-01 12:59:06', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); -INSERT INTO "BLADEX"."BLADE_USER" VALUES ('1', '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', 'admin@ronrisoft.com.cn', '15605912544', TO_DATE('2015-09-08 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', '1', '2', '1', TO_DATE('2018-05-01 10:47:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2019-02-24 01:00:20', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); -INSERT INTO "BLADEX"."BLADE_USER" VALUES ('2', '000000', 'admin01', '10470c3b4b1fed12c3baac014be15fac67c6e815', 'admin01', 'admin01', '493559828@qq.com', '15605912544', TO_DATE('2019-02-24 12:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', '1', '2', '1', TO_DATE('2019-02-24 00:56:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2019-03-01 11:45:06', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); - --- ---------------------------- --- Sequence structure for CODE_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."CODE_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."CODE_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for DEPT_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."DEPT_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."DEPT_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for DICT_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."DICT_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."DICT_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for LOG_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."LOG_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."LOG_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for MENU_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."MENU_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."MENU_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for NOTICE_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."NOTICE_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."NOTICE_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 CACHE 20; - --- ---------------------------- --- Sequence structure for PARAM_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."PARAM_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."PARAM_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for ROLE_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."ROLE_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."ROLE_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for ROLE_MENU_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."ROLE_MENU_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."ROLE_MENU_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Sequence structure for USER_ID_SEQ --- ---------------------------- -DROP SEQUENCE "BLADEX"."USER_ID_SEQ"; -CREATE SEQUENCE "BLADEX"."USER_ID_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 NOCACHE; - --- ---------------------------- --- Primary Key structure for table BLADE_CODE --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_CODE" ADD CONSTRAINT "SYS_C0014581" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_CODE --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_CODE" ADD CONSTRAINT "SYS_C0014568" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_CODE --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_CODE_ID" BEFORE INSERT ON "BLADEX"."BLADE_CODE" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select code_id_seq.nextval -- **_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_code_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_DEPT --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_DEPT" ADD CONSTRAINT "SYS_C0014582" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_DEPT --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_DEPT" ADD CONSTRAINT "SYS_C0014569" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_DEPT --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_DEPT_ID" BEFORE INSERT ON "BLADEX"."BLADE_DEPT" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select dept_id_seq.nextval -- **_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_dept_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_DICT --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_DICT" ADD CONSTRAINT "SYS_C0014583" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_DICT --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_DICT" ADD CONSTRAINT "SYS_C0014570" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_DICT --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_DICT_ID" BEFORE INSERT ON "BLADEX"."BLADE_DICT" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select dict_id_seq.nextval -- **_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_dict_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_LOG --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG" ADD CONSTRAINT "SYS_C0014584" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_LOG --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG" ADD CONSTRAINT "SYS_C0014571" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_LOG --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_LOG_ID" BEFORE INSERT ON "BLADEX"."BLADE_LOG" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select log_id_seq.nextval -- **_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_log_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_LOG_API --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG_API" ADD CONSTRAINT "SYS_C0014585" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_LOG_API --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG_API" ADD CONSTRAINT "SYS_C0014572" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Primary Key structure for table BLADE_LOG_ERROR --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG_ERROR" ADD CONSTRAINT "SYS_C0014586" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_LOG_ERROR --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG_ERROR" ADD CONSTRAINT "SYS_C0014573" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Primary Key structure for table BLADE_LOG_USUAL --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG_USUAL" ADD CONSTRAINT "SYS_C0014587" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_LOG_USUAL --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_LOG_USUAL" ADD CONSTRAINT "SYS_C0014574" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Primary Key structure for table BLADE_MENU --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_MENU" ADD CONSTRAINT "SYS_C0014588" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_MENU --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_MENU" ADD CONSTRAINT "SYS_C0014575" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_MENU --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_MENU_ID" BEFORE INSERT ON "BLADEX"."BLADE_MENU" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select menu_id_seq.nextval -- **_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_menu_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_NOTICE --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_NOTICE" ADD CONSTRAINT "SYS_C0014589" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_NOTICE --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_NOTICE" ADD CONSTRAINT "SYS_C0014576" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_NOTICE --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_NOTICE_ID" BEFORE INSERT ON "BLADEX"."BLADE_NOTICE" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN - select notice_id_Seq.nextval - into nextid - from sys.dual; - :new.id:=nextid; - end if; -end tri_notice_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_PARAM --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_PARAM" ADD CONSTRAINT "SYS_C0014590" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_PARAM --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_PARAM" ADD CONSTRAINT "SYS_C0014577" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_PARAM --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_PARAM_ID" BEFORE INSERT ON "BLADEX"."BLADE_PARAM" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select param_id_seq.nextval -- **_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_param_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_ROLE --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_ROLE" ADD CONSTRAINT "SYS_C0014591" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_ROLE --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_ROLE" ADD CONSTRAINT "SYS_C0014578" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_ROLE --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_ROLE_ID" BEFORE INSERT ON "BLADEX"."BLADE_ROLE" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select role_id_seq.nextval --user_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_role_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_ROLE_MENU --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_ROLE_MENU" ADD CONSTRAINT "SYS_C0014592" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_ROLE_MENU --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_ROLE_MENU" ADD CONSTRAINT "SYS_C0014579" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_ROLE_MENU --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_ROLE_MENU_ID" BEFORE INSERT ON "BLADEX"."BLADE_ROLE_MENU" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select role_menu_id_seq.nextval --user_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_role_menu_id; -/ - --- ---------------------------- --- Primary Key structure for table BLADE_USER --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_USER" ADD CONSTRAINT "SYS_C0014593" PRIMARY KEY ("ID"); - --- ---------------------------- --- Checks structure for table BLADE_USER --- ---------------------------- -ALTER TABLE "BLADEX"."BLADE_USER" ADD CONSTRAINT "SYS_C0014580" CHECK ("ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; - --- ---------------------------- --- Triggers structure for table BLADE_USER --- ---------------------------- -CREATE TRIGGER "BLADEX"."TRI_USER_ID" BEFORE INSERT ON "BLADEX"."BLADE_USER" REFERENCING OLD AS "OLD" NEW AS "NEW" FOR EACH ROW -declare - nextid number; -begin - IF :new.id IS NULL or :new.id=0 THEN --id是列名 - select user_id_seq.nextval --user_id_seq正是刚才创建的序列 - into nextid - from dual; - :new.id:=nextid; - end if; -end tri_user_id; -/ diff --git a/doc/sql/bladex-saber-mysql.sql b/doc/sql/bladex-saber-mysql.sql index 1a8140ab..43b137f6 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: 03/03/2019 09:15:02 + Date: 07/03/2019 14:48:13 */ SET NAMES utf8mb4; @@ -71,7 +71,6 @@ COMMIT; DROP TABLE IF EXISTS `blade_dict`; CREATE TABLE `blade_dict` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `parent_id` int(11) NULL DEFAULT 0 COMMENT '父主键', `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典码', `dict_key` int(2) NULL DEFAULT NULL COMMENT '字典值', @@ -86,7 +85,7 @@ CREATE TABLE `blade_dict` ( -- Records of blade_dict -- ---------------------------- BEGIN; -INSERT INTO `blade_dict` VALUES (1, '000000', 0, 'sex', -1, '性别', 1, NULL, 0), (2, '000000', 1, 'sex', 1, '男', 1, NULL, 0), (3, '000000', 1, 'sex', 2, '女', 2, NULL, 0), (4, '000000', 0, 'notice', -1, '通知类型', 2, NULL, 0), (5, '000000', 4, 'notice', 1, '发布通知', 1, NULL, 0), (6, '000000', 4, 'notice', 2, '批转通知', 2, NULL, 0), (7, '000000', 4, 'notice', 3, '转发通知', 3, NULL, 0), (8, '000000', 4, 'notice', 4, '指示通知', 4, NULL, 0), (9, '000000', 4, 'notice', 5, '任免通知', 5, NULL, 0), (10, '000000', 4, 'notice', 6, '事务通知', 6, NULL, 0), (11, '000000', 0, 'menu_category', -1, '菜单类型', 3, NULL, 0), (12, '000000', 11, 'menu_category', 1, '菜单', 1, NULL, 0), (13, '000000', 11, 'menu_category', 2, '按钮', 2, NULL, 0), (14, '000000', 0, 'button_func', -1, '按钮功能', 4, NULL, 0), (15, '000000', 14, 'button_func', 1, '工具栏', 1, NULL, 0), (16, '000000', 14, 'button_func', 2, '操作栏', 2, NULL, 0), (17, '000000', 14, 'button_func', 3, '工具操作栏', 3, NULL, 0), (18, '000000', 0, 'yes_no', -1, '是否', 5, NULL, 0), (19, '000000', 18, 'yes_no', 1, '否', 1, NULL, 0), (20, '000000', 18, 'yes_no', 2, '是', 2, NULL, 0); +INSERT INTO `blade_dict` VALUES (1, 0, 'sex', -1, '性别', 1, NULL, 0), (2, 1, 'sex', 1, '男', 1, NULL, 0), (3, 1, 'sex', 2, '女', 2, NULL, 0), (4, 0, 'notice', -1, '通知类型', 2, NULL, 0), (5, 4, 'notice', 1, '发布通知', 1, NULL, 0), (6, 4, 'notice', 2, '批转通知', 2, NULL, 0), (7, 4, 'notice', 3, '转发通知', 3, NULL, 0), (8, 4, 'notice', 4, '指示通知', 4, NULL, 0), (9, 4, 'notice', 5, '任免通知', 5, NULL, 0), (10, 4, 'notice', 6, '事务通知', 6, NULL, 0), (11, 0, 'menu_category', -1, '菜单类型', 3, NULL, 0), (12, 11, 'menu_category', 1, '菜单', 1, NULL, 0), (13, 11, 'menu_category', 2, '按钮', 2, NULL, 0), (14, 0, 'button_func', -1, '按钮功能', 4, NULL, 0), (15, 14, 'button_func', 1, '工具栏', 1, NULL, 0), (16, 14, 'button_func', 2, '操作栏', 2, NULL, 0), (17, 14, 'button_func', 3, '工具操作栏', 3, NULL, 0), (18, 0, 'yes_no', -1, '是否', 5, NULL, 0), (19, 18, 'yes_no', 1, '否', 1, NULL, 0), (20, 18, 'yes_no', 2, '是', 2, NULL, 0); COMMIT; -- ---------------------------- @@ -192,7 +191,6 @@ CREATE TABLE `blade_log_usual` ( DROP TABLE IF EXISTS `blade_menu`; CREATE TABLE `blade_menu` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `parent_id` int(11) NULL DEFAULT 0 COMMENT '父级菜单', `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单编号', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单名称', @@ -206,13 +204,13 @@ CREATE TABLE `blade_menu` ( `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 56 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; +) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; -- ---------------------------- -- Records of blade_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_menu` VALUES (1, '000000', 0, 'desk', '工作台', 'menu', '/desk', 'iconfont iconicon_airplay', 1, 1, 0, 1, NULL, 0), (2, '000000', 1, 'notice', '通知公告', 'menu', '/desk/notice', 'iconfont iconicon_sms', 1, 1, 0, 1, NULL, 0), (3, '000000', 0, 'system', '系统管理', 'menu', '/system', 'iconfont iconicon_setting', 2, 1, 0, 1, NULL, 0), (4, '000000', 3, 'user', '用户管理', 'menu', '/system/user', 'iconfont iconicon_principal', 1, 1, 0, 1, NULL, 0), (5, '000000', 3, 'dept', '部门管理', 'menu', '/system/dept', 'iconfont iconicon_group', 2, 1, 0, 1, NULL, 0), (6, '000000', 3, 'dict', '字典管理', 'menu', '/system/dict', 'iconfont iconicon_addresslist', 3, 1, 0, 1, NULL, 0), (7, '000000', 3, 'menu', '菜单管理', 'menu', '/system/menu', 'iconfont iconicon_subordinate', 4, 1, 0, 1, NULL, 0), (8, '000000', 3, 'role', '角色管理', 'menu', '/system/role', 'iconfont iconicon_boss', 5, 1, 0, 1, NULL, 0), (9, '000000', 3, 'param', '参数管理', 'menu', '/system/param', 'iconfont iconicon_community_line', 6, 1, 0, 1, NULL, 0), (10, '000000', 0, 'monitor', '系统监控', 'menu', '/monitor', 'iconfont icon-yanzhengma', 3, 1, 0, 1, NULL, 0), (11, '000000', 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', 'iconfont iconicon_study', 1, 1, 0, 2, NULL, 0), (12, '000000', 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', 'iconfont icon-canshu', 2, 1, 0, 2, NULL, 0), (13, '000000', 10, 'log', '日志管理', 'menu', '/monitor/log', 'iconfont iconicon_doc', 3, 1, 0, 1, NULL, 0), (14, '000000', 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, '000000', 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, '000000', 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, '000000', 0, 'tool', '研发工具', 'menu', '/tool', 'iconfont icon-wxbgongju', 4, 1, 0, 1, NULL, 0), (18, '000000', 17, 'code', '代码生成', 'menu', '/tool/code', 'iconfont iconicon_savememo', 1, 1, 0, 1, NULL, 0), (19, '000000', 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, '000000', 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, '000000', 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, '000000', 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, '000000', 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, '000000', 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, '000000', 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, '000000', 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, '000000', 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, '000000', 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, '000000', 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, '000000', 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, '000000', 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, '000000', 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, '000000', 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, '000000', 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, '000000', 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, '000000', 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, '000000', 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, '000000', 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, '000000', 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, '000000', 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, '000000', 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, '000000', 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, '000000', 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, '000000', 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, '000000', 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, '000000', 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, '000000', 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, '000000', 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, '000000', 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, '000000', 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, '000000', 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, '000000', 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, '000000', 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, '000000', 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, '000000', 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, '000000', 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, '000000', 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, '000000', 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, '000000', 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, '000000', 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0); +INSERT INTO `blade_menu` VALUES (1, 0, 'desk', '工作台', 'menu', '/desk', 'iconfont iconicon_airplay', 1, 1, 0, 1, NULL, 0), (2, 1, 'notice', '通知公告', 'menu', '/desk/notice', 'iconfont iconicon_sms', 1, 1, 0, 1, NULL, 0), (3, 0, 'system', '系统管理', 'menu', '/system', 'iconfont iconicon_setting', 2, 1, 0, 1, NULL, 0), (4, 3, 'user', '用户管理', 'menu', '/system/user', 'iconfont iconicon_principal', 1, 1, 0, 1, NULL, 0), (5, 3, 'dept', '部门管理', 'menu', '/system/dept', 'iconfont iconicon_group', 2, 1, 0, 1, NULL, 0), (6, 3, 'dict', '字典管理', 'menu', '/system/dict', 'iconfont iconicon_addresslist', 3, 1, 0, 1, NULL, 0), (7, 3, 'menu', '菜单管理', 'menu', '/system/menu', 'iconfont iconicon_subordinate', 4, 1, 0, 1, NULL, 0), (8, 3, 'role', '角色管理', 'menu', '/system/role', 'iconfont iconicon_boss', 5, 1, 0, 1, NULL, 0), (9, 3, 'param', '参数管理', 'menu', '/system/param', 'iconfont iconicon_community_line', 6, 1, 0, 1, NULL, 0), (10, 0, 'monitor', '系统监控', 'menu', '/monitor', 'iconfont icon-yanzhengma', 3, 1, 0, 1, NULL, 0), (11, 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', 'iconfont iconicon_study', 1, 1, 0, 2, NULL, 0), (12, 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', 'iconfont icon-canshu', 2, 1, 0, 2, NULL, 0), (13, 10, 'log', '日志管理', 'menu', '/monitor/log', 'iconfont iconicon_doc', 3, 1, 0, 1, NULL, 0), (14, 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, 0, 'tool', '研发工具', 'menu', '/tool', 'iconfont icon-wxbgongju', 4, 1, 0, 1, NULL, 0), (18, 17, 'code', '代码生成', 'menu', '/tool/code', 'iconfont iconicon_savememo', 1, 1, 0, 1, NULL, 0), (19, 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0); COMMIT; -- ---------------------------- @@ -248,7 +246,6 @@ COMMIT; DROP TABLE IF EXISTS `blade_param`; CREATE TABLE `blade_param` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `param_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名', `param_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数键', `param_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数值', @@ -266,7 +263,7 @@ CREATE TABLE `blade_param` ( -- Records of blade_param -- ---------------------------- BEGIN; -INSERT INTO `blade_param` VALUES (1, '000000', '是否开启注册功能', 'account.registerUser', 'true', '开启注册', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0), (2, '000000', '账号初始密码', 'account.initPassword', '123456', '初始密码', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0); +INSERT INTO `blade_param` VALUES (1, '是否开启注册功能', 'account.registerUser', 'true', '开启注册', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0), (2, '账号初始密码', 'account.initPassword', '123456', '初始密码', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0); COMMIT; -- ---------------------------- @@ -288,7 +285,7 @@ CREATE TABLE `blade_role` ( -- Records of blade_role -- ---------------------------- BEGIN; -INSERT INTO `blade_role` VALUES (1, '000000', 0, '超级管理员', 1, 'admin', 0); +INSERT INTO `blade_role` VALUES (1, '000000', 0, '超级管理员', 1, 'administrator', 0); COMMIT; -- ---------------------------- @@ -297,17 +294,16 @@ COMMIT; DROP TABLE IF EXISTS `blade_role_menu`; CREATE TABLE `blade_role_menu` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `menu_id` int(11) NULL DEFAULT NULL COMMENT '菜单id', `role_id` int(11) NULL DEFAULT NULL COMMENT '角色id', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; +) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; -- ---------------------------- -- Records of blade_role_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_role_menu` VALUES (1, '000000', 1, 1), (2, '000000', 2, 1), (3, '000000', 3, 1), (4, '000000', 4, 1), (5, '000000', 5, 1), (6, '000000', 6, 1), (7, '000000', 7, 1), (8, '000000', 8, 1), (9, '000000', 9, 1), (10, '000000', 10, 1), (11, '000000', 11, 1), (12, '000000', 12, 1), (13, '000000', 13, 1), (14, '000000', 14, 1), (15, '000000', 15, 1), (16, '000000', 16, 1), (17, '000000', 17, 1), (18, '000000', 18, 1), (19, '000000', 19, 1), (20, '000000', 20, 1), (21, '000000', 21, 1), (22, '000000', 22, 1), (23, '000000', 23, 1), (24, '000000', 24, 1), (25, '000000', 25, 1), (26, '000000', 26, 1), (27, '000000', 27, 1), (28, '000000', 28, 1), (29, '000000', 29, 1), (30, '000000', 30, 1), (31, '000000', 31, 1), (32, '000000', 32, 1), (33, '000000', 33, 1), (34, '000000', 34, 1), (35, '000000', 35, 1), (36, '000000', 36, 1), (37, '000000', 37, 1), (38, '000000', 38, 1), (39, '000000', 39, 1), (40, '000000', 40, 1), (41, '000000', 41, 1), (42, '000000', 42, 1), (43, '000000', 43, 1), (44, '000000', 44, 1), (45, '000000', 45, 1), (46, '000000', 46, 1), (47, '000000', 47, 1), (48, '000000', 48, 1), (49, '000000', 49, 1), (50, '000000', 50, 1), (51, '000000', 51, 1), (52, '000000', 52, 1), (53, '000000', 53, 1), (54, '000000', 54, 1), (55, '000000', 55, 1), (56, '000000', 56, 1), (57, '000000', 57, 1), (58, '000000', 58, 1), (59, '000000', 59, 1), (60, '000000', 60, 1); +INSERT INTO `blade_role_menu` VALUES (1, 1, 1), (2, 2, 1), (3, 3, 1), (4, 4, 1), (5, 5, 1), (6, 6, 1), (7, 7, 1), (8, 8, 1), (9, 9, 1), (10, 10, 1), (11, 11, 1), (12, 12, 1), (13, 13, 1), (14, 14, 1), (15, 15, 1), (16, 16, 1), (17, 17, 1), (18, 18, 1), (19, 19, 1), (20, 20, 1), (21, 21, 1), (22, 22, 1), (23, 23, 1), (24, 24, 1), (25, 25, 1), (26, 26, 1), (27, 27, 1), (28, 28, 1), (29, 29, 1), (30, 30, 1), (31, 31, 1), (32, 32, 1), (33, 33, 1), (34, 34, 1), (35, 35, 1), (36, 36, 1), (37, 37, 1), (38, 38, 1), (39, 39, 1), (40, 40, 1), (41, 41, 1), (42, 42, 1), (43, 43, 1), (44, 44, 1), (45, 45, 1), (46, 46, 1), (47, 47, 1), (48, 48, 1), (49, 49, 1), (50, 50, 1), (51, 51, 1), (52, 52, 1), (53, 53, 1), (54, 54, 1), (55, 55, 1), (56, 56, 1), (57, 57, 1), (58, 58, 1), (59, 59, 1), (60, 60, 1); COMMIT; -- ---------------------------- diff --git a/doc/sql/bladex-sword-mysql.sql b/doc/sql/bladex-sword-mysql.sql index f9748e12..50ce6cbd 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: 04/03/2019 19:04:56 + Date: 07/03/2019 14:47:13 */ SET NAMES utf8mb4; @@ -71,7 +71,6 @@ COMMIT; DROP TABLE IF EXISTS `blade_dict`; CREATE TABLE `blade_dict` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `parent_id` int(11) NULL DEFAULT 0 COMMENT '父主键', `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典码', `dict_key` int(2) NULL DEFAULT NULL COMMENT '字典值', @@ -86,7 +85,7 @@ CREATE TABLE `blade_dict` ( -- Records of blade_dict -- ---------------------------- BEGIN; -INSERT INTO `blade_dict` VALUES (1, '000000', 0, 'sex', -1, '性别', 1, NULL, 0), (2, '000000', 1, 'sex', 1, '男', 1, NULL, 0), (3, '000000', 1, 'sex', 2, '女', 2, NULL, 0), (4, '000000', 0, 'notice', -1, '通知类型', 2, NULL, 0), (5, '000000', 4, 'notice', 1, '发布通知', 1, NULL, 0), (6, '000000', 4, 'notice', 2, '批转通知', 2, NULL, 0), (7, '000000', 4, 'notice', 3, '转发通知', 3, NULL, 0), (8, '000000', 4, 'notice', 4, '指示通知', 4, NULL, 0), (9, '000000', 4, 'notice', 5, '任免通知', 5, NULL, 0), (10, '000000', 4, 'notice', 6, '事务通知', 6, NULL, 0), (11, '000000', 0, 'menu_category', -1, '菜单类型', 3, NULL, 0), (12, '000000', 11, 'menu_category', 1, '菜单', 1, NULL, 0), (13, '000000', 11, 'menu_category', 2, '按钮', 2, NULL, 0), (14, '000000', 0, 'button_func', -1, '按钮功能', 4, NULL, 0), (15, '000000', 14, 'button_func', 1, '工具栏', 1, NULL, 0), (16, '000000', 14, 'button_func', 2, '操作栏', 2, NULL, 0), (17, '000000', 14, 'button_func', 3, '工具操作栏', 3, NULL, 0), (18, '000000', 0, 'yes_no', -1, '是否', 5, NULL, 0), (19, '000000', 18, 'yes_no', 1, '否', 1, NULL, 0), (20, '000000', 18, 'yes_no', 2, '是', 2, NULL, 0); +INSERT INTO `blade_dict` VALUES (1, 0, 'sex', -1, '性别', 1, NULL, 0), (2, 1, 'sex', 1, '男', 1, NULL, 0), (3, 1, 'sex', 2, '女', 2, NULL, 0), (4, 0, 'notice', -1, '通知类型', 2, NULL, 0), (5, 4, 'notice', 1, '发布通知', 1, NULL, 0), (6, 4, 'notice', 2, '批转通知', 2, NULL, 0), (7, 4, 'notice', 3, '转发通知', 3, NULL, 0), (8, 4, 'notice', 4, '指示通知', 4, NULL, 0), (9, 4, 'notice', 5, '任免通知', 5, NULL, 0), (10, 4, 'notice', 6, '事务通知', 6, NULL, 0), (11, 0, 'menu_category', -1, '菜单类型', 3, NULL, 0), (12, 11, 'menu_category', 1, '菜单', 1, NULL, 0), (13, 11, 'menu_category', 2, '按钮', 2, NULL, 0), (14, 0, 'button_func', -1, '按钮功能', 4, NULL, 0), (15, 14, 'button_func', 1, '工具栏', 1, NULL, 0), (16, 14, 'button_func', 2, '操作栏', 2, NULL, 0), (17, 14, 'button_func', 3, '工具操作栏', 3, NULL, 0), (18, 0, 'yes_no', -1, '是否', 5, NULL, 0), (19, 18, 'yes_no', 1, '否', 1, NULL, 0), (20, 18, 'yes_no', 2, '是', 2, NULL, 0); COMMIT; -- ---------------------------- @@ -192,7 +191,6 @@ CREATE TABLE `blade_log_usual` ( DROP TABLE IF EXISTS `blade_menu`; CREATE TABLE `blade_menu` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `parent_id` int(11) NULL DEFAULT 0 COMMENT '父级菜单', `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单编号', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单名称', @@ -212,7 +210,7 @@ CREATE TABLE `blade_menu` ( -- Records of blade_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_menu` VALUES (1, '000000', 0, 'desk', '工作台', 'menu', '/desk', 'desktop', 1, 1, 0, 1, NULL, 0), (2, '000000', 1, 'notice', '通知公告', 'menu', '/desk/notice', NULL, 1, 1, 0, 1, NULL, 0), (3, '000000', 0, 'system', '系统管理', 'menu', '/system', 'setting', 2, 1, 0, 1, NULL, 0), (4, '000000', 3, 'user', '用户管理', 'menu', '/system/user', NULL, 1, 1, 0, 1, NULL, 0), (5, '000000', 3, 'dept', '部门管理', 'menu', '/system/dept', NULL, 2, 1, 0, 1, NULL, 0), (6, '000000', 3, 'dict', '字典管理', 'menu', '/system/dict', NULL, 3, 1, 0, 1, NULL, 0), (7, '000000', 3, 'menu', '菜单管理', 'menu', '/system/menu', NULL, 4, 1, 0, 1, NULL, 0), (8, '000000', 3, 'role', '角色管理', 'menu', '/system/role', NULL, 5, 1, 0, 1, NULL, 0), (9, '000000', 3, 'param', '参数管理', 'menu', '/system/param', NULL, 6, 1, 0, 1, NULL, 0), (10, '000000', 0, 'monitor', '系统监控', 'menu', '/monitor', 'fund', 3, 1, 0, 1, NULL, 0), (11, '000000', 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', NULL, 1, 1, 0, 2, NULL, 0), (12, '000000', 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, 2, 1, 0, 2, NULL, 0), (13, '000000', 10, 'log', '日志管理', 'menu', '/monitor/log', NULL, 3, 1, 0, 1, NULL, 0), (14, '000000', 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, '000000', 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, '000000', 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, '000000', 0, 'tool', '研发工具', 'menu', '/tool', 'tool', 4, 1, 0, 1, NULL, 0), (18, '000000', 17, 'code', '代码生成', 'menu', '/tool/code', NULL, 1, 1, 0, 1, NULL, 0), (19, '000000', 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, '000000', 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, '000000', 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, '000000', 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, '000000', 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, '000000', 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, '000000', 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, '000000', 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, '000000', 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, '000000', 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, '000000', 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, '000000', 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, '000000', 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, '000000', 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, '000000', 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, '000000', 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, '000000', 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, '000000', 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, '000000', 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, '000000', 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, '000000', 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, '000000', 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, '000000', 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, '000000', 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, '000000', 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, '000000', 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, '000000', 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, '000000', 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, '000000', 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, '000000', 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, '000000', 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, '000000', 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, '000000', 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, '000000', 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, '000000', 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, '000000', 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, '000000', 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, '000000', 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, '000000', 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, '000000', 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, '000000', 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, '000000', 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0); +INSERT INTO `blade_menu` VALUES (1, 0, 'desk', '工作台', 'menu', '/desk', 'desktop', 1, 1, 0, 1, NULL, 0), (2, 1, 'notice', '通知公告', 'menu', '/desk/notice', NULL, 1, 1, 0, 1, NULL, 0), (3, 0, 'system', '系统管理', 'menu', '/system', 'setting', 2, 1, 0, 1, NULL, 0), (4, 3, 'user', '用户管理', 'menu', '/system/user', NULL, 1, 1, 0, 1, NULL, 0), (5, 3, 'dept', '部门管理', 'menu', '/system/dept', NULL, 2, 1, 0, 1, NULL, 0), (6, 3, 'dict', '字典管理', 'menu', '/system/dict', NULL, 3, 1, 0, 1, NULL, 0), (7, 3, 'menu', '菜单管理', 'menu', '/system/menu', NULL, 4, 1, 0, 1, NULL, 0), (8, 3, 'role', '角色管理', 'menu', '/system/role', NULL, 5, 1, 0, 1, NULL, 0), (9, 3, 'param', '参数管理', 'menu', '/system/param', NULL, 6, 1, 0, 1, NULL, 0), (10, 0, 'monitor', '系统监控', 'menu', '/monitor', 'fund', 3, 1, 0, 1, NULL, 0), (11, 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', NULL, 1, 1, 0, 2, NULL, 0), (12, 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, 2, 1, 0, 2, NULL, 0), (13, 10, 'log', '日志管理', 'menu', '/monitor/log', NULL, 3, 1, 0, 1, NULL, 0), (14, 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, 0, 'tool', '研发工具', 'menu', '/tool', 'tool', 4, 1, 0, 1, NULL, 0), (18, 17, 'code', '代码生成', 'menu', '/tool/code', NULL, 1, 1, 0, 1, NULL, 0), (19, 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0); COMMIT; -- ---------------------------- @@ -248,7 +246,6 @@ COMMIT; DROP TABLE IF EXISTS `blade_param`; CREATE TABLE `blade_param` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `param_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名', `param_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数键', `param_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数值', @@ -266,7 +263,7 @@ CREATE TABLE `blade_param` ( -- Records of blade_param -- ---------------------------- BEGIN; -INSERT INTO `blade_param` VALUES (1, '000000', '是否开启注册功能', 'account.registerUser', 'true', '开启注册', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0), (2, '000000', '账号初始密码', 'account.initPassword', '123456', '初始密码', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0); +INSERT INTO `blade_param` VALUES (1, '是否开启注册功能', 'account.registerUser', 'true', '开启注册', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0), (2, '账号初始密码', 'account.initPassword', '123456', '初始密码', 1, '2018-12-28 12:19:01', 1, '2018-12-28 12:19:01', 1, 0); COMMIT; -- ---------------------------- @@ -288,7 +285,7 @@ CREATE TABLE `blade_role` ( -- Records of blade_role -- ---------------------------- BEGIN; -INSERT INTO `blade_role` VALUES (1, '000000', 0, '超级管理员', 1, 'admin', 0); +INSERT INTO `blade_role` VALUES (1, '000000', 0, '超级管理员', 1, 'administrator', 0); COMMIT; -- ---------------------------- @@ -297,17 +294,16 @@ COMMIT; DROP TABLE IF EXISTS `blade_role_menu`; CREATE TABLE `blade_role_menu` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号', `menu_id` int(11) NULL DEFAULT NULL COMMENT '菜单id', `role_id` int(11) NULL DEFAULT NULL COMMENT '角色id', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; +) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; -- ---------------------------- -- Records of blade_role_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_role_menu` VALUES (1, '000000', 1, 1), (2, '000000', 2, 1), (3, '000000', 3, 1), (4, '000000', 4, 1), (5, '000000', 5, 1), (6, '000000', 6, 1), (7, '000000', 7, 1), (8, '000000', 8, 1), (9, '000000', 9, 1), (10, '000000', 10, 1), (11, '000000', 11, 1), (12, '000000', 12, 1), (13, '000000', 13, 1), (14, '000000', 14, 1), (15, '000000', 15, 1), (16, '000000', 16, 1), (17, '000000', 17, 1), (18, '000000', 18, 1), (19, '000000', 19, 1), (20, '000000', 20, 1), (21, '000000', 21, 1), (22, '000000', 22, 1), (23, '000000', 23, 1), (24, '000000', 24, 1), (25, '000000', 25, 1), (26, '000000', 26, 1), (27, '000000', 27, 1), (28, '000000', 28, 1), (29, '000000', 29, 1), (30, '000000', 30, 1), (31, '000000', 31, 1), (32, '000000', 32, 1), (33, '000000', 33, 1), (34, '000000', 34, 1), (35, '000000', 35, 1), (36, '000000', 36, 1), (37, '000000', 37, 1), (38, '000000', 38, 1), (39, '000000', 39, 1), (40, '000000', 40, 1), (41, '000000', 41, 1), (42, '000000', 42, 1), (43, '000000', 43, 1), (44, '000000', 44, 1), (45, '000000', 45, 1), (46, '000000', 46, 1), (47, '000000', 47, 1), (48, '000000', 48, 1), (49, '000000', 49, 1), (50, '000000', 50, 1), (51, '000000', 51, 1), (52, '000000', 52, 1), (53, '000000', 53, 1), (54, '000000', 54, 1), (55, '000000', 55, 1), (56, '000000', 56, 1), (57, '000000', 57, 1), (58, '000000', 58, 1), (59, '000000', 59, 1), (60, '000000', 60, 1); +INSERT INTO `blade_role_menu` VALUES (1, 1, 1), (2, 2, 1), (3, 3, 1), (4, 4, 1), (5, 5, 1), (6, 6, 1), (7, 7, 1), (8, 8, 1), (9, 9, 1), (10, 10, 1), (11, 11, 1), (12, 12, 1), (13, 13, 1), (14, 14, 1), (15, 15, 1), (16, 16, 1), (17, 17, 1), (18, 18, 1), (19, 19, 1), (20, 20, 1), (21, 21, 1), (22, 22, 1), (23, 23, 1), (24, 24, 1), (25, 25, 1), (26, 26, 1), (27, 27, 1), (28, 28, 1), (29, 29, 1), (30, 30, 1), (31, 31, 1), (32, 32, 1), (33, 33, 1), (34, 34, 1), (35, 35, 1), (36, 36, 1), (37, 37, 1), (38, 38, 1), (39, 39, 1), (40, 40, 1), (41, 41, 1), (42, 42, 1), (43, 43, 1), (44, 44, 1), (45, 45, 1), (46, 46, 1), (47, 47, 1), (48, 48, 1), (49, 49, 1), (50, 50, 1), (51, 51, 1), (52, 52, 1), (53, 53, 1), (54, 54, 1), (55, 55, 1), (56, 56, 1), (57, 57, 1), (58, 58, 1), (59, 59, 1), (60, 60, 1); COMMIT; -- ---------------------------- diff --git a/doc/sql/bladex-tenant-mysql-update-RC5.sql b/doc/sql/bladex-tenant-mysql-update-RC5.sql index b96988f5..50aecde7 100644 --- a/doc/sql/bladex-tenant-mysql-update-RC5.sql +++ b/doc/sql/bladex-tenant-mysql-update-RC5.sql @@ -5,16 +5,8 @@ ALTER TABLE `bladex`.`blade_notice` ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; ALTER TABLE `bladex`.`blade_dept` ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; -ALTER TABLE `bladex`.`blade_dict` - ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; -ALTER TABLE `bladex`.`blade_menu` - ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; ALTER TABLE `bladex`.`blade_role` ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; -ALTER TABLE `bladex`.`blade_role_menu` - ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; -ALTER TABLE `bladex`.`blade_param` - ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; ALTER TABLE `bladex`.`blade_user` ADD COLUMN `tenant_code` varchar(12) NULL DEFAULT '000000' COMMENT '租户编号' AFTER `id`; ALTER TABLE `bladex`.`blade_log_api` diff --git a/pom.xml b/pom.xml index 14a1f085..6d0ec9f9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade BladeX - 2.0.0.RC5 + 2.0.0.RC6 pom - 2.0.0.RC5 - 2.0.0.RC5 + 2.0.0.RC6 + 2.0.0.RC6 1.8 2.9.2 diff --git a/script/docker/.env b/script/docker/.env index bf1f3648..773672a1 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.186.129/blade -TAG=2.0.0.RC5 +TAG=2.0.0.RC6