diff --git a/README.md b/README.md index c3dcc498..5e9999c4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Downloads + Downloads Build Status Build Status Coverage Status @@ -17,7 +17,7 @@

## SpringBlade微服务开发平台 -* 采用前后端分离的模式，前端开源两个框架：[Sword](https://gitee.com/smallc/Sword) (基于 React、Ant Design)、[Saber](https://gitee.com/smallc/Saber) (基于 Vue、Element-UI) +* 采用前后端分离的模式，前端架构 [Saber](https://gitee.com/smallc/Saber) (基于 Vue3、Element-Plus) * 后端采用SpringCloud全家桶，并同时对其基础组件做了高度的封装，单独开源出一个框架：[BladeTool](https://gitee.com/smallc/blade-tool) * [BladeTool](https://github.com/chillzhuang/blade-tool)已推送至Maven中央库，直接引入即可，减少了工程的臃肿，也可更注重于业务开发 * 集成Sentinel从流量控制、熔断降级、系统负载等多个维度保护服务的稳定性。 @@ -37,12 +37,12 @@ |----------------------|------------| | Java | 17+ | | NodeJS | 18+ | -| Spring | 6.2.15 | -| Spring Boot | 3.5.9 | -| Spring Cloud | 2025.0.1 | +| Spring | 6.2.17 | +| Spring Boot | 3.5.13 | +| Spring Cloud | 2025.0.2 | | Spring Cloud Alibaba | 2025.0.0.0 | -| Nacos Alibaba | 3.1.1 | -| Mybatis Plus | 3.5.19 | +| Nacos Alibaba | 3.1.2 | +| Mybatis Plus | 3.5.14 | ## 工程结构 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index c06fa5b2..7a4b9f0a 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -73,7 +73,7 @@ knife4j: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 4.8.0 + version: 4.9.0 license: Powered By SpringBlade licenseUrl: https://bladex.cn terms-of-service-url: https://bladex.cn diff --git a/doc/sql/blade/blade.mysql.upgrade.4.7.0.to.4.8.0.sql b/doc/sql/blade/blade.mysql.upgrade.4.7.0.to.4.8.0.sql deleted file mode 100644 index 9eba2cd5..00000000 --- a/doc/sql/blade/blade.mysql.upgrade.4.7.0.to.4.8.0.sql +++ /dev/null @@ -1,47 +0,0 @@ --- ---------------------------- --- 角色权限表新增权限类型字段 --- ---------------------------- -ALTER TABLE `blade_role_scope` - ADD COLUMN `scope_category` int NULL COMMENT '权限类型(1:数据权限、2:接口权限)' AFTER `id`, - MODIFY COLUMN `scope_id` bigint NULL DEFAULT NULL COMMENT '权限id' AFTER `id`; - --- ---------------------------- --- 角色权限表设置历史数据权限类型为1 --- ---------------------------- -UPDATE `blade_role_scope` SET `scope_category` = 1 WHERE `scope_category` IS NULL; - --- ---------------------------- --- 创建接口权限表 --- ---------------------------- -CREATE TABLE `blade_scope_api` ( - `id` bigint NOT NULL COMMENT '主键', - `menu_id` bigint NULL DEFAULT NULL COMMENT '菜单主键', - `resource_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资源编号', - `scope_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '接口权限名', - `scope_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '接口权限地址', - `scope_type` int NULL DEFAULT NULL COMMENT '接口权限类型', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '接口权限备注', - `create_user` bigint NULL DEFAULT NULL COMMENT '创建人', - `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_user` bigint NULL DEFAULT NULL COMMENT '修改人', - `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间', - `status` int NULL DEFAULT 1 COMMENT '状态', - `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '接口权限表'; - --- ---------------------------- --- 字典表新增接口权限类型数据 --- ---------------------------- -INSERT INTO `blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675237, 0, 'api_scope_type', '-1', '接口权限', 10, NULL, 0); -INSERT INTO `blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675238, 1123598814738675237, 'api_scope_type', '1', '系统接口', 1, NULL, 0); -INSERT INTO `blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675239, 1123598814738675237, 'api_scope_type', '2', '业务接口', 2, NULL, 0); - --- ---------------------------- --- 菜单表新增接口权限菜单 --- ---------------------------- -INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (1123598815738675311, 1123598815738675307, 'api_scope', '接口权限', 'menu', '/authority/apiscope', 'iconfont iconicon_send', 3, 1, 0, 1, NULL, 0); -INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (1123598815738675312, 1123598815738675311, 'api_scope_setting', '权限配置', 'setting', NULL, 'setting', 1, 2, 2, 1, NULL, 0); -INSERT INTO `blade_role_menu` (`id`, `menu_id`, `role_id`) VALUES (2006703481530257413, 1123598815738675311, 1123598816738675201); -INSERT INTO `blade_role_menu` (`id`, `menu_id`, `role_id`) VALUES (2006703481530257414, 1123598815738675312, 1123598816738675201); diff --git a/pom.xml b/pom.xml index cec11ca2..d406e9a6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,9 +9,9 @@ pom - 4.8.0 + 4.9.0 - 4.8.0 + 4.9.0 17 3.11.0 diff --git a/script/docker/.env b/script/docker/.env index 07fa812c..3e39e0bb 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=4.8.0 +TAG=4.9.0 diff --git a/script/kuboard/kuboard_spring-blade.yaml b/script/kuboard/kuboard_spring-blade.yaml index 94ee7845..6bf8607b 100644 --- a/script/kuboard/kuboard_spring-blade.yaml +++ b/script/kuboard/kuboard_spring-blade.yaml @@ -152,7 +152,7 @@ spec: spec: containers: - name: blade-admin - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -386,7 +386,7 @@ spec: spec: containers: - name: blade-auth - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -625,7 +625,7 @@ spec: spec: containers: - name: blade-desk - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -864,7 +864,7 @@ spec: spec: containers: - name: blade-develop - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1096,7 +1096,7 @@ spec: spec: containers: - name: blade-gateway - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1331,7 +1331,7 @@ spec: spec: containers: - name: blade-log - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1565,7 +1565,7 @@ spec: spec: containers: - name: blade-report - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1799,7 +1799,7 @@ spec: spec: containers: - name: blade-resource - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -2033,7 +2033,7 @@ spec: spec: containers: - name: blade-system - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -2262,7 +2262,7 @@ spec: spec: containers: - name: saber-web - image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:4.9.0' ports: - name: web containerPort: 80 @@ -2487,7 +2487,7 @@ spec: spec: containers: - name: blade-swagger - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:4.9.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -3515,7 +3515,7 @@ spec: spec: containers: - name: mysql - image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v4.8.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v4.9.0' ports: - name: mysql containerPort: 3306