From 8299c4821f9b122b823fe9ee9f83ecf27bdfed1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Sun, 24 Jun 2018 16:43:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql.sql | 149 ++++++++++++++---------- src/main/resources/application-prod.yml | 36 ++++++ src/main/resources/application.yml | 2 +- 3 files changed, 122 insertions(+), 65 deletions(-) create mode 100644 src/main/resources/application-prod.yml diff --git a/sql.sql b/sql.sql index 4697546..f9cd2f3 100644 --- a/sql.sql +++ b/sql.sql @@ -1,71 +1,92 @@ -DROP DATABASE db_fileupload; -DROP DATABASE db_sysdemo1; -DROP DATABASE db_sysdemo2; -CREATE DATABASE db_fileupload DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +DROP DATABASE db_sysrbacdemo; +CREATE DATABASE db_sysrbacdemo DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +CREATE TABLE db_sysrbacdemo.sys_user ( + id varchar(128) NOT NULL COMMENT '主键', + usercode varchar(32) NOT NULL COMMENT '账号', + username varchar(64) NOT NULL COMMENT '姓名', + password varchar(32) NOT NULL COMMENT '密码', + locked INT(4) DEFAULT NULL COMMENT '账号是否锁定，1：锁定，0未锁定', + create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE current_timestamp COMMENT '更新时间', + PRIMARY KEY (id) +) COMMENT = '用户表' + ENGINE=InnoDB; -CREATE TABLE db_fileupload.file_info ( - file_id VARCHAR(32) NOT NULL PRIMARY KEY, - user_id VARCHAR(32), - create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP - COMMENT '创建时间', - file_name VARCHAR(255), - file_size VARCHAR(32), - file_path VARCHAR(128) -) - COMMENT = '文件表' - ENGINE = InnoDB; +CREATE TABLE db_sysrbacdemo.sys_role ( + id INT NOT NULL AUTO_INCREMENT, + name varchar(128) NOT NULL, + available INT(4) DEFAULT NULL COMMENT '是否可用,1：可用，0不可用', + PRIMARY KEY (id) +) COMMENT = '角色表' + ENGINE=InnoDB ; -CREATE DATABASE db_sysdemo1 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -CREATE TABLE db_sysdemo1.user_info ( - user_id VARCHAR(32) NOT NULL, - username VARCHAR(32) NOT NULL, - password VARCHAR(32) NOT NULL, - create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP - COMMENT '创建时间', - update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE current_timestamp - COMMENT '更新时间', - PRIMARY KEY (user_id) -) - COMMENT '系统A用户信息表'; +CREATE TABLE db_sysrbacdemo.sys_user_role ( + id INT NOT NULL AUTO_INCREMENT, + sys_user_id varchar(128) NOT NULL, + sys_role_id INT NOT NULL, + PRIMARY KEY (id), + CONSTRAINT FK_user FOREIGN KEY (sys_user_id) REFERENCES db_sysrbacdemo.sys_user (id), + CONSTRAINT FK_role FOREIGN KEY (sys_role_id) REFERENCES db_sysrbacdemo.sys_role (id) +) COMMENT = '用户角色关系表' + ENGINE=InnoDB; -CREATE TABLE db_sysdemo1.admin_info -( - admin_id VARCHAR(32) NOT NULL PRIMARY KEY , - user_id VARCHAR(32) NOT NULL, - create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP - COMMENT '创建时间', - update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE current_timestamp - COMMENT '更新时间', - CONSTRAINT FK_adminuser FOREIGN KEY (user_id) REFERENCES user_info (user_id) -) - COMMENT = '管理员表'; +CREATE TABLE db_sysrbacdemo.sys_permission ( + id INT NOT NULL AUTO_INCREMENT COMMENT '主键', + name varchar(128) NOT NULL COMMENT '资源名称', + type varchar(32) NOT NULL COMMENT '资源类型：menu,button,', + url varchar(128) DEFAULT NULL COMMENT '访问url地址', + percode varchar(128) DEFAULT NULL COMMENT '权限代码字符串', + parentid bigint(20) DEFAULT NULL COMMENT '父结点id', + parentids varchar(128) DEFAULT NULL COMMENT '父结点id列表串', + sortstring varchar(128) DEFAULT NULL COMMENT '排序号', + available INT(4) DEFAULT NULL COMMENT '是否可用,1：可用，0不可用', + PRIMARY KEY (id) +) COMMENT = '权限表' + ENGINE=InnoDB; -CREATE DATABASE db_sysdemo2 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -CREATE TABLE db_sysdemo2.user_info ( - user_id VARCHAR(32) NOT NULL, - username VARCHAR(32) NOT NULL, - password VARCHAR(32) NOT NULL, - create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP - COMMENT '创建时间', - update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE current_timestamp - COMMENT '更新时间', - PRIMARY KEY (user_id) -) - COMMENT '系统B用户信息表'; +CREATE TABLE db_sysrbacdemo.sys_role_permission ( + id INT NOT NULL AUTO_INCREMENT, + sys_role_id INT NOT NULL COMMENT '角色id', + sys_permission_id INT NOT NULL COMMENT '权限id', + PRIMARY KEY (id), + CONSTRAINT FK_user_role FOREIGN KEY (sys_role_id) REFERENCES db_sysrbacdemo.sys_role (id), + CONSTRAINT FK_sys_role_permission FOREIGN KEY (sys_permission_id) REFERENCES db_sysrbacdemo.sys_permission (id) +) COMMENT = '角色权限关系表' + ENGINE=InnoDB; -CREATE TABLE db_sysdemo2.admin_info -( - admin_id VARCHAR(32) NOT NULL PRIMARY KEY , - user_id VARCHAR(32) NOT NULL, - create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP - COMMENT '创建时间', - update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE current_timestamp - COMMENT '更新时间', - CONSTRAINT FK_adminuser FOREIGN KEY (user_id) REFERENCES user_info (user_id) -) - COMMENT = '管理员表'; +CREATE VIEW v_sys_user_permission + AS + SELECT + u.username, + p.percode, + p.parentid + FROM db_sysrbacdemo.sys_permission p,db_sysrbacdemo.sys_user u,db_sysrbacdemo.sys_user_role ru,db_sysrbacdemo.sys_role_permission rp + WHERE ru.sys_user_id=u.id AND ru.sys_role_id=rp.sys_role_id AND rp.sys_permission_id=p.id; -GRANT ALL ON db_fileupload.* TO trs@localhost IDENTIFIED BY 'fileupload'; -GRANT ALL ON db_sysdemo1.* TO trs@localhost IDENTIFIED BY 'fileupload'; -GRANT ALL ON db_sysdemo2.* TO trs@localhost IDENTIFIED BY 'fileupload'; +INSERT INTO `sys_permission` (`id`, `name`, `type`, `url`, `percode`, `parentid`, `parentids`, `sortstring`, `available`) VALUES + (1, '权限', '', '', NULL, 0, '0/', '0', 1), + (2, '文件管理', 'menu', '/fileupload/upload', NULL, 4, '0/1/4', '1.', 1), + (3, '文件上传', 'permission', '/fileupload/upload/add', 'file:upload', 2, '0/1/4/2', '', 1), + (4, '登录', 'menu', '/fileupload/login', 'site:login', 1, '0/1', '2.', 1); + +INSERT INTO `sys_role` (`id`, `name`, `available`) VALUES + (1, '普通用户', 0), + (2, '文件管理员', 0), + (3, '游客', 0); + +INSERT INTO `sys_user` (`id`, `usercode`, `username`, `password`, `locked`, `create_time`, `update_time`) VALUES + ('1529723171835369380', 'admin', 'admin', 'trs', 1, '2018-06-22 19:06:11', '2018-06-22 19:06:11'), + ('1529752407871409646', 'user', 'fjy', 'trs', 1, '2018-06-23 11:13:27', '2018-06-23 11:13:48'), + ('1529754856532186081', 'guest', 'guest', 'guest', 1, '2018-06-23 11:54:16', '2018-06-23 11:54:16'); + +INSERT INTO `sys_user_role` (`id`, `sys_user_id`, `sys_role_id`) VALUES + (6, '1529723171835369380', 2), + (7, '1529752407871409646', 2), + (8, '1529754856532186081', 3); + +INSERT INTO `sys_role_permission` (`id`, `sys_role_id`, `sys_permission_id`) VALUES + (7, 2, 3), + (8, 1, 4); + +GRANT ALL ON db_sysrbacdemo.* TO trs@localhost IDENTIFIED BY 'fileupload'; flush privileges; \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..bf99a80 --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,36 @@ +#开发环境配置文件 +server: + servlet: + context-path: /fileupload + port: 8080 +serverproperties: + portNum: 8080 + filePath: /www/fileupload/filedisk +spring: + thymeleaf: + prefix: classpath:/templates/ + cache: false + check-template: true + + servlet: + multipart: + max-file-size: 500Mb + max-request-size: 500Mb + datasource: + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://localhost:3306/db_sysrbacdemo?useUnicode=true&characterEncoding=utf-8&useSSL=true + username: trs + password: fileupload + jpa: + hibernate: + ddl-auto: update + show-sql: true + data: + elasticsearch: + cluster-name: Fjiayang + cluster-nodes: 127.0.0.1:9300 + + + #resources: + # static-locations: classpath:/templates/ +debug: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3d7808a..9f96606 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: dev + active: prod