Skip to content

Commit 811fd27

Browse files
wu-clanwu-clan
authored
Update SQL files and use them as execution targets (#188)
1 parent 9a17c3b commit 811fd27

File tree

7 files changed

+31
-226
lines changed

7 files changed

+31
-226
lines changed

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ Execute tests via pytest
128128
cd backend/app/
129129
```
130130

131-
3. Initialize the test data using the `backend/sql/init_test_data.sql` file
132-
4. Execute the test command
131+
3. Using `backend/sql/create_tables.sql` file to create database tables
132+
4. Initialize the test data using the `backend/sql/init_test_data.sql` file
133+
5. Execute the test command
133134

134135
```shell
135136
pytest -vs --disable-warnings

‎README.zh-CN.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@
126126
cd backend/app/
127127
```
128128

129-
3. 使用 `backend/sql/init_test_data.sql` 文件初始化测试数据
130-
4. 执行测试命令
129+
3. 使用 `backend/sql/create_tables.sql` 文件创建数据库表
130+
4. 使用 `backend/sql/init_test_data.sql` 文件初始化测试数据
131+
5. 执行测试命令
131132

132133
```shell
133134
pytest -vs --disable-warnings

‎backend/app/init_test_data.py

Lines changed: 0 additions & 174 deletions
This file was deleted.

‎backend/app/schemas/role.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
class RoleBase(SchemaBase):
1313
name: str
14-
data_scope: RoleDataScopeType = Field(
15-
default=RoleDataScopeType.custom, description='权限范围（1：全部数据权限 2：自定义数据权限）'
16-
)
14+
data_scope: RoleDataScopeType = Field(default=RoleDataScopeType.custom, description='权限范围（1：全部数据权限 2：自定义数据权限）')
1715
status: StatusType = Field(default=StatusType.enable)
1816
remark: str | None = None
1917

‎backend/app/tests/init_test_data.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎backend/sql/create_tables.sql

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ CREATE TABLE sys_dept
4949
created_time DATETIME NOT NULL COMMENT '创建时间',
5050
updated_time DATETIME COMMENT '更新时间',
5151
PRIMARY KEY (id),
52-
FOREIGN KEY (parent_id) REFERENCES sys_dept (id) ON DELETE SET NULL,
53-
UNIQUE (name)
52+
FOREIGN KEY (parent_id) REFERENCES sys_dept (id) ON DELETE SET NULL
5453
);
5554

5655
CREATE INDEX ix_sys_dept_id ON sys_dept (id);
@@ -98,8 +97,8 @@ CREATE INDEX ix_sys_login_log_id ON sys_login_log (id);
9897
CREATE TABLE sys_menu
9998
(
10099
id INTEGER NOT NULL AUTO_INCREMENT,
100+
title VARCHAR(50) NOT NULL COMMENT '菜单标题',
101101
name VARCHAR(50) NOT NULL COMMENT '菜单名称',
102-
title varchar(50) not null comment '菜单标题',
103102
level INTEGER NOT NULL COMMENT '菜单层级',
104103
sort INTEGER NOT NULL COMMENT '排序',
105104
icon VARCHAR(100) COMMENT '菜单图标',
@@ -108,15 +107,15 @@ CREATE TABLE sys_menu
108107
component VARCHAR(255) COMMENT '组件路径',
109108
perms VARCHAR(100) COMMENT '权限标识',
110109
status INTEGER NOT NULL COMMENT '菜单状态（0停用 1正常）',
111-
`show` INTEGER NOT NULL comment '是否显示（0否 1是）',
112-
cache INTEGER NOT NULL comment '是否缓存（0否 1是）',
110+
`show` INTEGER NOT NULL COMMENT '是否显示（0否 1是）',
111+
cache INTEGER NOT NULL COMMENT '是否缓存（0否 1是）',
113112
remark LONGTEXT COMMENT '备注',
114113
parent_id INTEGER COMMENT '父菜单ID',
115114
created_time DATETIME NOT NULL COMMENT '创建时间',
116115
updated_time DATETIME COMMENT '更新时间',
117116
PRIMARY KEY (id),
118117
FOREIGN KEY (parent_id) REFERENCES sys_menu (id) ON DELETE SET NULL,
119-
UNIQUE (name)
118+
UNIQUE (title)
120119
);
121120

122121
CREATE INDEX ix_sys_menu_id ON sys_menu (id);
@@ -154,7 +153,7 @@ CREATE TABLE sys_role
154153
(
155154
id INTEGER NOT NULL AUTO_INCREMENT,
156155
name VARCHAR(20) NOT NULL COMMENT '角色名称',
157-
data_scope INTEGER COMMENT '数据范围（1：全部数据权限 2：自定数据权限）',
156+
data_scope INTEGER COMMENT '权限范围（1：全部数据权限 2：自定义数据权限）',
158157
status INTEGER NOT NULL COMMENT '角色状态（0停用 1正常）',
159158
remark LONGTEXT COMMENT '备注',
160159
created_time DATETIME NOT NULL COMMENT '创建时间',

‎backend/sql/init_test_data.sql

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
INSERT INTO fba.sys_dept (id, name, level, sort, leader, phone, email, status, del_flag, parent_id, created_time, updated_time)
22
VALUES (1, 'test', 0, 0, null, null, null, 1, 0, null, '2023-06-26 17:13:45', null);
33

4-
INSERT INTO fba.sys_menu (id, name, level, sort, icon, path, menu_type, component, perms, status, remark, parent_id, created_time, updated_time, show, cache, title)
5-
values (1, 'test', 0, 0, null, null, 0, null, null, 1, null, null, '2023-06-26 17:13:45', null, 0, 1, '测试'),
6-
(2, 'dashboard', 0, 0, 'icon-dashboard', '/dashboard', 0, '/dashboard/workplace/index.vue', null, 1, null, null, '2023-06-30 10:10:34', null, 1, 1, '仪表盘'),
7-
(3, 'Workplace', 0, 0, null, '/workplace', 1, null, null, 1, null, 2, '2023-06-30 10:11:40', null, 1, 1, '工作台'),
8-
(4, 'arcoWebsite', 0, 888, 'icon-link', 'https://arco.design', 0, null, null, 1, null, null, '2023-06-30 10:13:04', '2023-07-07 20:05:20', 1, 1, 'arco官网'),
9-
(5, 'log', 0, 66, 'icon-bug', '/log', 0, null, null, 1, '这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；这是系统日志记录；', null, '2023-06-30 10:13:54', '2023-07-07 20:04:42', 1, 1, '日志'),
10-
(6, 'Login', 0, 0, null, '/login', 1, '/log/login/index.vue', null, 1, null, 5, '2023-06-30 10:14:23', null, 1, 1, '登录日志'),
11-
(7, 'faq', 0, 999, 'icon-question-circle', 'https://arco.design/vue/docs/pro/faq', 0, null, null, 1, null, null, '2023-06-30 10:14:56', '2023-07-07 20:05:10', 1, 1, '常见问题'),
12-
(8, 'admin', 0, 6, 'icon-settings', '/admin', 0, '', null, 1, null, null, '2023-07-04 10:52:48', '2023-07-07 20:06:02', 1, 1, '系统管理'),
13-
(9, 'SysMenu', 0, 2, '', '/sys-menu', 1, '/admin/menu/index.vue', null, 1, '系统后台菜单管理，玛卡巴卡?', 8, '2023-07-04 10:55:02', '2023-07-08 22:43:53', 1, 1, '菜单管理'),
14-
(10, 'test', 0, 100, null, null, 0, null, null, 1, null, null, '2023-07-07 20:23:57', '2023-07-07 20:04:53', 0, 1, '测试2'),
15-
(11, 'test', 0, 0, null, null, 1, null, null, 1, null, 10, '2023-07-07 20:20:55', null, 1, 1, '测试3'),
16-
(12, '', 0, 0, null, null, 2, null, null, 1, null, 11, '2023-07-07 20:42:31', null 1, 1, '测试4'),
17-
(13, '', 0, 0, null, null, 2, null, null, 1, null, 11, '2023-07-07 20:42:52', null 1, 1, '测试5'),
18-
(14, '', 0, 0, null, null, 2, null, null, 1, null, 11, '2023-07-07 20:16:27', null, 1, 1, '测试6'),
19-
(15, 'Opera', 0, 0, null, '/opera', 1, '/log/opera/index.vue', null, 1, null, 5, '2023-07-07 20:28:21', null, 1, 1, '操作日志'),
20-
(16, 'SysDept', 0, 0, null, 'sys-dept', 1, '/admin/dept/index.vue', null, 1, null, 8, '2023-07-08 22:43:20', null, 1, 1, '部门管理');
21-
(17, 'SysApi', 0, 1, null, 'sys-api', 1, '/admin/api/index.vue', null, 1, null, 8, '2023-07-10 13:10:16', null, 1, 1, 'API管理');
22-
(18, 'monitor', 0, 88, 'icon-computer', null, 0, null, null, 1, null, null, '2023-07-11 20:20:20', null, 1, 1, '系统监控'),
23-
(19, 'Redis', 0, 0, null, null, 1, '/monitor/redis/index.vue', null, 1, null, 18, '2023-07-11 20:21:28', null, 1, 1, 'Redis监控'),
24-
(20, 'Server', 0, 0, null, 'server', 1, '/monitor/server/index.vue', null, 1, null, 18, '2023-07-11 20:23:43', null, 1, 1, '服务器监控');
25-
(21, 'SysUser', 0, 0, null, 'sys-user', 1, '/admin/user/index.vue', null, 1, null, 8, '2023-07-13 03:32:47', null, 1, 1, '用户管理');
4+
insert into fba.sys_menu (id, title, name, level, sort, icon, path, menu_type, component, perms, status, `show`, cache, remark, parent_id, created_time, updated_time)
5+
values (1, '测试', 'test', 0, 0, '', null, 0, null, null, 0, 0, 1, null, null, '2023-07-27 19:14:10', '2023-07-27 19:14:52'),
6+
(2, '仪表盘', 'dashboard', 0, 0, 'IconDashboard', 'dashboard', 1, '/dashboard/workplace/index.vue', null, 1, 1, 1, null, null, '2023-07-27 19:15:45', null),
7+
(3, '工作台', 'Workplace', 0, 0, null, 'workplace', 0, null, null, 1, 1, 1, null, null, '2023-07-27 19:17:59', null),
8+
(4, 'arco官网', 'arcoWebsite', 0, 888, 'IconLink', 'https://arco.design', 1, null, null, 1, 1, 1, null, null, '2023-07-27 19:19:23', null),
9+
(5, '日志', 'log', 0, 66, 'IconBug', 'log', 0, null, null, 1, 1, 1, null, null, '2023-07-27 19:19:59', null),
10+
(6, '登录日志', 'Login', 0, 0, null, 'login', 1, '/log/login/index.vue', null, 1, 1, 1, null, 5, '2023-07-27 19:20:56', null),
11+
(7, '操作日志', 'Opera', 0, 0, null, 'opera', 1, '/log/opera/index.vue', null, 1, 1, 1, null, 5, '2023-07-27 19:21:28', null),
12+
(8, '常见问题', 'faq', 0, 999, 'IconQuestion', 'https://arco.design/vue/docs/pro/faq', 1, null, null, 1, 1, 1, null, null, '2023-07-27 19:22:24', null),
13+
(9, '系统管理', 'admin', 0, 6, 'IconSettings', 'admin', 1, null, null, 1, 1, 1, null, null, '2023-07-27 19:23:00', null),
14+
(10, '部门管理', 'SysDept', 0, 0, null, 'sys-dept', 1, '/admin/dept/index.vue', null, 1, 1, 1, null, 9, '2023-07-27 19:23:42', null),
15+
(11, 'API管理', 'SysApi', 0, 1, null, 'sys-api', 1, '/admin/api/index.vue', null, 1, 1, 1, null, 9, '2023-07-27 19:24:12', null),
16+
(12, '用户管理', 'SysUser', 0, 0, null, 'sys-user', 1, '/admin/user/index.vue', null, 1, 1, 1, null, 9, '2023-07-27 19:25:13', null),
17+
(13, '角色管理', 'SysRole', 0, 2, null, 'sys-role', 1, '/admin/role/index.vue', null, 1, 1, 1, null, 9, '2023-07-27 19:25:45', null),
18+
(14, '菜单管理', 'SysMenu', 0, 2, null, 'sys-menu', 1, '/admin/menu/index.vue', null, 1, 1, 1, null, 9, '2023-07-27 19:45:29', null),
19+
(15, '系统监控', 'monitor', 0, 88, 'IconComputer', 'monitor', 0, null, null, 1, 1, 1, null, null, '2023-07-27 19:27:08', null),
20+
(16, 'Redis监控', 'Redis', 0, 0, null, 'redis', 1, '/monitor/redis/index.vue', null, 1, 1, 1, null, 14, '2023-07-27 19:28:03', null),
21+
(17, '服务器监控', 'Server', 0, 0, null, 'server', 1, '/monitor/server/index.vue', null, 1, 1, 1, null, 14, '2023-07-27 19:28:29', null);
2622

2723
INSERT INTO fba.sys_role (id, name, data_scope, status, remark, created_time, updated_time)
2824
VALUES (1, 'test', 2, 1, null, '2023-06-26 17:13:45', null);

0 commit comments

Comments
 (0)