diff --git a/.gitignore b/.gitignore
index 9154f4c..d87033b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-# ---> Java
# Compiled class file
*.class
@@ -10,17 +9,17 @@
# Mobile Tools for Java (J2ME)
.mtj.tmp/
+target
# Package Files #
*.jar
*.war
-*.nar
*.ear
*.zip
*.tar.gz
*.rar
+*.iml
+.idea
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
-replay_pid*
-
+ui/
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index 4e400cc..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# hadoop-recommendation-system
-
-基于Hadoop的选题推荐系统
\ No newline at end of file
diff --git a/admin/db/mysql.sql b/admin/db/mysql.sql
new file mode 100644
index 0000000..1f9c9e3
--- /dev/null
+++ b/admin/db/mysql.sql
@@ -0,0 +1,504 @@
+-- 系统用户
+CREATE TABLE sys_user (
+ id bigint NOT NULL COMMENT 'id',
+ username varchar(50) NOT NULL COMMENT '用户名',
+ password varchar(100) COMMENT '密码',
+ real_name varchar(50) COMMENT '姓名',
+ head_url varchar(200) COMMENT '头像',
+ gender tinyint unsigned COMMENT '性别 0：男 1：女 2：保密',
+ email varchar(100) COMMENT '邮箱',
+ mobile varchar(100) COMMENT '手机号',
+ dept_id bigint COMMENT '部门ID',
+ super_admin tinyint unsigned COMMENT '超级管理员 0：否 1：是',
+ status tinyint COMMENT '状态 0：停用 1：正常',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ unique key uk_username (username),
+ key idx_create_date (create_date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统用户';
+
+-- 部门
+CREATE TABLE sys_dept (
+ id bigint NOT NULL COMMENT 'id',
+ pid bigint COMMENT '上级ID',
+ pids varchar(500) COMMENT '所有上级ID，用逗号分开',
+ name varchar(50) COMMENT '部门名称',
+ sort int unsigned COMMENT '排序',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ key idx_pid (pid),
+ key idx_sort (sort)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='部门管理';
+
+-- 角色管理
+create table sys_role
+(
+ id bigint NOT NULL COMMENT 'id',
+ name varchar(50) COMMENT '角色名称',
+ remark varchar(100) COMMENT '备注',
+ dept_id bigint COMMENT '部门ID',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ key idx_dept_id (dept_id)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色管理';
+
+-- 菜单管理
+create table sys_menu
+(
+ id bigint NOT NULL COMMENT 'id',
+ pid bigint COMMENT '上级ID，一级菜单为0',
+ name varchar(200) COMMENT '名称',
+ url varchar(200) COMMENT '菜单URL',
+ permissions varchar(500) COMMENT '授权(多个用逗号分隔，如：sys:user:list,sys:user:save)',
+ menu_type tinyint unsigned COMMENT '类型 0：菜单 1：按钮',
+ icon varchar(50) COMMENT '菜单图标',
+ sort int COMMENT '排序',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ key idx_pid (pid),
+ key idx_sort (sort)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='菜单管理';
+
+-- 角色用户关系
+create table sys_role_user
+(
+ id bigint NOT NULL COMMENT 'id',
+ role_id bigint COMMENT '角色ID',
+ user_id bigint COMMENT '用户ID',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ primary key (id),
+ key idx_role_id (role_id),
+ key idx_user_id (user_id)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色用户关系';
+
+-- 角色菜单关系
+create table sys_role_menu
+(
+ id bigint NOT NULL COMMENT 'id',
+ role_id bigint COMMENT '角色ID',
+ menu_id bigint COMMENT '菜单ID',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ primary key (id),
+ key idx_role_id (role_id),
+ key idx_menu_id (menu_id)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色菜单关系';
+
+-- 角色数据权限
+create table sys_role_data_scope
+(
+ id bigint NOT NULL COMMENT 'id',
+ role_id bigint COMMENT '角色ID',
+ dept_id bigint COMMENT '部门ID',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ primary key (id),
+ key idx_role_id (role_id)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色数据权限';
+
+-- 参数管理
+create table sys_params
+(
+ id bigint NOT NULL COMMENT 'id',
+ param_code varchar(32) COMMENT '参数编码',
+ param_value varchar(2000) COMMENT '参数值',
+ param_type tinyint unsigned default 1 COMMENT '类型 0：系统参数 1：非系统参数',
+ remark varchar(200) COMMENT '备注',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ unique key uk_param_code (param_code),
+ key idx_create_date (create_date)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='参数管理';
+
+-- 字典类型
+create table sys_dict_type
+(
+ id bigint NOT NULL COMMENT 'id',
+ dict_type varchar(100) NOT NULL COMMENT '字典类型',
+ dict_name varchar(255) NOT NULL COMMENT '字典名称',
+ remark varchar(255) COMMENT '备注',
+ sort int unsigned COMMENT '排序',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ UNIQUE KEY(dict_type)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='字典类型';
+
+-- 字典数据
+create table sys_dict_data
+(
+ id bigint NOT NULL COMMENT 'id',
+ dict_type_id bigint NOT NULL COMMENT '字典类型ID',
+ dict_label varchar(255) NOT NULL COMMENT '字典标签',
+ dict_value varchar(255) COMMENT '字典值',
+ remark varchar(255) COMMENT '备注',
+ sort int unsigned COMMENT '排序',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ primary key (id),
+ unique key uk_dict_type_value (dict_type_id, dict_value),
+ key idx_sort (sort)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='字典数据';
+
+-- 登录日志
+create table sys_log_login
+(
+ id bigint NOT NULL COMMENT 'id',
+ operation tinyint unsigned COMMENT '用户操作 0：用户登录 1：用户退出',
+ status tinyint unsigned NOT NULL COMMENT '状态 0：失败 1：成功 2：账号已锁定',
+ user_agent varchar(500) COMMENT '用户代理',
+ ip varchar(32) COMMENT '操作IP',
+ creator_name varchar(50) COMMENT '用户名',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ primary key (id),
+ key idx_status (status),
+ key idx_create_date (create_date)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='登录日志';
+
+-- 操作日志
+create table sys_log_operation
+(
+ id bigint NOT NULL COMMENT 'id',
+ operation varchar(50) COMMENT '用户操作',
+ request_uri varchar(200) COMMENT '请求URI',
+ request_method varchar(20) COMMENT '请求方式',
+ request_params text COMMENT '请求参数',
+ request_time int unsigned NOT NULL COMMENT '请求时长(毫秒)',
+ user_agent varchar(500) COMMENT '用户代理',
+ ip varchar(32) COMMENT '操作IP',
+ status tinyint unsigned NOT NULL COMMENT '状态 0：失败 1：成功',
+ creator_name varchar(50) COMMENT '用户名',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ primary key (id),
+ key idx_create_date (create_date)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='操作日志';
+
+-- 异常日志
+create table sys_log_error
+(
+ id bigint NOT NULL COMMENT 'id',
+ request_uri varchar(200) COMMENT '请求URI',
+ request_method varchar(20) COMMENT '请求方式',
+ request_params text COMMENT '请求参数',
+ user_agent varchar(500) COMMENT '用户代理',
+ ip varchar(32) COMMENT '操作IP',
+ error_info text COMMENT '异常信息',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ primary key (id),
+ key idx_create_date (create_date)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='异常日志';
+
+
+-- 文件上传
+CREATE TABLE sys_oss (
+ id bigint NOT NULL COMMENT 'id',
+ url varchar(200) COMMENT 'URL地址',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ PRIMARY KEY (id),
+ key idx_create_date (create_date)
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='文件上传';
+
+-- 定时任务
+CREATE TABLE schedule_job (
+ id bigint NOT NULL COMMENT 'id',
+ bean_name varchar(200) DEFAULT NULL COMMENT 'spring bean名称',
+ params varchar(2000) DEFAULT NULL COMMENT '参数',
+ cron_expression varchar(100) DEFAULT NULL COMMENT 'cron表达式',
+ status tinyint unsigned COMMENT '任务状态 0：暂停 1：正常',
+ remark varchar(255) DEFAULT NULL COMMENT '备注',
+ creator bigint COMMENT '创建者',
+ create_date datetime COMMENT '创建时间',
+ updater bigint COMMENT '更新者',
+ update_date datetime COMMENT '更新时间',
+ PRIMARY KEY (id),
+ key idx_create_date (create_date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='定时任务';
+
+-- 定时任务日志
+CREATE TABLE schedule_job_log (
+ id bigint NOT NULL COMMENT 'id',
+ job_id bigint NOT NULL COMMENT '任务id',
+ bean_name varchar(200) DEFAULT NULL COMMENT 'spring bean名称',
+ params varchar(2000) DEFAULT NULL COMMENT '参数',
+ status tinyint unsigned NOT NULL COMMENT '任务状态 0：失败 1：成功',
+ error varchar(2000) DEFAULT NULL COMMENT '失败信息',
+ times int NOT NULL COMMENT '耗时(单位：毫秒)',
+ create_date datetime COMMENT '创建时间',
+ PRIMARY KEY (id),
+ key idx_job_id (job_id),
+ key idx_create_date (create_date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='定时任务日志';
+
+-- 系统用户Token
+CREATE TABLE sys_user_token (
+ id bigint NOT NULL COMMENT 'id',
+ user_id bigint NOT NULL COMMENT '用户id',
+ token varchar(100) NOT NULL COMMENT '用户token',
+ expire_date datetime COMMENT '过期时间',
+ update_date datetime COMMENT '更新时间',
+ create_date datetime COMMENT '创建时间',
+ PRIMARY KEY (id),
+ UNIQUE KEY user_id (user_id),
+ UNIQUE KEY token (token)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统用户Token';
+
+-- 初始数据
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@renren.io', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
+
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000002, 0, '权限管理', NULL, NULL, 0, 'icon-safetycertificate', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000003, 1067246875800000055, '新增', NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000004, 1067246875800000055, '修改', NULL, 'sys:user:update,sys:dept:list,sys:role:list', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000005, 1067246875800000055, '删除', NULL, 'sys:user:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000006, 1067246875800000055, '导出', NULL, 'sys:user:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000007, 1067246875800000002, '角色管理', 'sys/role', NULL, 0, 'icon-team', 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000008, 1067246875800000007, '查看', NULL, 'sys:role:page,sys:role:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000009, 1067246875800000007, '新增', NULL, 'sys:role:save,sys:menu:select,sys:dept:list', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000010, 1067246875800000007, '修改', NULL, 'sys:role:update,sys:menu:select,sys:dept:list', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000011, 1067246875800000007, '删除', NULL, 'sys:role:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000012, 1067246875800000002, '部门管理', 'sys/dept', NULL, 0, 'icon-apartment', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000014, 1067246875800000012, '查看', NULL, 'sys:dept:list,sys:dept:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000015, 1067246875800000012, '新增', NULL, 'sys:dept:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000016, 1067246875800000012, '修改', NULL, 'sys:dept:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000017, 1067246875800000012, '删除', NULL, 'sys:dept:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000025, 1067246875800000035, '菜单管理', 'sys/menu', NULL, 0, 'icon-unorderedlist', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000026, 1067246875800000025, '查看', NULL, 'sys:menu:list,sys:menu:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000027, 1067246875800000025, '新增', NULL, 'sys:menu:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000028, 1067246875800000025, '修改', NULL, 'sys:menu:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000029, 1067246875800000025, '删除', NULL, 'sys:menu:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000030, 1067246875800000035, '定时任务', 'job/schedule', NULL, 0, 'icon-dashboard', 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000031, 1067246875800000030, '查看', NULL, 'sys:schedule:page,sys:schedule:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000032, 1067246875800000030, '新增', NULL, 'sys:schedule:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000033, 1067246875800000030, '修改', NULL, 'sys:schedule:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000034, 1067246875800000030, '删除', NULL, 'sys:schedule:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000035, 0, '系统设置', NULL, NULL, 0, 'icon-setting', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000036, 1067246875800000030, '暂停', NULL, 'sys:schedule:pause', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000037, 1067246875800000030, '恢复', NULL, 'sys:schedule:resume', 1, NULL, 5, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000038, 1067246875800000030, '立即执行', NULL, 'sys:schedule:run', 1, NULL, 6, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000039, 1067246875800000030, '日志列表', NULL, 'sys:schedule:log', 1, NULL, 7, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000040, 1067246875800000035, '参数管理', 'sys/params', '', 0, 'icon-fileprotect', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000041, 1067246875800000035, '字典管理', 'sys/dict-type', NULL, 0, 'icon-golden-fill', 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000042, 1067246875800000041, '查看', NULL, 'sys:dict:page,sys:dict:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000043, 1067246875800000041, '新增', NULL, 'sys:dict:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000044, 1067246875800000041, '修改', NULL, 'sys:dict:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000045, 1067246875800000041, '删除', NULL, 'sys:dict:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000046, 0, '日志管理', NULL, NULL, 0, 'icon-container', 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000047, 1067246875800000035, '文件上传', 'oss/oss', 'sys:oss:all', 0, 'icon-upload', 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000048, 1067246875800000046, '登录日志', 'sys/log-login', 'sys:log:login', 0, 'icon-filedone', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000049, 1067246875800000046, '操作日志', 'sys/log-operation', 'sys:log:operation', 0, 'icon-solution', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000050, 1067246875800000046, '异常日志', 'sys/log-error', 'sys:log:error', 0, 'icon-file-exception', 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000051, 1067246875800000053, 'SQL监控', '{{ApiUrl}}/druid/sql.html', NULL, 0, 'icon-database', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000053, 0, '系统监控', NULL, NULL, 0, 'icon-desktop', 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000055, 1067246875800000002, '用户管理', 'sys/user', NULL, 0, 'icon-user', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000056, 1067246875800000055, '查看', NULL, 'sys:user:page,sys:user:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000057, 1067246875800000040, '新增', NULL, 'sys:params:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000058, 1067246875800000040, '导出', NULL, 'sys:params:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000059, 1067246875800000040, '查看', '', 'sys:params:page,sys:params:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000060, 1067246875800000040, '修改', NULL, 'sys:params:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000061, 1067246875800000040, '删除', '', 'sys:params:delete', 1, '', 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu (id, pid, name, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1156748733921165314, 1067246875800000053, '接口文档', '{{ApiUrl}}/doc.html', '', 0, 'icon-file-word', 1, 1067246875800000001, now(), 1067246875800000001, now());
+
+
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000062, 1067246875800000063, '1067246875800000066,1067246875800000063', '技术部', 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000063, 1067246875800000066, '1067246875800000066', '长沙分公司', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000064, 1067246875800000066, '1067246875800000066', '上海分公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000065, 1067246875800000064, '1067246875800000066,1067246875800000064', '市场部', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '人人开源集团', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000067, 1067246875800000064, '1067246875800000066,1067246875800000064', '销售部', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000068, 1067246875800000063, '1067246875800000066,1067246875800000063', '产品部', 1, 1067246875800000001, now(), 1067246875800000001, now());
+
+INSERT INTO sys_dict_type(id, dict_type, dict_name, remark, sort, creator, create_date, updater, update_date) VALUES (1160061077912858625, 'gender', '性别', '', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort, creator, create_date, updater, update_date) VALUES (1160061112075464705, 1160061077912858625, '男', '0', '', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort, creator, create_date, updater, update_date) VALUES (1160061146967879681, 1160061077912858625, '女', '1', '', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort, creator, create_date, updater, update_date) VALUES (1160061190127267841, 1160061077912858625, '保密', '2', '', 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_type(id, dict_type, dict_name, remark, sort, creator, create_date, updater, update_date) VALUES (1225813644059140097, 'notice_type', '站内通知-类型', '', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort, creator, create_date, updater, update_date) VALUES (1225814069634195457, 1225813644059140097, '公告', '0', '', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort, creator, create_date, updater, update_date) VALUES (1225814107559092225, 1225813644059140097, '会议', '1', '', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort, creator, create_date, updater, update_date) VALUES (1225814271879340034, 1225813644059140097, '其他', '2', '', 2, 1067246875800000001, now(), 1067246875800000001, now());
+
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.renren.io","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"renren-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+
+INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'renren', '0 0/30 * * * ?', 0, '有参测试，多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
+
+
+-- quartz自带表结构
+CREATE TABLE QRTZ_JOB_DETAILS(
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ JOB_NAME VARCHAR(200) NOT NULL,
+ JOB_GROUP VARCHAR(200) NOT NULL,
+ DESCRIPTION VARCHAR(250) NULL,
+ JOB_CLASS_NAME VARCHAR(250) NOT NULL,
+ IS_DURABLE VARCHAR(1) NOT NULL,
+ IS_NONCONCURRENT VARCHAR(1) NOT NULL,
+ IS_UPDATE_DATA VARCHAR(1) NOT NULL,
+ REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
+ JOB_DATA BLOB NULL,
+ PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ JOB_NAME VARCHAR(200) NOT NULL,
+ JOB_GROUP VARCHAR(200) NOT NULL,
+ DESCRIPTION VARCHAR(250) NULL,
+ NEXT_FIRE_TIME BIGINT(13) NULL,
+ PREV_FIRE_TIME BIGINT(13) NULL,
+ PRIORITY INTEGER NULL,
+ TRIGGER_STATE VARCHAR(16) NOT NULL,
+ TRIGGER_TYPE VARCHAR(8) NOT NULL,
+ START_TIME BIGINT(13) NOT NULL,
+ END_TIME BIGINT(13) NULL,
+ CALENDAR_NAME VARCHAR(200) NULL,
+ MISFIRE_INSTR SMALLINT(2) NULL,
+ JOB_DATA BLOB NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+ REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ REPEAT_COUNT BIGINT(7) NOT NULL,
+ REPEAT_INTERVAL BIGINT(12) NOT NULL,
+ TIMES_TRIGGERED BIGINT(10) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_CRON_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ CRON_EXPRESSION VARCHAR(120) NOT NULL,
+ TIME_ZONE_ID VARCHAR(80),
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_SIMPROP_TRIGGERS
+(
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ STR_PROP_1 VARCHAR(512) NULL,
+ STR_PROP_2 VARCHAR(512) NULL,
+ STR_PROP_3 VARCHAR(512) NULL,
+ INT_PROP_1 INT NULL,
+ INT_PROP_2 INT NULL,
+ LONG_PROP_1 BIGINT NULL,
+ LONG_PROP_2 BIGINT NULL,
+ DEC_PROP_1 NUMERIC(13,4) NULL,
+ DEC_PROP_2 NUMERIC(13,4) NULL,
+ BOOL_PROP_1 VARCHAR(1) NULL,
+ BOOL_PROP_2 VARCHAR(1) NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_BLOB_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ BLOB_DATA BLOB NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_CALENDARS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ CALENDAR_NAME VARCHAR(200) NOT NULL,
+ CALENDAR BLOB NOT NULL,
+ PRIMARY KEY (SCHED_NAME,CALENDAR_NAME))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_FIRED_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ ENTRY_ID VARCHAR(95) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ INSTANCE_NAME VARCHAR(200) NOT NULL,
+ FIRED_TIME BIGINT(13) NOT NULL,
+ SCHED_TIME BIGINT(13) NOT NULL,
+ PRIORITY INTEGER NOT NULL,
+ STATE VARCHAR(16) NOT NULL,
+ JOB_NAME VARCHAR(200) NULL,
+ JOB_GROUP VARCHAR(200) NULL,
+ IS_NONCONCURRENT VARCHAR(1) NULL,
+ REQUESTS_RECOVERY VARCHAR(1) NULL,
+ PRIMARY KEY (SCHED_NAME,ENTRY_ID))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_SCHEDULER_STATE (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ INSTANCE_NAME VARCHAR(200) NOT NULL,
+ LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
+ CHECKIN_INTERVAL BIGINT(13) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,INSTANCE_NAME))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE QRTZ_LOCKS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ LOCK_NAME VARCHAR(40) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,LOCK_NAME))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE INDEX IDX_QRTZ_J_REQ_RECOVERY ON QRTZ_JOB_DETAILS(SCHED_NAME,REQUESTS_RECOVERY);
+CREATE INDEX IDX_QRTZ_J_GRP ON QRTZ_JOB_DETAILS(SCHED_NAME,JOB_GROUP);
+
+CREATE INDEX IDX_QRTZ_T_J ON QRTZ_TRIGGERS(SCHED_NAME,JOB_NAME,JOB_GROUP);
+CREATE INDEX IDX_QRTZ_T_JG ON QRTZ_TRIGGERS(SCHED_NAME,JOB_GROUP);
+CREATE INDEX IDX_QRTZ_T_C ON QRTZ_TRIGGERS(SCHED_NAME,CALENDAR_NAME);
+CREATE INDEX IDX_QRTZ_T_G ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_GROUP);
+CREATE INDEX IDX_QRTZ_T_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_STATE);
+CREATE INDEX IDX_QRTZ_T_N_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_STATE);
+CREATE INDEX IDX_QRTZ_T_N_G_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_GROUP,TRIGGER_STATE);
+CREATE INDEX IDX_QRTZ_T_NEXT_FIRE_TIME ON QRTZ_TRIGGERS(SCHED_NAME,NEXT_FIRE_TIME);
+CREATE INDEX IDX_QRTZ_T_NFT_ST ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_STATE,NEXT_FIRE_TIME);
+CREATE INDEX IDX_QRTZ_T_NFT_MISFIRE ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME);
+CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_STATE);
+CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE_GRP ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_GROUP,TRIGGER_STATE);
+
+CREATE INDEX IDX_QRTZ_FT_TRIG_INST_NAME ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,INSTANCE_NAME);
+CREATE INDEX IDX_QRTZ_FT_INST_JOB_REQ_RCVRY ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,INSTANCE_NAME,REQUESTS_RECOVERY);
+CREATE INDEX IDX_QRTZ_FT_J_G ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,JOB_NAME,JOB_GROUP);
+CREATE INDEX IDX_QRTZ_FT_JG ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,JOB_GROUP);
+CREATE INDEX IDX_QRTZ_FT_T_G ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
+CREATE INDEX IDX_QRTZ_FT_TG ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,TRIGGER_GROUP);
\ No newline at end of file
diff --git a/admin/pom.xml b/admin/pom.xml
new file mode 100644
index 0000000..0d68cdc
--- /dev/null
+++ b/admin/pom.xml
@@ -0,0 +1,134 @@
+
+
+ io.renren
+ hadoop-recommendation-system
+ 5.4.0
+
+ 4.0.0
+ admin
+ jar
+ renren-admin
+
+
+ 2.3.2
+ 1.12.0
+ 1.6.2
+ 3.2.1
+ 7.2.27
+ 2.8.3
+ 3.2.2
+ 5.4.4
+
+
+
+
+ io.renren
+ common
+ 5.4.0
+
+
+ org.quartz-scheduler
+ quartz
+ ${quartz.version}
+
+
+ com.mchange
+ c3p0
+
+
+ com.zaxxer
+ HikariCP-java6
+
+
+
+
+ org.apache.shiro
+ shiro-spring
+ jakarta
+ ${shiro.version}
+
+
+
+ org.apache.shiro
+ shiro-core
+
+
+ org.apache.shiro
+ shiro-web
+
+
+
+
+
+ org.apache.shiro
+ shiro-core
+ jakarta
+ ${shiro.version}
+
+
+ org.apache.shiro
+ shiro-web
+ jakarta
+ ${shiro.version}
+
+
+ org.apache.shiro
+ shiro-core
+
+
+
+
+ com.github.whvcse
+ easy-captcha
+ ${captcha.version}
+
+
+ com.alibaba
+ easyexcel
+ ${easyexcel.version}
+
+
+ com.qiniu
+ qiniu-java-sdk
+ ${qiniu.version}
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ ${aliyun.oss.version}
+
+
+ com.aliyun
+ aliyun-java-sdk-core
+ ${aliyun.core.version}
+
+
+ com.qcloud
+ cos_api
+ ${qcloud.cos.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
+
+
+
diff --git a/admin/src/main/java/io/renren/AdminApplication.java b/admin/src/main/java/io/renren/AdminApplication.java
new file mode 100644
index 0000000..47c89d2
--- /dev/null
+++ b/admin/src/main/java/io/renren/AdminApplication.java
@@ -0,0 +1,26 @@
+
+
+package io.renren;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+
+/**
+ * renren-admin
+ *
+ */
+@SpringBootApplication
+public class AdminApplication extends SpringBootServletInitializer {
+
+ public static void main(String[] args) {
+ SpringApplication.run(AdminApplication.class, args);
+ }
+
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(AdminApplication.class);
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/annotation/DataFilter.java b/admin/src/main/java/io/renren/common/annotation/DataFilter.java
new file mode 100644
index 0000000..3cfba43
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/annotation/DataFilter.java
@@ -0,0 +1,31 @@
+
+
+package io.renren.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据过滤注解
+ *
+
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataFilter {
+ /**
+ * 表的别名
+ */
+ String tableAlias() default "";
+
+ /**
+ * 用户ID
+ */
+ String userId() default "creator";
+
+ /**
+ * 部门ID
+ */
+ String deptId() default "dept_id";
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/annotation/LogOperation.java b/admin/src/main/java/io/renren/common/annotation/LogOperation.java
new file mode 100644
index 0000000..255b928
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/annotation/LogOperation.java
@@ -0,0 +1,22 @@
+
+
+package io.renren.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 操作日志注解
+ *
+
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface LogOperation {
+
+ String value() default "";
+}
diff --git a/admin/src/main/java/io/renren/common/aspect/DataFilterAspect.java b/admin/src/main/java/io/renren/common/aspect/DataFilterAspect.java
new file mode 100644
index 0000000..b6b7544
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/aspect/DataFilterAspect.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.common.aspect;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.qiniu.util.StringUtils;
+import io.renren.common.annotation.DataFilter;
+import io.renren.common.constant.Constant;
+import io.renren.common.exception.ErrorCode;
+import io.renren.common.exception.RenException;
+import io.renren.common.interceptor.DataScope;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.enums.SuperAdminEnum;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据过滤，切面处理类
+ *
+
+ */
+@Aspect
+@Component
+public class DataFilterAspect {
+
+ @Pointcut("@annotation(io.renren.common.annotation.DataFilter)")
+ public void dataFilterCut() {
+
+ }
+
+ @Before("dataFilterCut()")
+ public void dataFilter(JoinPoint point) {
+ Object params = point.getArgs()[0];
+ if (params != null && params instanceof Map) {
+ UserDetail user = SecurityUser.getUser();
+
+ //如果是超级管理员，则不进行数据过滤
+ if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) {
+ return;
+ }
+
+ try {
+ //否则进行数据过滤
+ Map map = (Map) params;
+ String sqlFilter = getSqlFilter(user, point);
+ map.put(Constant.SQL_FILTER, new DataScope(sqlFilter));
+ } catch (Exception e) {
+
+ }
+
+ return;
+ }
+
+ throw new RenException(ErrorCode.DATA_SCOPE_PARAMS_ERROR);
+ }
+
+ /**
+ * 获取数据过滤的SQL
+ */
+ private String getSqlFilter(UserDetail user, JoinPoint point) throws Exception {
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method method = point.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes());
+ DataFilter dataFilter = method.getAnnotation(DataFilter.class);
+
+ //获取表的别名
+ String tableAlias = dataFilter.tableAlias();
+ if (StrUtil.isNotBlank(tableAlias)) {
+ tableAlias += ".";
+ }
+
+ StringBuilder sqlFilter = new StringBuilder();
+ sqlFilter.append(" (");
+
+ //部门ID列表
+ List deptIdList = user.getDeptIdList();
+ if (CollUtil.isNotEmpty(deptIdList)) {
+ sqlFilter.append(tableAlias).append(dataFilter.deptId());
+
+ sqlFilter.append(" in(").append(StringUtils.join(deptIdList, ",")).append(")");
+ }
+
+ //查询本人数据
+ if (CollUtil.isNotEmpty(deptIdList)) {
+ sqlFilter.append(" or ");
+ }
+ sqlFilter.append(tableAlias).append(dataFilter.userId()).append("=").append(user.getId());
+
+ sqlFilter.append(")");
+
+ return sqlFilter.toString();
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/aspect/LogOperationAspect.java b/admin/src/main/java/io/renren/common/aspect/LogOperationAspect.java
new file mode 100644
index 0000000..5adb747
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/aspect/LogOperationAspect.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.common.aspect;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.utils.HttpContextUtils;
+import io.renren.common.utils.IpUtils;
+import io.renren.common.utils.JsonUtils;
+import io.renren.modules.log.entity.SysLogOperationEntity;
+import io.renren.modules.log.enums.OperationStatusEnum;
+import io.renren.modules.log.service.SysLogOperationService;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.security.user.UserDetail;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * 操作日志，切面处理类
+ *
+
+ */
+@Aspect
+@Component
+@AllArgsConstructor
+public class LogOperationAspect {
+ private final SysLogOperationService sysLogOperationService;
+
+ @Pointcut("@annotation(io.renren.common.annotation.LogOperation)")
+ public void logPointCut() {
+
+ }
+
+ @Around("logPointCut()")
+ public Object around(ProceedingJoinPoint point) throws Throwable {
+ long beginTime = System.currentTimeMillis();
+ try {
+ //执行方法
+ Object result = point.proceed();
+
+ //执行时长(毫秒)
+ long time = System.currentTimeMillis() - beginTime;
+ //保存日志
+ saveLog(point, time, OperationStatusEnum.SUCCESS.value());
+
+ return result;
+ } catch (Exception e) {
+ //执行时长(毫秒)
+ long time = System.currentTimeMillis() - beginTime;
+ //保存日志
+ saveLog(point, time, OperationStatusEnum.FAIL.value());
+
+ throw e;
+ }
+ }
+
+ private void saveLog(ProceedingJoinPoint joinPoint, long time, Integer status) throws Exception {
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ Method method = joinPoint.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes());
+ LogOperation annotation = method.getAnnotation(LogOperation.class);
+
+ SysLogOperationEntity log = new SysLogOperationEntity();
+ if (annotation != null) {
+ //注解上的描述
+ log.setOperation(annotation.value());
+ }
+
+ //登录用户信息
+ UserDetail user = SecurityUser.getUser();
+ if (user != null) {
+ log.setCreatorName(user.getUsername());
+ }
+
+ log.setStatus(status);
+ log.setRequestTime((int) time);
+
+ //请求相关信息
+ HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+ log.setIp(IpUtils.getIpAddr(request));
+ log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+ log.setRequestUri(request.getRequestURI());
+ log.setRequestMethod(request.getMethod());
+
+ //请求参数
+ Object[] args = joinPoint.getArgs();
+ try {
+ String params = JsonUtils.toJsonString(args[0]);
+ log.setRequestParams(params);
+ } catch (Exception e) {
+
+ }
+
+ //保存到DB
+ sysLogOperationService.save(log);
+ }
+}
diff --git a/admin/src/main/java/io/renren/common/config/MybatisPlusConfig.java b/admin/src/main/java/io/renren/common/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..fb22b11
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/config/MybatisPlusConfig.java
@@ -0,0 +1,37 @@
+
+
+package io.renren.common.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import io.renren.common.interceptor.DataFilterInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * mybatis-plus配置
+ *
+
+ * @since 1.0.0
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+ // 数据权限
+ mybatisPlusInterceptor.addInnerInterceptor(new DataFilterInterceptor());
+ // 分页插件
+ mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+ // 乐观锁
+ mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+ // 防止全表更新与删除
+ mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
+
+ return mybatisPlusInterceptor;
+ }
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/config/SwaggerConfig.java b/admin/src/main/java/io/renren/common/config/SwaggerConfig.java
new file mode 100644
index 0000000..b5c87fa
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/config/SwaggerConfig.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.common.config;
+
+import io.renren.common.constant.Constant;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Swagger配置
+ *
+
+ */
+@Configuration
+public class SwaggerConfig {
+ @Bean
+ public OpenAPI createRestApi() {
+ return new OpenAPI()
+ .info(apiInfo())
+ .security(security());
+ }
+
+ private Info apiInfo() {
+ return new Info()
+ .title("人人开源")
+ .description("renren-admin文档")
+ .version("5.x");
+ }
+
+ private List security() {
+ SecurityRequirement key = new SecurityRequirement();
+ key.addList(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER);
+
+ List list = new ArrayList<>();
+ list.add(key);
+ return list;
+ }
+}
diff --git a/admin/src/main/java/io/renren/common/exception/RenExceptionHandler.java b/admin/src/main/java/io/renren/common/exception/RenExceptionHandler.java
new file mode 100644
index 0000000..ef7fe71
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/exception/RenExceptionHandler.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.common.exception;
+
+import cn.hutool.core.map.MapUtil;
+import io.renren.common.utils.HttpContextUtils;
+import io.renren.common.utils.IpUtils;
+import io.renren.common.utils.JsonUtils;
+import io.renren.common.utils.Result;
+import io.renren.modules.log.entity.SysLogErrorEntity;
+import io.renren.modules.log.service.SysLogErrorService;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.Map;
+
+
+/**
+ * 异常处理器
+ *
+
+ * @since 1.0.0
+ */
+@Slf4j
+@RestControllerAdvice
+@AllArgsConstructor
+public class RenExceptionHandler {
+ private final SysLogErrorService sysLogErrorService;
+
+ /**
+ * 处理自定义异常
+ */
+ @ExceptionHandler(RenException.class)
+ public Result handleRenException(RenException ex) {
+ Result result = new Result();
+ result.error(ex.getCode(), ex.getMsg());
+
+ return result;
+ }
+
+ @ExceptionHandler(DuplicateKeyException.class)
+ public Result handleDuplicateKeyException(DuplicateKeyException ex) {
+ Result result = new Result();
+ result.error(ErrorCode.DB_RECORD_EXISTS);
+
+ return result;
+ }
+
+ @ExceptionHandler(Exception.class)
+ public Result handleException(Exception ex) {
+ log.error(ex.getMessage(), ex);
+
+ saveLog(ex);
+
+ return new Result().error();
+ }
+
+ /**
+ * 保存异常日志
+ */
+ private void saveLog(Exception ex) {
+ SysLogErrorEntity log = new SysLogErrorEntity();
+
+ //请求相关信息
+ HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+ log.setIp(IpUtils.getIpAddr(request));
+ log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+ log.setRequestUri(request.getRequestURI());
+ log.setRequestMethod(request.getMethod());
+ Map params = HttpContextUtils.getParameterMap(request);
+ if (MapUtil.isNotEmpty(params)) {
+ log.setRequestParams(JsonUtils.toJsonString(params));
+ }
+
+ //异常信息
+ log.setErrorInfo(ExceptionUtils.getErrorStackTrace(ex));
+
+ //保存
+ sysLogErrorService.save(log);
+ }
+}
diff --git a/admin/src/main/java/io/renren/common/handler/FieldMetaObjectHandler.java b/admin/src/main/java/io/renren/common/handler/FieldMetaObjectHandler.java
new file mode 100644
index 0000000..114761e
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/handler/FieldMetaObjectHandler.java
@@ -0,0 +1,52 @@
+
+
+package io.renren.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.security.user.UserDetail;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 公共字段，自动填充值
+ *
+
+ */
+@Component
+public class FieldMetaObjectHandler implements MetaObjectHandler {
+ private final static String CREATE_DATE = "createDate";
+ private final static String CREATOR = "creator";
+ private final static String UPDATE_DATE = "updateDate";
+ private final static String UPDATER = "updater";
+ private final static String DEPT_ID = "deptId";
+
+ @Override
+ public void insertFill(MetaObject metaObject) {
+ UserDetail user = SecurityUser.getUser();
+ Date date = new Date();
+
+ //创建者
+ strictInsertFill(metaObject, CREATOR, Long.class, user.getId());
+ //创建时间
+ strictInsertFill(metaObject, CREATE_DATE, Date.class, date);
+
+ //创建者所属部门
+ strictInsertFill(metaObject, DEPT_ID, Long.class, user.getDeptId());
+
+ //更新者
+ strictInsertFill(metaObject, UPDATER, Long.class, user.getId());
+ //更新时间
+ strictInsertFill(metaObject, UPDATE_DATE, Date.class, date);
+ }
+
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ //更新者
+ strictUpdateFill(metaObject, UPDATER, Long.class, SecurityUser.getUserId());
+ //更新时间
+ strictUpdateFill(metaObject, UPDATE_DATE, Date.class, new Date());
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/interceptor/DataFilterInterceptor.java b/admin/src/main/java/io/renren/common/interceptor/DataFilterInterceptor.java
new file mode 100644
index 0000000..a10691a
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/interceptor/DataFilterInterceptor.java
@@ -0,0 +1,83 @@
+
+
+package io.renren.common.interceptor;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.Map;
+
+/**
+ * 数据过滤
+ *
+
+ */
+public class DataFilterInterceptor implements InnerInterceptor {
+
+ @Override
+ public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) {
+ DataScope scope = getDataScope(parameter);
+ // 不进行数据过滤
+ if(scope == null || StrUtil.isBlank(scope.getSqlFilter())){
+ return;
+ }
+
+ // 拼接新SQL
+ String buildSql = getSelect(boundSql.getSql(), scope);
+
+ // 重写SQL
+ PluginUtils.mpBoundSql(boundSql).sql(buildSql);
+ }
+
+ private DataScope getDataScope(Object parameter){
+ if (parameter == null){
+ return null;
+ }
+
+ // 判断参数里是否有DataScope对象
+ if (parameter instanceof Map) {
+ Map parameterMap = (Map) parameter;
+ for (Map.Entry entry : parameterMap.entrySet()) {
+ if (entry.getValue() != null && entry.getValue() instanceof DataScope) {
+ return (DataScope) entry.getValue();
+ }
+ }
+ } else if (parameter instanceof DataScope) {
+ return (DataScope) parameter;
+ }
+
+ return null;
+ }
+
+ private String getSelect(String buildSql, DataScope scope){
+ try {
+ Select select = (Select) CCJSqlParserUtil.parse(buildSql);
+ PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+
+ Expression expression = plainSelect.getWhere();
+ if(expression == null){
+ plainSelect.setWhere(new StringValue(scope.getSqlFilter()));
+ }else{
+ AndExpression andExpression = new AndExpression(expression, new StringValue(scope.getSqlFilter()));
+ plainSelect.setWhere(andExpression);
+ }
+
+ return select.toString().replaceAll("'", "");
+ }catch (JSQLParserException e){
+ return buildSql;
+ }
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/interceptor/DataScope.java b/admin/src/main/java/io/renren/common/interceptor/DataScope.java
new file mode 100644
index 0000000..483a9fc
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/interceptor/DataScope.java
@@ -0,0 +1,30 @@
+
+
+package io.renren.common.interceptor;
+
+/**
+ * 数据范围
+ *
+
+ * @since 1.0.0
+ */
+public class DataScope {
+ private String sqlFilter;
+
+ public DataScope(String sqlFilter) {
+ this.sqlFilter = sqlFilter;
+ }
+
+ public String getSqlFilter() {
+ return sqlFilter;
+ }
+
+ public void setSqlFilter(String sqlFilter) {
+ this.sqlFilter = sqlFilter;
+ }
+
+ @Override
+ public String toString() {
+ return this.sqlFilter;
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/common/utils/ExcelUtils.java b/admin/src/main/java/io/renren/common/utils/ExcelUtils.java
new file mode 100644
index 0000000..412a55a
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/utils/ExcelUtils.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.common.utils;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.converters.longconverter.LongStringConverter;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.BeanUtils;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * excel工具类
+ *
+
+ */
+public class ExcelUtils {
+
+ /**
+ * Excel导出
+ *
+ * @param response response
+ * @param fileName 文件名
+ * @param sheetName sheetName
+ * @param list 数据List
+ * @param pojoClass 对象Class
+ */
+ public static void exportExcel(HttpServletResponse response, String fileName, String sheetName, List list,
+ Class pojoClass) throws IOException {
+ if (StrUtil.isBlank(fileName)) {
+ //当前日期
+ fileName = DateUtils.format(new Date());
+ }
+
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("UTF-8");
+ fileName = URLUtil.encode(fileName, StandardCharsets.UTF_8);
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), pojoClass).registerConverter(new LongStringConverter()).sheet(sheetName).doWrite(list);
+ }
+
+ /**
+ * Excel导出，先sourceList转换成List，再导出
+ *
+ * @param response response
+ * @param fileName 文件名
+ * @param sheetName sheetName
+ * @param sourceList 原数据List
+ * @param targetClass 目标对象Class
+ */
+ public static void exportExcelToTarget(HttpServletResponse response, String fileName, String sheetName, List sourceList,
+ Class targetClass) throws Exception {
+ List targetList = new ArrayList<>(sourceList.size());
+ for (Object source : sourceList) {
+ Object target = targetClass.newInstance();
+ BeanUtils.copyProperties(source, target);
+ targetList.add(target);
+ }
+
+ exportExcel(response, fileName, sheetName, targetList, targetClass);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/common/validator/group/AliyunGroup.java b/admin/src/main/java/io/renren/common/validator/group/AliyunGroup.java
new file mode 100644
index 0000000..73e64fa
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/validator/group/AliyunGroup.java
@@ -0,0 +1,11 @@
+
+
+package io.renren.common.validator.group;
+
+/**
+ * 阿里云
+ *
+
+ */
+public interface AliyunGroup {
+}
diff --git a/admin/src/main/java/io/renren/common/validator/group/QcloudGroup.java b/admin/src/main/java/io/renren/common/validator/group/QcloudGroup.java
new file mode 100644
index 0000000..bfbe0f8
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/validator/group/QcloudGroup.java
@@ -0,0 +1,11 @@
+
+
+package io.renren.common.validator.group;
+
+/**
+ * 腾讯云
+ *
+
+ */
+public interface QcloudGroup {
+}
diff --git a/admin/src/main/java/io/renren/common/validator/group/QiniuGroup.java b/admin/src/main/java/io/renren/common/validator/group/QiniuGroup.java
new file mode 100644
index 0000000..24578aa
--- /dev/null
+++ b/admin/src/main/java/io/renren/common/validator/group/QiniuGroup.java
@@ -0,0 +1,11 @@
+
+
+package io.renren.common.validator.group;
+
+/**
+ * 七牛
+ *
+
+ */
+public interface QiniuGroup {
+}
diff --git a/admin/src/main/java/io/renren/modules/demo/controller/SubjectSelectionController.java b/admin/src/main/java/io/renren/modules/demo/controller/SubjectSelectionController.java
new file mode 100644
index 0000000..5a22ceb
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/controller/SubjectSelectionController.java
@@ -0,0 +1,115 @@
+package io.renren.modules.demo.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.ExcelUtils;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.demo.dto.SubjectSelectionDTO;
+import io.renren.modules.demo.excel.SubjectSelectionExcel;
+import io.renren.modules.demo.service.SubjectSelectionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+@RestController
+@RequestMapping("demo/subjectselection")
+@Tag(name="选题表")
+public class SubjectSelectionController {
+ @Autowired
+ private SubjectSelectionService subjectSelectionService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref="int") ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY,required = true, ref="int") ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref="String") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref="String")
+ })
+ @RequiresPermissions("demo:subjectselection:page")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = subjectSelectionService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("demo:subjectselection:info")
+ public Result get(@PathVariable("id") Long id){
+ SubjectSelectionDTO data = subjectSelectionService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("demo:subjectselection:save")
+ public Result save(@RequestBody SubjectSelectionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ subjectSelectionService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("demo:subjectselection:update")
+ public Result update(@RequestBody SubjectSelectionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ subjectSelectionService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("demo:subjectselection:delete")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ subjectSelectionService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @Operation(summary = "导出")
+ @LogOperation("导出")
+ @RequiresPermissions("demo:subjectselection:export")
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = subjectSelectionService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, "选题表", list, SubjectSelectionExcel.class);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/demo/dao/SubjectSelectionDao.java b/admin/src/main/java/io/renren/modules/demo/dao/SubjectSelectionDao.java
new file mode 100644
index 0000000..0387cbf
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/dao/SubjectSelectionDao.java
@@ -0,0 +1,16 @@
+package io.renren.modules.demo.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.demo.entity.SubjectSelectionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+@Mapper
+public interface SubjectSelectionDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/demo/dto/SubjectSelectionDTO.java b/admin/src/main/java/io/renren/modules/demo/dto/SubjectSelectionDTO.java
new file mode 100644
index 0000000..1e7255d
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/dto/SubjectSelectionDTO.java
@@ -0,0 +1,47 @@
+package io.renren.modules.demo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.SchemaProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+@Data
+@Schema(name = "选题表")
+public class SubjectSelectionDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @SchemaProperty(name = "选题描述")
+ private Long id;
+
+ @SchemaProperty(name = "选题名称")
+ private String title;
+
+ @SchemaProperty(name = "选题描述")
+ private String description;
+
+ @SchemaProperty(name = "选题描述")
+ private String teacher;
+
+ @SchemaProperty(name = "适用专业")
+ private String major;
+
+ @SchemaProperty(name = "选题难度")
+ private String difficulty;
+
+ @SchemaProperty(name = "选题状态")
+ private String status;
+
+ @SchemaProperty(name = "创建时间")
+ private Date createTime;
+
+
+}
diff --git a/admin/src/main/java/io/renren/modules/demo/entity/SubjectSelectionEntity.java b/admin/src/main/java/io/renren/modules/demo/entity/SubjectSelectionEntity.java
new file mode 100644
index 0000000..6232c53
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/entity/SubjectSelectionEntity.java
@@ -0,0 +1,50 @@
+package io.renren.modules.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+@Data
+@TableName("tb_subject_selection")
+public class SubjectSelectionEntity {
+
+ /**
+ * 选题描述
+ */
+ private Long id;
+ /**
+ * 选题名称
+ */
+ private String title;
+ /**
+ * 选题描述
+ */
+ private String description;
+ /**
+ * 选题描述
+ */
+ private String teacher;
+ /**
+ * 适用专业
+ */
+ private String major;
+ /**
+ * 选题难度
+ */
+ private String difficulty;
+ /**
+ * 选题状态
+ */
+ private String status;
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/demo/excel/SubjectSelectionExcel.java b/admin/src/main/java/io/renren/modules/demo/excel/SubjectSelectionExcel.java
new file mode 100644
index 0000000..bbcd8b5
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/excel/SubjectSelectionExcel.java
@@ -0,0 +1,36 @@
+package io.renren.modules.demo.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+@Data
+public class SubjectSelectionExcel {
+ @ExcelProperty(value = "选题描述")
+ private Long id;
+ @ExcelProperty(value = "选题名称")
+ private String title;
+ @ExcelProperty(value = "选题描述")
+ private String description;
+ @ExcelProperty(value = "选题描述")
+ private String teacher;
+ @ExcelProperty(value = "适用专业")
+ private String major;
+ @ExcelProperty(value = "选题难度")
+ private String difficulty;
+ @ExcelProperty(value = "选题状态")
+ private String status;
+ @ExcelProperty(value = "创建时间")
+ private Date createTime;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/demo/service/SubjectSelectionService.java b/admin/src/main/java/io/renren/modules/demo/service/SubjectSelectionService.java
new file mode 100644
index 0000000..c257d22
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/service/SubjectSelectionService.java
@@ -0,0 +1,15 @@
+package io.renren.modules.demo.service;
+
+import io.renren.common.service.CrudService;
+import io.renren.modules.demo.dto.SubjectSelectionDTO;
+import io.renren.modules.demo.entity.SubjectSelectionEntity;
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+public interface SubjectSelectionService extends CrudService {
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/demo/service/impl/SubjectSelectionServiceImpl.java b/admin/src/main/java/io/renren/modules/demo/service/impl/SubjectSelectionServiceImpl.java
new file mode 100644
index 0000000..7c52eac
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/demo/service/impl/SubjectSelectionServiceImpl.java
@@ -0,0 +1,34 @@
+package io.renren.modules.demo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.renren.common.service.impl.CrudServiceImpl;
+import io.renren.modules.demo.dao.SubjectSelectionDao;
+import io.renren.modules.demo.dto.SubjectSelectionDTO;
+import io.renren.modules.demo.entity.SubjectSelectionEntity;
+import io.renren.modules.demo.service.SubjectSelectionService;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 选题表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0 2025-03-06
+ */
+@Service
+public class SubjectSelectionServiceImpl extends CrudServiceImpl implements SubjectSelectionService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ String id = (String)params.get("id");
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StrUtil.isNotBlank(id), "id", id);
+
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/controller/SysLogErrorController.java b/admin/src/main/java/io/renren/modules/log/controller/SysLogErrorController.java
new file mode 100644
index 0000000..fc9d465
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/controller/SysLogErrorController.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.log.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.ExcelUtils;
+import io.renren.common.utils.Result;
+import io.renren.modules.log.dto.SysLogErrorDTO;
+import io.renren.modules.log.excel.SysLogErrorExcel;
+import io.renren.modules.log.service.SysLogErrorService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 异常日志
+ *
+
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("sys/log/error")
+@Tag(name = "异常日志")
+@AllArgsConstructor
+public class SysLogErrorController {
+ private final SysLogErrorService sysLogErrorService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:log:error")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ PageData page = sysLogErrorService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("export")
+ @Operation(summary = "导出")
+ @LogOperation("导出")
+ @RequiresPermissions("sys:log:error")
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysLogErrorService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, "异常日志", list, SysLogErrorExcel.class);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/controller/SysLogLoginController.java b/admin/src/main/java/io/renren/modules/log/controller/SysLogLoginController.java
new file mode 100644
index 0000000..4c587d6
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/controller/SysLogLoginController.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.log.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.ExcelUtils;
+import io.renren.common.utils.Result;
+import io.renren.modules.log.dto.SysLogLoginDTO;
+import io.renren.modules.log.excel.SysLogLoginExcel;
+import io.renren.modules.log.service.SysLogLoginService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 登录日志
+ *
+
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("sys/log/login")
+@Tag(name = "登录日志")
+@AllArgsConstructor
+public class SysLogLoginController {
+ private final SysLogLoginService sysLogLoginService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "status", description = "状态 0：失败 1：成功 2：账号已锁定", in = ParameterIn.QUERY, ref = "int"),
+ @Parameter(name = "creatorName", description = "用户名", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:log:login")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ PageData page = sysLogLoginService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("export")
+ @Operation(summary = "导出")
+ @LogOperation("导出")
+ @Parameters({
+ @Parameter(name = "status", description = "状态 0：失败 1：成功 2：账号已锁定", in = ParameterIn.QUERY, ref = "int"),
+ @Parameter(name = "creatorName", description = "用户名", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:log:login")
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysLogLoginService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, "登录日志", list, SysLogLoginExcel.class);
+
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/controller/SysLogOperationController.java b/admin/src/main/java/io/renren/modules/log/controller/SysLogOperationController.java
new file mode 100644
index 0000000..b604608
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/controller/SysLogOperationController.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.log.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.ExcelUtils;
+import io.renren.common.utils.Result;
+import io.renren.modules.log.dto.SysLogOperationDTO;
+import io.renren.modules.log.excel.SysLogOperationExcel;
+import io.renren.modules.log.service.SysLogOperationService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 操作日志
+ *
+
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("sys/log/operation")
+@Tag(name = "操作日志")
+@AllArgsConstructor
+public class SysLogOperationController {
+ private final SysLogOperationService sysLogOperationService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "status", description = "状态 0：失败 1：成功", in = ParameterIn.QUERY, ref = "int")
+ })
+ @RequiresPermissions("sys:log:operation")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ PageData page = sysLogOperationService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("export")
+ @Operation(summary = "导出")
+ @LogOperation("导出")
+ @RequiresPermissions("sys:log:operation")
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysLogOperationService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, "操作日志", list, SysLogOperationExcel.class);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/dao/SysLogErrorDao.java b/admin/src/main/java/io/renren/modules/log/dao/SysLogErrorDao.java
new file mode 100644
index 0000000..00211e9
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/dao/SysLogErrorDao.java
@@ -0,0 +1,18 @@
+
+
+package io.renren.modules.log.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.log.entity.SysLogErrorEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 异常日志
+ *
+
+ * @since 1.0.0
+ */
+@Mapper
+public interface SysLogErrorDao extends BaseDao {
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/dao/SysLogLoginDao.java b/admin/src/main/java/io/renren/modules/log/dao/SysLogLoginDao.java
new file mode 100644
index 0000000..d19d0e8
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/dao/SysLogLoginDao.java
@@ -0,0 +1,18 @@
+
+
+package io.renren.modules.log.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.log.entity.SysLogLoginEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 登录日志
+ *
+
+ * @since 1.0.0
+ */
+@Mapper
+public interface SysLogLoginDao extends BaseDao {
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/dao/SysLogOperationDao.java b/admin/src/main/java/io/renren/modules/log/dao/SysLogOperationDao.java
new file mode 100644
index 0000000..c6d9c47
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/dao/SysLogOperationDao.java
@@ -0,0 +1,18 @@
+
+
+package io.renren.modules.log.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.log.entity.SysLogOperationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 操作日志
+ *
+
+ * @since 1.0.0
+ */
+@Mapper
+public interface SysLogOperationDao extends BaseDao {
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/dto/SysLogErrorDTO.java b/admin/src/main/java/io/renren/modules/log/dto/SysLogErrorDTO.java
new file mode 100644
index 0000000..c96905d
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/dto/SysLogErrorDTO.java
@@ -0,0 +1,39 @@
+
+
+package io.renren.modules.log.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 异常日志
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "异常日志")
+public class SysLogErrorDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ private Long id;
+ @Schema(title = "请求URI")
+ private String requestUri;
+ @Schema(title = "请求方式")
+ private String requestMethod;
+ @Schema(title = "请求参数")
+ private String requestParams;
+ @Schema(title = "用户代理")
+ private String userAgent;
+ @Schema(title = "操作IP")
+ private String ip;
+ @Schema(title = "异常信息")
+ private String errorInfo;
+ @Schema(title = "创建时间")
+ private Date createDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/dto/SysLogLoginDTO.java b/admin/src/main/java/io/renren/modules/log/dto/SysLogLoginDTO.java
new file mode 100644
index 0000000..3335503
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/dto/SysLogLoginDTO.java
@@ -0,0 +1,43 @@
+
+
+package io.renren.modules.log.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 登录日志
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "登录日志")
+public class SysLogLoginDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ private Long id;
+
+ @Schema(title = "用户操作 0：用户登录 1：用户退出")
+ private Integer operation;
+
+ @Schema(title = "状态 0：失败 1：成功 2：账号已锁定")
+ private Integer status;
+
+ @Schema(title = "用户代理")
+ private String userAgent;
+
+ @Schema(title = "操作IP")
+ private String ip;
+
+ @Schema(title = "用户名")
+ private String creatorName;
+
+ @Schema(title = "创建时间")
+ private Date createDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/dto/SysLogOperationDTO.java b/admin/src/main/java/io/renren/modules/log/dto/SysLogOperationDTO.java
new file mode 100644
index 0000000..1c219ce
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/dto/SysLogOperationDTO.java
@@ -0,0 +1,55 @@
+
+
+package io.renren.modules.log.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 操作日志
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "操作日志")
+public class SysLogOperationDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ private Long id;
+
+ @Schema(title = "用户操作")
+ private String operation;
+
+ @Schema(title = "请求URI")
+ private String requestUri;
+
+ @Schema(title = "请求方式")
+ private String requestMethod;
+
+ @Schema(title = "请求参数")
+ private String requestParams;
+
+ @Schema(title = "请求时长(毫秒)")
+ private Integer requestTime;
+
+ @Schema(title = "用户代理")
+ private String userAgent;
+
+ @Schema(title = "操作IP")
+ private String ip;
+
+ @Schema(title = "状态 0：失败 1：成功")
+ private Integer status;
+
+ @Schema(title = "用户名")
+ private String creatorName;
+
+ @Schema(title = "创建时间")
+ private Date createDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/entity/SysLogErrorEntity.java b/admin/src/main/java/io/renren/modules/log/entity/SysLogErrorEntity.java
new file mode 100644
index 0000000..627c529
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/entity/SysLogErrorEntity.java
@@ -0,0 +1,47 @@
+
+
+package io.renren.modules.log.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常日志
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_log_error")
+public class SysLogErrorEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 请求URI
+ */
+ private String requestUri;
+ /**
+ * 请求方式
+ */
+ private String requestMethod;
+ /**
+ * 请求参数
+ */
+ private String requestParams;
+ /**
+ * 用户代理
+ */
+ private String userAgent;
+ /**
+ * 操作IP
+ */
+ private String ip;
+ /**
+ * 异常信息
+ */
+ private String errorInfo;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/entity/SysLogLoginEntity.java b/admin/src/main/java/io/renren/modules/log/entity/SysLogLoginEntity.java
new file mode 100644
index 0000000..f2affd6
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/entity/SysLogLoginEntity.java
@@ -0,0 +1,43 @@
+
+
+package io.renren.modules.log.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 登录日志
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_log_login")
+public class SysLogLoginEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户操作 0：用户登录 1：用户退出
+ */
+ private Integer operation;
+ /**
+ * 状态 0：失败 1：成功 2：账号已锁定
+ */
+ private Integer status;
+ /**
+ * 用户代理
+ */
+ private String userAgent;
+ /**
+ * 操作IP
+ */
+ private String ip;
+ /**
+ * 用户名
+ */
+ private String creatorName;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/entity/SysLogOperationEntity.java b/admin/src/main/java/io/renren/modules/log/entity/SysLogOperationEntity.java
new file mode 100644
index 0000000..47388c1
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/entity/SysLogOperationEntity.java
@@ -0,0 +1,58 @@
+
+
+package io.renren.modules.log.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 操作日志
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_log_operation")
+public class SysLogOperationEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户操作
+ */
+ private String operation;
+ /**
+ * 请求URI
+ */
+ private String requestUri;
+ /**
+ * 请求方式
+ */
+ private String requestMethod;
+ /**
+ * 请求参数
+ */
+ private String requestParams;
+ /**
+ * 请求时长(毫秒)
+ */
+ private Integer requestTime;
+ /**
+ * 用户代理
+ */
+ private String userAgent;
+ /**
+ * 操作IP
+ */
+ private String ip;
+ /**
+ * 状态 0：失败 1：成功
+ */
+ private Integer status;
+ /**
+ * 用户名
+ */
+ private String creatorName;
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/enums/LoginOperationEnum.java b/admin/src/main/java/io/renren/modules/log/enums/LoginOperationEnum.java
new file mode 100644
index 0000000..83f6ba7
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/enums/LoginOperationEnum.java
@@ -0,0 +1,30 @@
+
+
+package io.renren.modules.log.enums;
+
+/**
+ * 登录操作枚举
+ *
+
+ * @since 1.0.0
+ */
+public enum LoginOperationEnum {
+ /**
+ * 用户登录
+ */
+ LOGIN(0),
+ /**
+ * 用户退出
+ */
+ LOGOUT(1);
+
+ private int value;
+
+ LoginOperationEnum(int value) {
+ this.value = value;
+ }
+
+ public int value() {
+ return this.value;
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/enums/LoginStatusEnum.java b/admin/src/main/java/io/renren/modules/log/enums/LoginStatusEnum.java
new file mode 100644
index 0000000..2fef5c4
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/enums/LoginStatusEnum.java
@@ -0,0 +1,34 @@
+
+
+package io.renren.modules.log.enums;
+
+/**
+ * 登录状态枚举
+ *
+
+ * @since 1.0.0
+ */
+public enum LoginStatusEnum {
+ /**
+ * 失败
+ */
+ FAIL(0),
+ /**
+ * 成功
+ */
+ SUCCESS(1),
+ /**
+ * 账号已锁定
+ */
+ LOCK(2);
+
+ private int value;
+
+ LoginStatusEnum(int value) {
+ this.value = value;
+ }
+
+ public int value() {
+ return this.value;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/log/enums/OperationStatusEnum.java b/admin/src/main/java/io/renren/modules/log/enums/OperationStatusEnum.java
new file mode 100644
index 0000000..95eae33
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/enums/OperationStatusEnum.java
@@ -0,0 +1,30 @@
+
+
+package io.renren.modules.log.enums;
+
+/**
+ * 操作状态枚举
+ *
+
+ * @since 1.0.0
+ */
+public enum OperationStatusEnum {
+ /**
+ * 失败
+ */
+ FAIL(0),
+ /**
+ * 成功
+ */
+ SUCCESS(1);
+
+ private int value;
+
+ OperationStatusEnum(int value) {
+ this.value = value;
+ }
+
+ public int value() {
+ return this.value;
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/excel/SysLogErrorExcel.java b/admin/src/main/java/io/renren/modules/log/excel/SysLogErrorExcel.java
new file mode 100644
index 0000000..db882b5
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/excel/SysLogErrorExcel.java
@@ -0,0 +1,43 @@
+
+
+package io.renren.modules.log.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 异常日志
+ *
+
+ */
+@Data
+@ContentRowHeight(20)
+@HeadRowHeight(20)
+@ColumnWidth(25)
+public class SysLogErrorExcel {
+ @ExcelProperty("请求URI")
+ private String requestUri;
+
+ @ExcelProperty("请求方式")
+ private String requestMethod;
+
+ @ExcelProperty("请求参数")
+ private String requestParams;
+
+ @ExcelProperty("User-Agent")
+ private String userAgent;
+
+ @ExcelProperty("操作IP")
+ private String ip;
+
+ @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty("创建时间")
+ private Date createDate;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/excel/SysLogLoginExcel.java b/admin/src/main/java/io/renren/modules/log/excel/SysLogLoginExcel.java
new file mode 100644
index 0000000..f36c927
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/excel/SysLogLoginExcel.java
@@ -0,0 +1,45 @@
+
+
+package io.renren.modules.log.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.renren.modules.log.excel.converter.SysLogOperationConverter;
+import io.renren.modules.log.excel.converter.SysLogStatusConverter;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 登录日志
+ *
+
+ */
+@Data
+@ContentRowHeight(20)
+@HeadRowHeight(20)
+@ColumnWidth(25)
+public class SysLogLoginExcel {
+ @ExcelProperty(value = "操作类型", converter = SysLogOperationConverter.class)
+ private Integer operation;
+
+ @ExcelProperty(value = "状态", converter = SysLogStatusConverter.class)
+ private Integer status;
+
+ @ExcelProperty("User-Agent")
+ private String userAgent;
+
+ @ExcelProperty("操作IP")
+ private String ip;
+
+ @ExcelProperty("用户名")
+ private String creatorName;
+
+ @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty("创建时间")
+ private Date createDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/excel/SysLogOperationExcel.java b/admin/src/main/java/io/renren/modules/log/excel/SysLogOperationExcel.java
new file mode 100644
index 0000000..d99b66b
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/excel/SysLogOperationExcel.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.log.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 操作日志
+ *
+
+ */
+@Data
+@ContentRowHeight(20)
+@HeadRowHeight(20)
+@ColumnWidth(25)
+public class SysLogOperationExcel {
+ @ExcelProperty("用户操作")
+ private String operation;
+
+ @ExcelProperty("请求URI")
+ private String requestUri;
+
+ @ExcelProperty("请求方式")
+ private String requestMethod;
+
+ @ExcelProperty("请求参数")
+ private String requestParams;
+
+ @ExcelProperty("请求时长(毫秒)")
+ private Integer requestTime;
+
+ @ExcelProperty("User-Agent")
+ private String userAgent;
+
+ @ExcelProperty("操作IP")
+ private String ip;
+
+ @ExcelProperty("状态")
+ private Integer status;
+
+ @ExcelProperty("用户名")
+ private String creatorName;
+
+ @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty("创建时间")
+ private Date createDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/excel/converter/SysLogOperationConverter.java b/admin/src/main/java/io/renren/modules/log/excel/converter/SysLogOperationConverter.java
new file mode 100644
index 0000000..195ea6f
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/excel/converter/SysLogOperationConverter.java
@@ -0,0 +1,40 @@
+package io.renren.modules.log.excel.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class SysLogOperationConverter implements Converter {
+
+ @Override
+ public Class supportJavaTypeKey() {
+ return Integer.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if(cellData.getStringValue().equals("用户登录")){
+ return 0;
+ }else{
+ return 1;
+ }
+ }
+
+ @Override
+ public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if(value == 0){
+ return new WriteCellData<>("用户登录");
+ }else{
+ return new WriteCellData<>("用户退出");
+ }
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/excel/converter/SysLogStatusConverter.java b/admin/src/main/java/io/renren/modules/log/excel/converter/SysLogStatusConverter.java
new file mode 100644
index 0000000..32d3037
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/excel/converter/SysLogStatusConverter.java
@@ -0,0 +1,48 @@
+package io.renren.modules.log.excel.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class SysLogStatusConverter implements Converter {
+
+ @Override
+ public Class supportJavaTypeKey() {
+ return Integer.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if(cellData.getStringValue().equals("失败")){
+ return 0;
+ }else if(cellData.getStringValue().equals("成功")){
+ return 1;
+ }else if(cellData.getStringValue().equals("账号已锁定")){
+ return 2;
+ }else{
+ return -1;
+ }
+ }
+
+ @Override
+ public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if(value == 0){
+ return new WriteCellData<>("失败");
+ }else if(value == 1){
+ return new WriteCellData<>("成功");
+ }else if(value == 2){
+ return new WriteCellData<>("账号已锁定");
+ }else{
+ return new WriteCellData<>("未知");
+ }
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/log/service/SysLogErrorService.java b/admin/src/main/java/io/renren/modules/log/service/SysLogErrorService.java
new file mode 100644
index 0000000..76ac359
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/service/SysLogErrorService.java
@@ -0,0 +1,28 @@
+
+
+package io.renren.modules.log.service;
+
+
+import io.renren.common.page.PageData;
+import io.renren.common.service.BaseService;
+import io.renren.modules.log.dto.SysLogErrorDTO;
+import io.renren.modules.log.entity.SysLogErrorEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 异常日志
+ *
+
+ * @since 1.0.0
+ */
+public interface SysLogErrorService extends BaseService {
+
+ PageData page(Map params);
+
+ List list(Map params);
+
+ void save(SysLogErrorEntity entity);
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/service/SysLogLoginService.java b/admin/src/main/java/io/renren/modules/log/service/SysLogLoginService.java
new file mode 100644
index 0000000..522e4c0
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/service/SysLogLoginService.java
@@ -0,0 +1,26 @@
+
+
+package io.renren.modules.log.service;
+
+import io.renren.common.page.PageData;
+import io.renren.common.service.BaseService;
+import io.renren.modules.log.dto.SysLogLoginDTO;
+import io.renren.modules.log.entity.SysLogLoginEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 登录日志
+ *
+
+ * @since 1.0.0
+ */
+public interface SysLogLoginService extends BaseService {
+
+ PageData page(Map params);
+
+ List list(Map params);
+
+ void save(SysLogLoginEntity entity);
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/service/SysLogOperationService.java b/admin/src/main/java/io/renren/modules/log/service/SysLogOperationService.java
new file mode 100644
index 0000000..a74b167
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/service/SysLogOperationService.java
@@ -0,0 +1,26 @@
+
+
+package io.renren.modules.log.service;
+
+import io.renren.common.page.PageData;
+import io.renren.common.service.BaseService;
+import io.renren.modules.log.dto.SysLogOperationDTO;
+import io.renren.modules.log.entity.SysLogOperationEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 操作日志
+ *
+
+ * @since 1.0.0
+ */
+public interface SysLogOperationService extends BaseService {
+
+ PageData page(Map params);
+
+ List list(Map params);
+
+ void save(SysLogOperationEntity entity);
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/service/impl/SysLogErrorServiceImpl.java b/admin/src/main/java/io/renren/modules/log/service/impl/SysLogErrorServiceImpl.java
new file mode 100644
index 0000000..fe66668
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/service/impl/SysLogErrorServiceImpl.java
@@ -0,0 +1,58 @@
+
+
+package io.renren.modules.log.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.service.impl.BaseServiceImpl;
+import io.renren.common.utils.ConvertUtils;
+import io.renren.modules.log.dao.SysLogErrorDao;
+import io.renren.modules.log.dto.SysLogErrorDTO;
+import io.renren.modules.log.entity.SysLogErrorEntity;
+import io.renren.modules.log.service.SysLogErrorService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 异常日志
+ *
+
+ * @since 1.0.0
+ */
+@Service
+public class SysLogErrorServiceImpl extends BaseServiceImpl implements SysLogErrorService {
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, Constant.CREATE_DATE, false),
+ getWrapper(params)
+ );
+
+ return getPageData(page, SysLogErrorDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, SysLogErrorDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper<>();
+ return wrapper;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(SysLogErrorEntity entity) {
+ insert(entity);
+ }
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/service/impl/SysLogLoginServiceImpl.java b/admin/src/main/java/io/renren/modules/log/service/impl/SysLogLoginServiceImpl.java
new file mode 100644
index 0000000..337a69d
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/service/impl/SysLogLoginServiceImpl.java
@@ -0,0 +1,65 @@
+
+
+package io.renren.modules.log.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.service.impl.BaseServiceImpl;
+import io.renren.common.utils.ConvertUtils;
+import io.renren.modules.log.dao.SysLogLoginDao;
+import io.renren.modules.log.dto.SysLogLoginDTO;
+import io.renren.modules.log.entity.SysLogLoginEntity;
+import io.renren.modules.log.service.SysLogLoginService;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 登录日志
+ *
+
+ * @since 1.0.0
+ */
+@Service
+public class SysLogLoginServiceImpl extends BaseServiceImpl implements SysLogLoginService {
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, Constant.CREATE_DATE, false),
+ getWrapper(params)
+ );
+
+ return getPageData(page, SysLogLoginDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, SysLogLoginDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String status = (String) params.get("status");
+ String creatorName = (String) params.get("creatorName");
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StrUtil.isNotBlank(status), "status", status);
+ wrapper.like(StrUtil.isNotBlank(creatorName), "creator_name", creatorName);
+
+ return wrapper;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(SysLogLoginEntity entity) {
+ insert(entity);
+ }
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java b/admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
new file mode 100644
index 0000000..acc5301
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
@@ -0,0 +1,63 @@
+
+
+package io.renren.modules.log.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.service.impl.BaseServiceImpl;
+import io.renren.common.utils.ConvertUtils;
+import io.renren.modules.log.dao.SysLogOperationDao;
+import io.renren.modules.log.dto.SysLogOperationDTO;
+import io.renren.modules.log.entity.SysLogOperationEntity;
+import io.renren.modules.log.service.SysLogOperationService;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 操作日志
+ *
+
+ * @since 1.0.0
+ */
+@Service
+public class SysLogOperationServiceImpl extends BaseServiceImpl implements SysLogOperationService {
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, Constant.CREATE_DATE, false),
+ getWrapper(params)
+ );
+
+ return getPageData(page, SysLogOperationDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, SysLogOperationDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String status = (String) params.get("status");
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StrUtil.isNotBlank(status), "status", status);
+
+ return wrapper;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(SysLogOperationEntity entity) {
+ insert(entity);
+ }
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/config/FilterConfig.java b/admin/src/main/java/io/renren/modules/security/config/FilterConfig.java
new file mode 100644
index 0000000..60af59e
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/config/FilterConfig.java
@@ -0,0 +1,43 @@
+
+
+package io.renren.modules.security.config;
+
+import io.renren.common.xss.XssFilter;
+import jakarta.servlet.DispatcherType;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.DelegatingFilterProxy;
+
+
+/**
+ * Filter配置
+ *
+
+ */
+@Configuration
+public class FilterConfig {
+
+ @Bean
+ public FilterRegistrationBean shiroFilterRegistration() {
+ FilterRegistrationBean registration = new FilterRegistrationBean();
+ registration.setFilter(new DelegatingFilterProxy("shiroFilter"));
+ //该值缺省为false，表示生命周期由SpringApplicationContext管理，设置为true则表示由ServletContainer管理
+ registration.addInitParameter("targetFilterLifecycle", "true");
+ registration.setEnabled(true);
+ registration.setOrder(Integer.MAX_VALUE - 1);
+ registration.addUrlPatterns("/*");
+ return registration;
+ }
+
+ @Bean
+ public FilterRegistrationBean xssFilterRegistration() {
+ FilterRegistrationBean registration = new FilterRegistrationBean();
+ registration.setDispatcherTypes(DispatcherType.REQUEST);
+ registration.setFilter(new XssFilter());
+ registration.addUrlPatterns("/*");
+ registration.setName("xssFilter");
+ registration.setOrder(Integer.MAX_VALUE);
+ return registration;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java b/admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
new file mode 100644
index 0000000..3c58e94
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
@@ -0,0 +1,85 @@
+
+
+package io.renren.modules.security.config;
+
+import io.renren.modules.security.oauth2.Oauth2Filter;
+import io.renren.modules.security.oauth2.Oauth2Realm;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.session.mgt.SessionManager;
+import org.apache.shiro.spring.LifecycleBeanPostProcessor;
+import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
+import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import jakarta.servlet.Filter;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Shiro的配置文件
+ *
+
+ */
+@Configuration
+public class ShiroConfig {
+
+ @Bean
+ public DefaultWebSessionManager sessionManager(){
+ DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
+ sessionManager.setSessionValidationSchedulerEnabled(false);
+ sessionManager.setSessionIdUrlRewritingEnabled(false);
+
+ return sessionManager;
+ }
+
+ @Bean("securityManager")
+ public SecurityManager securityManager(Oauth2Realm oAuth2Realm, SessionManager sessionManager) {
+ DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
+ securityManager.setRealm(oAuth2Realm);
+ securityManager.setSessionManager(sessionManager);
+ securityManager.setRememberMeManager(null);
+ return securityManager;
+ }
+
+ @Bean("shiroFilter")
+ public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
+ ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
+ shiroFilter.setSecurityManager(securityManager);
+
+ //oauth过滤
+ Map filters = new HashMap<>();
+ filters.put("oauth2", new Oauth2Filter());
+ shiroFilter.setFilters(filters);
+
+ Map filterMap = new LinkedHashMap<>();
+ filterMap.put("/webjars/**", "anon");
+ filterMap.put("/druid/**", "anon");
+ filterMap.put("/login", "anon");
+ filterMap.put("/swagger/**", "anon");
+ filterMap.put("/v3/api-docs/**", "anon");
+ filterMap.put("/doc.html", "anon");
+ filterMap.put("/swagger-resources/**", "anon");
+ filterMap.put("/captcha", "anon");
+ filterMap.put("/favicon.ico", "anon");
+ filterMap.put("/", "anon");
+ filterMap.put("/**", "oauth2");
+ shiroFilter.setFilterChainDefinitionMap(filterMap);
+
+ return shiroFilter;
+ }
+
+ @Bean("lifecycleBeanPostProcessor")
+ public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
+ return new LifecycleBeanPostProcessor();
+ }
+
+ @Bean
+ public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager) {
+ AuthorizationAttributeSourceAdvisor advisor = new AuthorizationAttributeSourceAdvisor();
+ advisor.setSecurityManager(securityManager);
+ return advisor;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/security/config/WebMvcConfig.java b/admin/src/main/java/io/renren/modules/security/config/WebMvcConfig.java
new file mode 100644
index 0000000..076a840
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/config/WebMvcConfig.java
@@ -0,0 +1,67 @@
+
+
+package io.renren.modules.security.config;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.renren.common.utils.DateUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.ByteArrayHttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.ResourceHttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.TimeZone;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+ @Override
+ public void addCorsMappings(CorsRegistry registry) {
+ registry.addMapping("/**")
+ .allowedOriginPatterns("*")
+ .allowCredentials(true)
+ .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+ .maxAge(3600);
+ }
+
+ @Override
+ public void configureMessageConverters(List> converters) {
+ converters.add(new ByteArrayHttpMessageConverter());
+ converters.add(new StringHttpMessageConverter());
+ converters.add(new ResourceHttpMessageConverter());
+ converters.add(new AllEncompassingFormHttpMessageConverter());
+ converters.add(new StringHttpMessageConverter());
+ converters.add(jackson2HttpMessageConverter());
+ }
+
+ @Bean
+ public MappingJackson2HttpMessageConverter jackson2HttpMessageConverter() {
+ MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+ ObjectMapper mapper = new ObjectMapper();
+
+ //日期格式转换
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN));
+ mapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+
+ //Long类型转String类型
+ SimpleModule simpleModule = new SimpleModule();
+ simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+ simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+ mapper.registerModule(simpleModule);
+
+ converter.setObjectMapper(mapper);
+ return converter;
+ }
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/controller/LoginController.java b/admin/src/main/java/io/renren/modules/security/controller/LoginController.java
new file mode 100644
index 0000000..383bf61
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/controller/LoginController.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.security.controller;
+
+import io.renren.common.exception.ErrorCode;
+import io.renren.common.exception.RenException;
+import io.renren.common.utils.IpUtils;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.modules.log.entity.SysLogLoginEntity;
+import io.renren.modules.log.enums.LoginOperationEnum;
+import io.renren.modules.log.enums.LoginStatusEnum;
+import io.renren.modules.log.service.SysLogLoginService;
+import io.renren.modules.security.dto.LoginDTO;
+import io.renren.modules.security.password.PasswordUtils;
+import io.renren.modules.security.service.CaptchaService;
+import io.renren.modules.security.service.SysUserTokenService;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.dto.SysUserDTO;
+import io.renren.modules.sys.enums.UserStatusEnum;
+import io.renren.modules.sys.service.SysUserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * 登录
+ *
+
+ */
+@RestController
+@Tag(name = "登录管理")
+@AllArgsConstructor
+public class LoginController {
+ private final SysUserService sysUserService;
+ private final SysUserTokenService sysUserTokenService;
+ private final CaptchaService captchaService;
+ private final SysLogLoginService sysLogLoginService;
+
+ @GetMapping("captcha")
+ @Operation(summary = "验证码")
+ @Parameter(in = ParameterIn.QUERY, ref = "string", name = "uuid", required = true)
+ public void captcha(HttpServletResponse response, String uuid) throws IOException {
+ //uuid不能为空
+ AssertUtils.isBlank(uuid, ErrorCode.IDENTIFIER_NOT_NULL);
+
+ //生成验证码
+ captchaService.create(response, uuid);
+ }
+
+ @PostMapping("login")
+ @Operation(summary = "登录")
+ public Result login(HttpServletRequest request, @RequestBody LoginDTO login) {
+ //效验数据
+ ValidatorUtils.validateEntity(login);
+
+ //验证码是否正确
+ boolean flag = captchaService.validate(login.getUuid(), login.getCaptcha());
+ if (!flag) {
+ return new Result().error(ErrorCode.CAPTCHA_ERROR);
+ }
+
+ //用户信息
+ SysUserDTO user = sysUserService.getByUsername(login.getUsername());
+
+ SysLogLoginEntity log = new SysLogLoginEntity();
+ log.setOperation(LoginOperationEnum.LOGIN.value());
+ log.setCreateDate(new Date());
+ log.setIp(IpUtils.getIpAddr(request));
+ log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+
+ //用户不存在
+ if (user == null) {
+ log.setStatus(LoginStatusEnum.FAIL.value());
+ log.setCreatorName(login.getUsername());
+ sysLogLoginService.save(log);
+
+ throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
+ }
+
+ //密码错误
+ if (!PasswordUtils.matches(login.getPassword(), user.getPassword())) {
+ log.setStatus(LoginStatusEnum.FAIL.value());
+ log.setCreator(user.getId());
+ log.setCreatorName(user.getUsername());
+ sysLogLoginService.save(log);
+
+ throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
+ }
+
+ //账号停用
+ if (user.getStatus() == UserStatusEnum.DISABLE.value()) {
+ log.setStatus(LoginStatusEnum.LOCK.value());
+ log.setCreator(user.getId());
+ log.setCreatorName(user.getUsername());
+ sysLogLoginService.save(log);
+
+ throw new RenException(ErrorCode.ACCOUNT_DISABLE);
+ }
+
+ //登录成功
+ log.setStatus(LoginStatusEnum.SUCCESS.value());
+ log.setCreator(user.getId());
+ log.setCreatorName(user.getUsername());
+ sysLogLoginService.save(log);
+
+ return sysUserTokenService.createToken(user.getId());
+ }
+
+ @PostMapping("logout")
+ @Operation(summary = "退出")
+ public Result logout(HttpServletRequest request) {
+ UserDetail user = SecurityUser.getUser();
+
+ //退出
+ sysUserTokenService.logout(user.getId());
+
+ //用户信息
+ SysLogLoginEntity log = new SysLogLoginEntity();
+ log.setOperation(LoginOperationEnum.LOGOUT.value());
+ log.setIp(IpUtils.getIpAddr(request));
+ log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+ log.setIp(IpUtils.getIpAddr(request));
+ log.setStatus(LoginStatusEnum.SUCCESS.value());
+ log.setCreator(user.getId());
+ log.setCreatorName(user.getUsername());
+ log.setCreateDate(new Date());
+ sysLogLoginService.save(log);
+
+ return new Result();
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/security/dao/SysUserTokenDao.java b/admin/src/main/java/io/renren/modules/security/dao/SysUserTokenDao.java
new file mode 100644
index 0000000..0bd084a
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/dao/SysUserTokenDao.java
@@ -0,0 +1,23 @@
+
+
+package io.renren.modules.security.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.security.entity.SysUserTokenEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 系统用户Token
+ *
+
+ */
+@Mapper
+public interface SysUserTokenDao extends BaseDao {
+
+ SysUserTokenEntity getByToken(String token);
+
+ SysUserTokenEntity getByUserId(Long userId);
+
+ void updateToken(@Param("userId") Long userId, @Param("token") String token);
+}
diff --git a/admin/src/main/java/io/renren/modules/security/dto/LoginDTO.java b/admin/src/main/java/io/renren/modules/security/dto/LoginDTO.java
new file mode 100644
index 0000000..9840c34
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/dto/LoginDTO.java
@@ -0,0 +1,37 @@
+
+
+package io.renren.modules.security.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 登录表单
+ *
+
+ */
+@Data
+@Schema(title = "登录表单")
+public class LoginDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "用户名", required = true)
+ @NotBlank(message="{sysuser.username.require}")
+ private String username;
+
+ @Schema(title = "密码")
+ @NotBlank(message="{sysuser.password.require}")
+ private String password;
+
+ @Schema(title = "验证码")
+ @NotBlank(message="{sysuser.captcha.require}")
+ private String captcha;
+
+ @Schema(title = "唯一标识")
+ @NotBlank(message="{sysuser.uuid.require}")
+ private String uuid;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/security/entity/SysUserTokenEntity.java b/admin/src/main/java/io/renren/modules/security/entity/SysUserTokenEntity.java
new file mode 100644
index 0000000..c397b0c
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/entity/SysUserTokenEntity.java
@@ -0,0 +1,49 @@
+
+
+package io.renren.modules.security.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统用户Token
+ */
+@Data
+@TableName("sys_user_token")
+public class SysUserTokenEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * id
+ */
+ @TableId
+ private Long id;
+ /**
+ * 用户ID
+ */
+ private Long userId;
+ /**
+ * 用户token
+ */
+ private String token;
+ /**
+ * 过期时间
+ */
+ private Date expireDate;
+ /**
+ * 更新时间
+ */
+ private Date updateDate;
+ /**
+ * 创建时间
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createDate;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java b/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
new file mode 100644
index 0000000..c9ec7a6
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.security.oauth2;
+
+import cn.hutool.core.util.StrUtil;
+import io.renren.common.constant.Constant;
+import io.renren.common.exception.ErrorCode;
+import io.renren.common.utils.HttpContextUtils;
+import io.renren.common.utils.JsonUtils;
+import io.renren.common.utils.Result;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.http.HttpStatus;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.io.IOException;
+
+/**
+ * oauth2过滤器
+ *
+
+ */
+public class Oauth2Filter extends AuthenticatingFilter {
+
+ @Override
+ protected AuthenticationToken createToken(ServletRequest request, ServletResponse response) throws Exception {
+ //获取请求token
+ String token = getRequestToken((HttpServletRequest) request);
+
+ if (StrUtil.isBlank(token)) {
+ return null;
+ }
+
+ return new Oauth2Token(token);
+ }
+
+ @Override
+ protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+ if (((HttpServletRequest) request).getMethod().equals(RequestMethod.OPTIONS.name())) {
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+ //获取请求token，如果token不存在，直接返回401
+ String token = getRequestToken((HttpServletRequest) request);
+ if (StrUtil.isBlank(token)) {
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+ httpResponse.setContentType("application/json;charset=utf-8");
+ httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
+ httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
+
+ String json = JsonUtils.toJsonString(new Result().error(ErrorCode.UNAUTHORIZED));
+
+ httpResponse.getWriter().print(json);
+
+ return false;
+ }
+
+ return executeLogin(request, response);
+ }
+
+ @Override
+ protected boolean onLoginFailure(AuthenticationToken token, AuthenticationException e, ServletRequest request, ServletResponse response) {
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+ httpResponse.setContentType("application/json;charset=utf-8");
+ httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
+ httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
+ try {
+ //处理登录失败的异常
+ Throwable throwable = e.getCause() == null ? e : e.getCause();
+ Result r = new Result().error(HttpStatus.SC_UNAUTHORIZED, throwable.getMessage());
+
+ String json = JsonUtils.toJsonString(r);
+ httpResponse.getWriter().print(json);
+ } catch (IOException e1) {
+
+ }
+
+ return false;
+ }
+
+ /**
+ * 获取请求的token
+ */
+ private String getRequestToken(HttpServletRequest httpRequest) {
+ //从header中获取token
+ String token = httpRequest.getHeader(Constant.TOKEN_HEADER);
+
+ //如果header中不存在token，则从参数中获取token
+ if (StrUtil.isBlank(token)) {
+ token = httpRequest.getParameter(Constant.TOKEN_HEADER);
+ }
+
+ return token;
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Realm.java b/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Realm.java
new file mode 100644
index 0000000..53bb527
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Realm.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.security.oauth2;
+
+import io.renren.common.exception.ErrorCode;
+import io.renren.common.utils.ConvertUtils;
+import io.renren.common.utils.MessageUtils;
+import io.renren.modules.security.entity.SysUserTokenEntity;
+import io.renren.modules.security.service.ShiroService;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.entity.SysUserEntity;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authc.*;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 认证
+ *
+
+ */
+@Component
+@AllArgsConstructor
+public class Oauth2Realm extends AuthorizingRealm {
+ private final ShiroService shiroService;
+
+ @Override
+ public boolean supports(AuthenticationToken token) {
+ return token instanceof Oauth2Token;
+ }
+
+ /**
+ * 授权(验证权限时调用)
+ */
+ @Override
+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+ UserDetail user = (UserDetail) principals.getPrimaryPrincipal();
+
+ //用户权限列表
+ Set permsSet = shiroService.getUserPermissions(user);
+
+ SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
+ info.setStringPermissions(permsSet);
+ return info;
+ }
+
+ /**
+ * 认证(登录时调用)
+ */
+ @Override
+ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
+ String accessToken = (String) token.getPrincipal();
+
+ //根据accessToken，查询用户信息
+ SysUserTokenEntity tokenEntity = shiroService.getByToken(accessToken);
+ //token失效
+ if (tokenEntity == null || tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()) {
+ throw new IncorrectCredentialsException(MessageUtils.getMessage(ErrorCode.TOKEN_INVALID));
+ }
+
+ //查询用户信息
+ SysUserEntity userEntity = shiroService.getUser(tokenEntity.getUserId());
+
+ //转换成UserDetail对象
+ UserDetail userDetail = ConvertUtils.sourceToTarget(userEntity, UserDetail.class);
+
+ //获取用户对应的部门数据权限
+ List deptIdList = shiroService.getDataScopeList(userDetail.getId());
+ userDetail.setDeptIdList(deptIdList);
+
+ //账号锁定
+ if (userDetail.getStatus() == 0) {
+ throw new LockedAccountException(MessageUtils.getMessage(ErrorCode.ACCOUNT_LOCK));
+ }
+
+ SimpleAuthenticationInfo info = new SimpleAuthenticationInfo(userDetail, accessToken, getName());
+ return info;
+ }
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Token.java b/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Token.java
new file mode 100644
index 0000000..d65a4a3
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Token.java
@@ -0,0 +1,28 @@
+
+
+package io.renren.modules.security.oauth2;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+/**
+ * token
+ *
+
+ */
+public class Oauth2Token implements AuthenticationToken {
+ private String token;
+
+ public Oauth2Token(String token){
+ this.token = token;
+ }
+
+ @Override
+ public String getPrincipal() {
+ return token;
+ }
+
+ @Override
+ public Object getCredentials() {
+ return token;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/security/oauth2/TokenGenerator.java b/admin/src/main/java/io/renren/modules/security/oauth2/TokenGenerator.java
new file mode 100644
index 0000000..54e363d
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/oauth2/TokenGenerator.java
@@ -0,0 +1,46 @@
+
+
+package io.renren.modules.security.oauth2;
+
+import io.renren.common.exception.RenException;
+
+import java.security.MessageDigest;
+import java.util.UUID;
+
+/**
+ * 生成token
+ *
+
+ */
+public class TokenGenerator {
+
+ public static String generateValue() {
+ return generateValue(UUID.randomUUID().toString());
+ }
+
+ private static final char[] HEX_CODE = "0123456789abcdef".toCharArray();
+
+ public static String toHexString(byte[] data) {
+ if(data == null) {
+ return null;
+ }
+ StringBuilder r = new StringBuilder(data.length*2);
+ for ( byte b : data) {
+ r.append(HEX_CODE[(b >> 4) & 0xF]);
+ r.append(HEX_CODE[(b & 0xF)]);
+ }
+ return r.toString();
+ }
+
+ public static String generateValue(String param) {
+ try {
+ MessageDigest algorithm = MessageDigest.getInstance("MD5");
+ algorithm.reset();
+ algorithm.update(param.getBytes());
+ byte[] messageDigest = algorithm.digest();
+ return toHexString(messageDigest);
+ } catch (Exception e) {
+ throw new RenException("token invalid", e);
+ }
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/security/password/BCrypt.java b/admin/src/main/java/io/renren/modules/security/password/BCrypt.java
new file mode 100644
index 0000000..1383c38
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/password/BCrypt.java
@@ -0,0 +1,662 @@
+package io.renren.modules.security.password;
+
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.SecureRandom;
+
+/**
+ * BCrypt implements OpenBSD-style Blowfish password hashing using the scheme described in
+ * "A Future-Adaptable Password Scheme" by Niels Provos and David Mazieres.
+ *
+ * This password hashing system tries to thwart off-line password cracking using a
+ * computationally-intensive hashing algorithm, based on Bruce Schneier's Blowfish cipher.
+ * The work factor of the algorithm is parameterised, so it can be increased as computers
+ * get faster.
+ *
+ * Usage is really simple. To hash a password for the first time, call the hashpw method
+ * with a random salt, like this:
+ *
+ *
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
+ *
+ *
+ * To check whether a plaintext password matches one that has been hashed previously, use
+ * the checkpw method:
+ *
+ *
+ * if (BCrypt.checkpw(candidate_password, stored_hash))
+ * System.out.println("It matches");
+ * else
+ * System.out.println("It does not match");
+ *
+ *
+ * The gensalt() method takes an optional parameter (log_rounds) that determines the
+ * computational complexity of the hashing:
+ *
+ *
+ * String strong_salt = BCrypt.gensalt(10)
+ * String stronger_salt = BCrypt.gensalt(12)
+ *
+ *
+ * The amount of work increases exponentially (2**log_rounds), so each increment is twice
+ * as much work. The default log_rounds is 10, and the valid range is 4 to 31.
+ *
+ * @author Damien Miller
+ */
+public class BCrypt {
+ // BCrypt parameters
+
+ private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
+ private static final int BCRYPT_SALT_LEN = 16;
+ // Blowfish parameters
+ private static final int BLOWFISH_NUM_ROUNDS = 16;
+ // Initial contents of key schedule
+ private static final int P_orig[] = { 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+ 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377,
+ 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+ 0x9216d5d9, 0x8979fb1b };
+ private static final int S_orig[] = { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7,
+ 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5,
+ 0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27,
+ 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993,
+ 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af,
+ 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5,
+ 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68,
+ 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4,
+ 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248,
+ 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4,
+ 0x5e5c9ec2, 0x196a2463, 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd,
+ 0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc,
+ 0x8ea5e9f8, 0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0,
+ 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8,
+ 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01,
+ 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64,
+ 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8,
+ 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86,
+ 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e,
+ 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a,
+ 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6,
+ 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d,
+ 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+ 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65,
+ 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
+ 0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+ 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d,
+ 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
+ 0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+ 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
+ 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124,
+ 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+ 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908,
+ 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b,
+ 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+ 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
+ 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d,
+ 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+ 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5,
+ 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96,
+ 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+ 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
+ 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
+ 0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+ 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054,
+ 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
+ 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+ 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646,
+ 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea,
+ 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+ 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
+ 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd,
+ 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+ 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, 0xe93d5a68, 0x948140f7,
+ 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546,
+ 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+ 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941,
+ 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c,
+ 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+ 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856,
+ 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87,
+ 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+ 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70,
+ 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1,
+ 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+ 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1,
+ 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa,
+ 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+ 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510, 0x6d672c37,
+ 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24,
+ 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+ 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, 0x6a124237, 0xb79251e7,
+ 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f,
+ 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+ 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71,
+ 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74,
+ 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+ 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0,
+ 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df,
+ 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+ 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641,
+ 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de,
+ 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+ 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5,
+ 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212,
+ 0x670efa8e, 0x406000e0, 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+ 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315,
+ 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d,
+ 0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+ 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6,
+ 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da,
+ 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+ 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d,
+ 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc,
+ 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+ 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2,
+ 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8,
+ 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+ 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46,
+ 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40,
+ 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+ 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e,
+ 0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d,
+ 0x06b89fb4, 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+ 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b,
+ 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667,
+ 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+ 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb,
+ 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df,
+ 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+ 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891,
+ 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5,
+ 0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+ 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00,
+ 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76,
+ 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+ 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0,
+ 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 };
+ // bcrypt IV: "OrpheanBeholderScryDoubt"
+ static private final int bf_crypt_ciphertext[] = { 0x4f727068, 0x65616e42,
+ 0x65686f6c, 0x64657253, 0x63727944, 0x6f756274 };
+ // Table for Base64 encoding
+ static private final char base64_code[] = { '.', '/', 'A', 'B', 'C', 'D', 'E', 'F',
+ 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+ 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+ 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+ // Table for Base64 decoding
+ static private final byte index_64[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ -1, -1, -1, -1, -1, -1, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, -1, -1, -1, -1, -1 };
+ static final int MIN_LOG_ROUNDS = 4;
+ static final int MAX_LOG_ROUNDS = 31;
+ // Expanded Blowfish key
+ private int P[];
+ private int S[];
+
+ /**
+ * Encode a byte array using bcrypt's slightly-modified base64 encoding scheme. Note
+ * that this is not compatible with the standard MIME-base64
+ * encoding.
+ *
+ * @param d the byte array to encode
+ * @param len the number of bytes to encode
+ * @param rs the destination buffer for the base64-encoded string
+ * @exception IllegalArgumentException if the length is invalid
+ */
+ static void encode_base64(byte d[], int len, StringBuilder rs)
+ throws IllegalArgumentException {
+ int off = 0;
+ int c1, c2;
+
+ if (len <= 0 || len > d.length) {
+ throw new IllegalArgumentException("Invalid len");
+ }
+
+ while (off < len) {
+ c1 = d[off++] & 0xff;
+ rs.append(base64_code[(c1 >> 2) & 0x3f]);
+ c1 = (c1 & 0x03) << 4;
+ if (off >= len) {
+ rs.append(base64_code[c1 & 0x3f]);
+ break;
+ }
+ c2 = d[off++] & 0xff;
+ c1 |= (c2 >> 4) & 0x0f;
+ rs.append(base64_code[c1 & 0x3f]);
+ c1 = (c2 & 0x0f) << 2;
+ if (off >= len) {
+ rs.append(base64_code[c1 & 0x3f]);
+ break;
+ }
+ c2 = d[off++] & 0xff;
+ c1 |= (c2 >> 6) & 0x03;
+ rs.append(base64_code[c1 & 0x3f]);
+ rs.append(base64_code[c2 & 0x3f]);
+ }
+ }
+
+ /**
+ * Look up the 3 bits base64-encoded by the specified character, range-checking
+ * against conversion table
+ * @param x the base64-encoded value
+ * @return the decoded value of x
+ */
+ private static byte char64(char x) {
+ if (x > index_64.length) {
+ return -1;
+ }
+ return index_64[x];
+ }
+
+ /**
+ * Decode a string encoded using bcrypt's base64 scheme to a byte array. Note that
+ * this is *not* compatible with the standard MIME-base64 encoding.
+ * @param s the string to decode
+ * @param maxolen the maximum number of bytes to decode
+ * @return an array containing the decoded bytes
+ * @throws IllegalArgumentException if maxolen is invalid
+ */
+ static byte[] decode_base64(String s, int maxolen) throws IllegalArgumentException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream(maxolen);
+ int off = 0, slen = s.length(), olen = 0;
+ byte c1, c2, c3, c4, o;
+
+ if (maxolen <= 0) {
+ throw new IllegalArgumentException("Invalid maxolen");
+ }
+
+ while (off < slen - 1 && olen < maxolen) {
+ c1 = char64(s.charAt(off++));
+ c2 = char64(s.charAt(off++));
+ if (c1 == -1 || c2 == -1) {
+ break;
+ }
+ o = (byte) (c1 << 2);
+ o |= (c2 & 0x30) >> 4;
+ out.write(o);
+ if (++olen >= maxolen || off >= slen) {
+ break;
+ }
+ c3 = char64(s.charAt(off++));
+ if (c3 == -1) {
+ break;
+ }
+ o = (byte) ((c2 & 0x0f) << 4);
+ o |= (c3 & 0x3c) >> 2;
+ out.write(o);
+ if (++olen >= maxolen || off >= slen) {
+ break;
+ }
+ c4 = char64(s.charAt(off++));
+ o = (byte) ((c3 & 0x03) << 6);
+ o |= c4;
+ out.write(o);
+ ++olen;
+ }
+
+ return out.toByteArray();
+ }
+
+ /**
+ * Blowfish encipher a single 64-bit block encoded as two 32-bit halves
+ * @param lr an array containing the two 32-bit half blocks
+ * @param off the position in the array of the blocks
+ */
+ private final void encipher(int lr[], int off) {
+ int i, n, l = lr[off], r = lr[off + 1];
+
+ l ^= P[0];
+ for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
+ // Feistel substitution on left word
+ n = S[(l >> 24) & 0xff];
+ n += S[0x100 | ((l >> 16) & 0xff)];
+ n ^= S[0x200 | ((l >> 8) & 0xff)];
+ n += S[0x300 | (l & 0xff)];
+ r ^= n ^ P[++i];
+
+ // Feistel substitution on right word
+ n = S[(r >> 24) & 0xff];
+ n += S[0x100 | ((r >> 16) & 0xff)];
+ n ^= S[0x200 | ((r >> 8) & 0xff)];
+ n += S[0x300 | (r & 0xff)];
+ l ^= n ^ P[++i];
+ }
+ lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
+ lr[off + 1] = l;
+ }
+
+ /**
+ * Cycically extract a word of key material
+ * @param data the string to extract the data from
+ * @param offp a "pointer" (as a one-entry array) to the current offset into data
+ * @return the next word of material from data
+ */
+ private static int streamtoword(byte data[], int offp[]) {
+ int i;
+ int word = 0;
+ int off = offp[0];
+
+ for (i = 0; i < 4; i++) {
+ word = (word << 8) | (data[off] & 0xff);
+ off = (off + 1) % data.length;
+ }
+
+ offp[0] = off;
+ return word;
+ }
+
+ /**
+ * Initialise the Blowfish key schedule
+ */
+ private void init_key() {
+ P = (int[]) P_orig.clone();
+ S = (int[]) S_orig.clone();
+ }
+
+ /**
+ * Key the Blowfish cipher
+ * @param key an array containing the key
+ */
+ private void key(byte key[]) {
+ int i;
+ int koffp[] = { 0 };
+ int lr[] = { 0, 0 };
+ int plen = P.length, slen = S.length;
+
+ for (i = 0; i < plen; i++) {
+ P[i] = P[i] ^ streamtoword(key, koffp);
+ }
+
+ for (i = 0; i < plen; i += 2) {
+ encipher(lr, 0);
+ P[i] = lr[0];
+ P[i + 1] = lr[1];
+ }
+
+ for (i = 0; i < slen; i += 2) {
+ encipher(lr, 0);
+ S[i] = lr[0];
+ S[i + 1] = lr[1];
+ }
+ }
+
+ /**
+ * Perform the "enhanced key schedule" step described by Provos and Mazieres in
+ * "A Future-Adaptable Password Scheme" http://www.openbsd.org/papers/bcrypt-paper.ps
+ * @param data salt information
+ * @param key password information
+ */
+ private void ekskey(byte data[], byte key[]) {
+ int i;
+ int koffp[] = { 0 }, doffp[] = { 0 };
+ int lr[] = { 0, 0 };
+ int plen = P.length, slen = S.length;
+
+ for (i = 0; i < plen; i++) {
+ P[i] = P[i] ^ streamtoword(key, koffp);
+ }
+
+ for (i = 0; i < plen; i += 2) {
+ lr[0] ^= streamtoword(data, doffp);
+ lr[1] ^= streamtoword(data, doffp);
+ encipher(lr, 0);
+ P[i] = lr[0];
+ P[i + 1] = lr[1];
+ }
+
+ for (i = 0; i < slen; i += 2) {
+ lr[0] ^= streamtoword(data, doffp);
+ lr[1] ^= streamtoword(data, doffp);
+ encipher(lr, 0);
+ S[i] = lr[0];
+ S[i + 1] = lr[1];
+ }
+ }
+
+ static long roundsForLogRounds(int log_rounds) {
+ if (log_rounds < 4 || log_rounds > 31) {
+ throw new IllegalArgumentException("Bad number of rounds");
+ }
+ return 1L << log_rounds;
+ }
+
+ /**
+ * Perform the central password hashing step in the bcrypt scheme
+ * @param password the password to hash
+ * @param salt the binary salt to hash with the password
+ * @param log_rounds the binary logarithm of the number of rounds of hashing to apply
+ * @return an array containing the binary hashed password
+ */
+ private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
+ int cdata[] = (int[]) bf_crypt_ciphertext.clone();
+ int clen = cdata.length;
+ byte ret[];
+
+ long rounds = roundsForLogRounds(log_rounds);
+
+ init_key();
+ ekskey(salt, password);
+ for (long i = 0; i < rounds; i++) {
+ key(password);
+ key(salt);
+ }
+
+ for (int i = 0; i < 64; i++) {
+ for (int j = 0; j < (clen >> 1); j++) {
+ encipher(cdata, j << 1);
+ }
+ }
+
+ ret = new byte[clen * 4];
+ for (int i = 0, j = 0; i < clen; i++) {
+ ret[j++] = (byte) ((cdata[i] >> 24) & 0xff);
+ ret[j++] = (byte) ((cdata[i] >> 16) & 0xff);
+ ret[j++] = (byte) ((cdata[i] >> 8) & 0xff);
+ ret[j++] = (byte) (cdata[i] & 0xff);
+ }
+ return ret;
+ }
+
+ /**
+ * Hash a password using the OpenBSD bcrypt scheme
+ * @param password the password to hash
+ * @param salt the salt to hash with (perhaps generated using BCrypt.gensalt)
+ * @return the hashed password
+ * @throws IllegalArgumentException if invalid salt is passed
+ */
+ public static String hashpw(String password, String salt) throws IllegalArgumentException {
+ BCrypt B;
+ String real_salt;
+ byte passwordb[], saltb[], hashed[];
+ char minor = (char) 0;
+ int rounds, off = 0;
+ StringBuilder rs = new StringBuilder();
+
+ if (salt == null) {
+ throw new IllegalArgumentException("salt cannot be null");
+ }
+
+ int saltLength = salt.length();
+
+ if (saltLength < 28) {
+ throw new IllegalArgumentException("Invalid salt");
+ }
+
+ if (salt.charAt(0) != '$' || salt.charAt(1) != '2') {
+ throw new IllegalArgumentException("Invalid salt version");
+ }
+ if (salt.charAt(2) == '$') {
+ off = 3;
+ }
+ else {
+ minor = salt.charAt(2);
+ if (minor != 'a' || salt.charAt(3) != '$') {
+ throw new IllegalArgumentException("Invalid salt revision");
+ }
+ off = 4;
+ }
+
+ if (saltLength - off < 25) {
+ throw new IllegalArgumentException("Invalid salt");
+ }
+
+ // Extract number of rounds
+ if (salt.charAt(off + 2) > '$') {
+ throw new IllegalArgumentException("Missing salt rounds");
+ }
+ rounds = Integer.parseInt(salt.substring(off, off + 2));
+
+ real_salt = salt.substring(off + 3, off + 25);
+ try {
+ passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
+ }
+ catch (UnsupportedEncodingException uee) {
+ throw new AssertionError("UTF-8 is not supported");
+ }
+
+ saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
+
+ B = new BCrypt();
+ hashed = B.crypt_raw(passwordb, saltb, rounds);
+
+ rs.append("$2");
+ if (minor >= 'a') {
+ rs.append(minor);
+ }
+ rs.append("$");
+ if (rounds < 10) {
+ rs.append("0");
+ }
+ rs.append(rounds);
+ rs.append("$");
+ encode_base64(saltb, saltb.length, rs);
+ encode_base64(hashed, bf_crypt_ciphertext.length * 4 - 1, rs);
+ return rs.toString();
+ }
+
+ /**
+ * Generate a salt for use with the BCrypt.hashpw() method
+ * @param log_rounds the log2 of the number of rounds of hashing to apply - the work
+ * factor therefore increases as 2**log_rounds. Minimum 4, maximum 31.
+ * @param random an instance of SecureRandom to use
+ * @return an encoded salt value
+ */
+ public static String gensalt(int log_rounds, SecureRandom random) {
+ if (log_rounds < MIN_LOG_ROUNDS || log_rounds > MAX_LOG_ROUNDS) {
+ throw new IllegalArgumentException("Bad number of rounds");
+ }
+ StringBuilder rs = new StringBuilder();
+ byte rnd[] = new byte[BCRYPT_SALT_LEN];
+
+ random.nextBytes(rnd);
+
+ rs.append("$2a$");
+ if (log_rounds < 10) {
+ rs.append("0");
+ }
+ rs.append(log_rounds);
+ rs.append("$");
+ encode_base64(rnd, rnd.length, rs);
+ return rs.toString();
+ }
+
+ /**
+ * Generate a salt for use with the BCrypt.hashpw() method
+ * @param log_rounds the log2 of the number of rounds of hashing to apply - the work
+ * factor therefore increases as 2**log_rounds. Minimum 4, maximum 31.
+ * @return an encoded salt value
+ */
+ public static String gensalt(int log_rounds) {
+ return gensalt(log_rounds, new SecureRandom());
+ }
+
+ /**
+ * Generate a salt for use with the BCrypt.hashpw() method, selecting a reasonable
+ * default for the number of hashing rounds to apply
+ * @return an encoded salt value
+ */
+ public static String gensalt() {
+ return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
+ }
+
+ /**
+ * Check that a plaintext password matches a previously hashed one
+ * @param plaintext the plaintext password to verify
+ * @param hashed the previously-hashed password
+ * @return true if the passwords match, false otherwise
+ */
+ public static boolean checkpw(String plaintext, String hashed) {
+ return equalsNoEarlyReturn(hashed, hashpw(plaintext, hashed));
+ }
+
+ static boolean equalsNoEarlyReturn(String a, String b) {
+ char[] caa = a.toCharArray();
+ char[] cab = b.toCharArray();
+
+ if (caa.length != cab.length) {
+ return false;
+ }
+
+ byte ret = 0;
+ for (int i = 0; i < caa.length; i++) {
+ ret |= caa[i] ^ cab[i];
+ }
+ return ret == 0;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/security/password/BCryptPasswordEncoder.java b/admin/src/main/java/io/renren/modules/security/password/BCryptPasswordEncoder.java
new file mode 100644
index 0000000..d27be66
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/password/BCryptPasswordEncoder.java
@@ -0,0 +1,82 @@
+package io.renren.modules.security.password;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.security.SecureRandom;
+import java.util.regex.Pattern;
+
+/**
+ * Implementation of PasswordEncoder that uses the BCrypt strong hashing function. Clients
+ * can optionally supply a "strength" (a.k.a. log rounds in BCrypt) and a SecureRandom
+ * instance. The larger the strength parameter the more work will have to be done
+ * (exponentially) to hash the passwords. The default value is 10.
+ *
+ * @author Dave Syer
+ *
+ */
+public class BCryptPasswordEncoder implements PasswordEncoder {
+ private Pattern BCRYPT_PATTERN = Pattern
+ .compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}");
+ private final Log logger = LogFactory.getLog(getClass());
+
+ private final int strength;
+
+ private final SecureRandom random;
+
+ public BCryptPasswordEncoder() {
+ this(-1);
+ }
+
+ /**
+ * @param strength the log rounds to use, between 4 and 31
+ */
+ public BCryptPasswordEncoder(int strength) {
+ this(strength, null);
+ }
+
+ /**
+ * @param strength the log rounds to use, between 4 and 31
+ * @param random the secure random instance to use
+ *
+ */
+ public BCryptPasswordEncoder(int strength, SecureRandom random) {
+ if (strength != -1 && (strength < BCrypt.MIN_LOG_ROUNDS || strength > BCrypt.MAX_LOG_ROUNDS)) {
+ throw new IllegalArgumentException("Bad strength");
+ }
+ this.strength = strength;
+ this.random = random;
+ }
+
+ @Override
+ public String encode(CharSequence rawPassword) {
+ String salt;
+ if (strength > 0) {
+ if (random != null) {
+ salt = BCrypt.gensalt(strength, random);
+ }
+ else {
+ salt = BCrypt.gensalt(strength);
+ }
+ }
+ else {
+ salt = BCrypt.gensalt();
+ }
+ return BCrypt.hashpw(rawPassword.toString(), salt);
+ }
+
+ @Override
+ public boolean matches(CharSequence rawPassword, String encodedPassword) {
+ if (encodedPassword == null || encodedPassword.length() == 0) {
+ logger.warn("Empty encoded password");
+ return false;
+ }
+
+ if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) {
+ logger.warn("Encoded password does not look like BCrypt");
+ return false;
+ }
+
+ return BCrypt.checkpw(rawPassword.toString(), encodedPassword);
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/password/PasswordEncoder.java b/admin/src/main/java/io/renren/modules/security/password/PasswordEncoder.java
new file mode 100644
index 0000000..3b746e6
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/password/PasswordEncoder.java
@@ -0,0 +1,30 @@
+package io.renren.modules.security.password;
+
+/**
+ * Service interface for encoding passwords.
+ *
+ * The preferred implementation is {@code BCryptPasswordEncoder}.
+ *
+ * @author Keith Donald
+ */
+public interface PasswordEncoder {
+
+ /**
+ * Encode the raw password. Generally, a good encoding algorithm applies a SHA-1 or
+ * greater hash combined with an 8-byte or greater randomly generated salt.
+ */
+ String encode(CharSequence rawPassword);
+
+ /**
+ * Verify the encoded password obtained from storage matches the submitted raw
+ * password after it too is encoded. Returns true if the passwords match, false if
+ * they do not. The stored password itself is never decoded.
+ *
+ * @param rawPassword the raw password to encode and match
+ * @param encodedPassword the encoded password from storage to compare with
+ * @return true if the raw password, after encoding, matches the encoded password from
+ * storage
+ */
+ boolean matches(CharSequence rawPassword, String encodedPassword);
+
+}
diff --git a/admin/src/main/java/io/renren/modules/security/password/PasswordUtils.java b/admin/src/main/java/io/renren/modules/security/password/PasswordUtils.java
new file mode 100644
index 0000000..c3f3c5a
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/password/PasswordUtils.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package io.renren.modules.security.password;
+
+/**
+ * 密码工具类
+ *
+
+ * @since 1.0.0
+ */
+public class PasswordUtils {
+ private static PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+
+ /**
+ * 加密
+ * @param str 字符串
+ * @return 返回加密字符串
+ */
+ public static String encode(String str){
+ return passwordEncoder.encode(str);
+ }
+
+
+ /**
+ * 比较密码是否相等
+ * @param str 明文密码
+ * @param password 加密后密码
+ * @return true：成功 false：失败
+ */
+ public static boolean matches(String str, String password){
+ return passwordEncoder.matches(str, password);
+ }
+
+
+ public static void main(String[] args) {
+ String str = "admin";
+ String password = encode(str);
+
+ System.out.println(password);
+ System.out.println(matches(str, password));
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/security/service/CaptchaService.java b/admin/src/main/java/io/renren/modules/security/service/CaptchaService.java
new file mode 100644
index 0000000..e81b8ba
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/service/CaptchaService.java
@@ -0,0 +1,28 @@
+
+
+package io.renren.modules.security.service;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
+/**
+ * 验证码
+ *
+
+ */
+public interface CaptchaService {
+
+ /**
+ * 图片验证码
+ */
+ void create(HttpServletResponse response, String uuid) throws IOException;
+
+ /**
+ * 验证码效验
+ * @param uuid uuid
+ * @param code 验证码
+ * @return true：成功 false：失败
+ */
+ boolean validate(String uuid, String code);
+}
diff --git a/admin/src/main/java/io/renren/modules/security/service/ShiroService.java b/admin/src/main/java/io/renren/modules/security/service/ShiroService.java
new file mode 100644
index 0000000..7a74c2a
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/service/ShiroService.java
@@ -0,0 +1,37 @@
+
+
+package io.renren.modules.security.service;
+
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.entity.SysUserEntity;
+import io.renren.modules.security.entity.SysUserTokenEntity;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * shiro相关接口
+ *
+
+ */
+public interface ShiroService {
+ /**
+ * 获取用户权限列表
+ */
+ Set getUserPermissions(UserDetail user);
+
+ SysUserTokenEntity getByToken(String token);
+
+ /**
+ * 根据用户ID，查询用户
+ * @param userId
+ */
+ SysUserEntity getUser(Long userId);
+
+ /**
+ * 获取用户对应的部门数据权限
+ * @param userId 用户ID
+ * @return 返回部门ID列表
+ */
+ List getDataScopeList(Long userId);
+}
diff --git a/admin/src/main/java/io/renren/modules/security/service/SysUserTokenService.java b/admin/src/main/java/io/renren/modules/security/service/SysUserTokenService.java
new file mode 100644
index 0000000..356d75e
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/service/SysUserTokenService.java
@@ -0,0 +1,28 @@
+
+
+package io.renren.modules.security.service;
+
+import io.renren.common.service.BaseService;
+import io.renren.common.utils.Result;
+import io.renren.modules.security.entity.SysUserTokenEntity;
+
+/**
+ * 用户Token
+ *
+
+ */
+public interface SysUserTokenService extends BaseService {
+
+ /**
+ * 生成token
+ * @param userId 用户ID
+ */
+ Result createToken(Long userId);
+
+ /**
+ * 退出，修改token值
+ * @param userId 用户ID
+ */
+ void logout(Long userId);
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/service/impl/CaptchaServiceImpl.java b/admin/src/main/java/io/renren/modules/security/service/impl/CaptchaServiceImpl.java
new file mode 100644
index 0000000..b0c6253
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/service/impl/CaptchaServiceImpl.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.security.service.impl;
+
+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
+import com.wf.captcha.SpecCaptcha;
+import com.wf.captcha.base.Captcha;
+import io.renren.common.redis.RedisKeys;
+import io.renren.common.redis.RedisUtils;
+import io.renren.modules.security.service.CaptchaService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+/**
+ * 验证码
+ *
+
+ */
+@Service
+public class CaptchaServiceImpl implements CaptchaService {
+ @Resource
+ private RedisUtils redisUtils;
+ @Value("${renren.redis.open: false}")
+ private boolean open;
+ /**
+ * Local Cache 5分钟过期
+ */
+ Cache localCache = CacheUtil.newLRUCache(1000, 1000 * 60 * 5);
+
+ @Override
+ public void create(HttpServletResponse response, String uuid) throws IOException {
+ response.setContentType("image/gif");
+ response.setHeader("Pragma", "No-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setDateHeader("Expires", 0);
+
+ //生成验证码
+ SpecCaptcha captcha = new SpecCaptcha(150, 40);
+ captcha.setLen(5);
+ captcha.setCharType(Captcha.TYPE_DEFAULT);
+ captcha.out(response.getOutputStream());
+
+ //保存到缓存
+ setCache(uuid, captcha.text());
+ }
+
+ @Override
+ public boolean validate(String uuid, String code) {
+ //获取验证码
+ String captcha = getCache(uuid);
+
+ //效验成功
+ if (code.equalsIgnoreCase(captcha)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ private void setCache(String key, String value) {
+ if (open) {
+ key = RedisKeys.getCaptchaKey(key);
+ redisUtils.set(key, value, 300);
+ } else {
+ localCache.put(key, value);
+ }
+ }
+
+ private String getCache(String key) {
+ if (open) {
+ key = RedisKeys.getCaptchaKey(key);
+ String captcha = (String) redisUtils.get(key);
+ //删除验证码
+ if (captcha != null) {
+ redisUtils.delete(key);
+ }
+
+ return captcha;
+ }
+
+ String captcha = localCache.get(key);
+ //删除验证码
+ if (captcha != null) {
+ localCache.remove(key);
+ }
+ return captcha;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/security/service/impl/ShiroServiceImpl.java b/admin/src/main/java/io/renren/modules/security/service/impl/ShiroServiceImpl.java
new file mode 100644
index 0000000..fa78068
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/service/impl/ShiroServiceImpl.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.security.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import io.renren.modules.security.dao.SysUserTokenDao;
+import io.renren.modules.security.entity.SysUserTokenEntity;
+import io.renren.modules.security.service.ShiroService;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.dao.SysMenuDao;
+import io.renren.modules.sys.dao.SysRoleDataScopeDao;
+import io.renren.modules.sys.dao.SysUserDao;
+import io.renren.modules.sys.entity.SysUserEntity;
+import io.renren.modules.sys.enums.SuperAdminEnum;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Service
+@AllArgsConstructor
+public class ShiroServiceImpl implements ShiroService {
+ private final SysMenuDao sysMenuDao;
+ private final SysUserDao sysUserDao;
+ private final SysUserTokenDao sysUserTokenDao;
+ private final SysRoleDataScopeDao sysRoleDataScopeDao;
+
+ @Override
+ public Set getUserPermissions(UserDetail user) {
+ //系统管理员，拥有最高权限
+ List permissionsList;
+ if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) {
+ permissionsList = sysMenuDao.getPermissionsList();
+ } else {
+ permissionsList = sysMenuDao.getUserPermissionsList(user.getId());
+ }
+
+ //用户权限列表
+ Set permsSet = new HashSet<>();
+ for (String permissions : permissionsList) {
+ if (StrUtil.isBlank(permissions)) {
+ continue;
+ }
+ permsSet.addAll(Arrays.asList(permissions.trim().split(",")));
+ }
+
+ return permsSet;
+ }
+
+ @Override
+ public SysUserTokenEntity getByToken(String token) {
+ return sysUserTokenDao.getByToken(token);
+ }
+
+ @Override
+ public SysUserEntity getUser(Long userId) {
+ return sysUserDao.selectById(userId);
+ }
+
+ @Override
+ public List getDataScopeList(Long userId) {
+ return sysRoleDataScopeDao.getDataScopeList(userId);
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java b/admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
new file mode 100644
index 0000000..c30f1eb
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
@@ -0,0 +1,80 @@
+
+
+package io.renren.modules.security.service.impl;
+
+import io.renren.common.constant.Constant;
+import io.renren.common.service.impl.BaseServiceImpl;
+import io.renren.modules.security.oauth2.TokenGenerator;
+import io.renren.common.utils.Result;
+import io.renren.modules.security.dao.SysUserTokenDao;
+import io.renren.modules.security.entity.SysUserTokenEntity;
+import io.renren.modules.security.service.SysUserTokenService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class SysUserTokenServiceImpl extends BaseServiceImpl implements SysUserTokenService {
+ /**
+ * 12小时后过期
+ */
+ private final static int EXPIRE = 3600 * 12;
+
+ @Override
+ public Result createToken(Long userId) {
+ //用户token
+ String token;
+
+ //当前时间
+ Date now = new Date();
+ //过期时间
+ Date expireTime = new Date(now.getTime() + EXPIRE * 1000);
+
+ //判断是否生成过token
+ SysUserTokenEntity tokenEntity = baseDao.getByUserId(userId);
+ if(tokenEntity == null){
+ //生成一个token
+ token = TokenGenerator.generateValue();
+
+ tokenEntity = new SysUserTokenEntity();
+ tokenEntity.setUserId(userId);
+ tokenEntity.setToken(token);
+ tokenEntity.setUpdateDate(now);
+ tokenEntity.setExpireDate(expireTime);
+
+ //保存token
+ this.insert(tokenEntity);
+ }else{
+ //判断token是否过期
+ if(tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()){
+ //token过期，重新生成token
+ token = TokenGenerator.generateValue();
+ }else {
+ token = tokenEntity.getToken();
+ }
+
+ tokenEntity.setToken(token);
+ tokenEntity.setUpdateDate(now);
+ tokenEntity.setExpireDate(expireTime);
+
+ //更新token
+ this.updateById(tokenEntity);
+ }
+
+ Map map = new HashMap<>(2);
+ map.put(Constant.TOKEN_HEADER, token);
+ map.put("expire", EXPIRE);
+ return new Result().ok(map);
+ }
+
+ @Override
+ public void logout(Long userId) {
+ //生成一个token
+ String token = TokenGenerator.generateValue();
+
+ //修改token
+ baseDao.updateToken(userId, token);
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/user/SecurityUser.java b/admin/src/main/java/io/renren/modules/security/user/SecurityUser.java
new file mode 100644
index 0000000..338f13f
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/user/SecurityUser.java
@@ -0,0 +1,53 @@
+
+
+package io.renren.modules.security.user;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
+
+/**
+ * 用户
+ *
+
+ */
+public class SecurityUser {
+
+ public static Subject getSubject() {
+ try {
+ return SecurityUtils.getSubject();
+ }catch (Exception e){
+ return null;
+ }
+ }
+
+ /**
+ * 获取用户信息
+ */
+ public static UserDetail getUser() {
+ Subject subject = getSubject();
+ if(subject == null){
+ return new UserDetail();
+ }
+
+ UserDetail user = (UserDetail)subject.getPrincipal();
+ if(user == null){
+ return new UserDetail();
+ }
+
+ return user;
+ }
+
+ /**
+ * 获取用户ID
+ */
+ public static Long getUserId() {
+ return getUser().getId();
+ }
+
+ /**
+ * 获取部门ID
+ */
+ public static Long getDeptId() {
+ return getUser().getDeptId();
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/security/user/UserDetail.java b/admin/src/main/java/io/renren/modules/security/user/UserDetail.java
new file mode 100644
index 0000000..ba23f0c
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/security/user/UserDetail.java
@@ -0,0 +1,35 @@
+
+
+package io.renren.modules.security.user;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 登录用户信息
+ *
+
+ */
+@Data
+public class UserDetail implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+ private String username;
+ private String realName;
+ private String headUrl;
+ private Integer gender;
+ private String email;
+ private String mobile;
+ private Long deptId;
+ private String password;
+ private Integer status;
+ private Integer superAdmin;
+ /**
+ * 部门数据权限
+ */
+ private List deptIdList;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/IndexController.java b/admin/src/main/java/io/renren/modules/sys/controller/IndexController.java
new file mode 100644
index 0000000..6117fad
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/IndexController.java
@@ -0,0 +1,20 @@
+package io.renren.modules.sys.controller;
+
+import io.renren.common.utils.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 首页提示
+ *
+
+ */
+@RestController
+public class IndexController {
+
+ @GetMapping("/")
+ public Result index(){
+ String tips = "你好，renren-admin已启动，请启动renren-ui，才能访问页面！";
+ return new Result().ok(tips);
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
new file mode 100644
index 0000000..8144403
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.sys.dto.SysDeptDTO;
+import io.renren.modules.sys.service.SysDeptService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 部门管理
+ *
+
+ */
+@RestController
+@RequestMapping("/sys/dept")
+@Tag(name = "部门管理")
+@AllArgsConstructor
+public class SysDeptController {
+ private final SysDeptService sysDeptService;
+
+ @GetMapping("list")
+ @Operation(summary = "列表")
+ @RequiresPermissions("sys:dept:list")
+ public Result> list() {
+ List list = sysDeptService.list(new HashMap<>(1));
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:dept:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysDeptDTO data = sysDeptService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:dept:save")
+ public Result save(@RequestBody SysDeptDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysDeptService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:dept:update")
+ public Result update(@RequestBody SysDeptDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysDeptService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping("{id}")
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:dept:delete")
+ public Result delete(@PathVariable("id") Long id) {
+ //效验数据
+ AssertUtils.isNull(id, "id");
+
+ sysDeptService.delete(id);
+
+ return new Result();
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysDictDataController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysDictDataController.java
new file mode 100644
index 0000000..0b879a5
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysDictDataController.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.sys.dto.SysDictDataDTO;
+import io.renren.modules.sys.service.SysDictDataService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 字典数据
+ *
+
+ */
+@RestController
+@RequestMapping("sys/dict/data")
+@Tag(name = "字典数据")
+@AllArgsConstructor
+public class SysDictDataController {
+ private final SysDictDataService sysDictDataService;
+
+ @GetMapping("page")
+ @Operation(summary = "字典数据")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "dictLabel", description = "字典标签", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "dictValue", description = "字典值", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:dict:page")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ //字典类型
+ PageData page = sysDictDataService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:dict:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysDictDataDTO data = sysDictDataService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:dict:save")
+ public Result save(@RequestBody SysDictDataDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysDictDataService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:dict:update")
+ public Result update(@RequestBody SysDictDataDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysDictDataService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:dict:delete")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysDictDataService.delete(ids);
+
+ return new Result();
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysDictTypeController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysDictTypeController.java
new file mode 100644
index 0000000..7e56d7b
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysDictTypeController.java
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.sys.dto.SysDictTypeDTO;
+import io.renren.modules.sys.entity.DictType;
+import io.renren.modules.sys.service.SysDictTypeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典类型
+ *
+
+ */
+@RestController
+@RequestMapping("sys/dict/type")
+@Tag(name = "字典类型")
+@AllArgsConstructor
+public class SysDictTypeController {
+ private final SysDictTypeService sysDictTypeService;
+
+ @GetMapping("page")
+ @Operation(summary = "字典类型")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "dictType", description = "字典类型", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "dictName", description = "字典名称", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:dict:page")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ //字典类型
+ PageData page = sysDictTypeService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:dict:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysDictTypeDTO data = sysDictTypeService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:dict:save")
+ public Result save(@RequestBody SysDictTypeDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysDictTypeService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:dict:update")
+ public Result update(@RequestBody SysDictTypeDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysDictTypeService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:dict:delete")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysDictTypeService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("all")
+ @Operation(summary = "所有字典数据")
+ public Result> all() {
+ List list = sysDictTypeService.getAllList();
+
+ return new Result>().ok(list);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysMenuController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysMenuController.java
new file mode 100644
index 0000000..d94ddd7
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysMenuController.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.exception.ErrorCode;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.modules.security.service.ShiroService;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.dto.SysMenuDTO;
+import io.renren.modules.sys.enums.MenuTypeEnum;
+import io.renren.modules.sys.service.SysMenuService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 菜单管理
+ *
+
+ */
+@RestController
+@RequestMapping("/sys/menu")
+@Tag(name = "菜单管理")
+@AllArgsConstructor
+public class SysMenuController {
+ private final SysMenuService sysMenuService;
+ private final ShiroService shiroService;
+
+ @GetMapping("nav")
+ @Operation(summary = "导航")
+ public Result> nav() {
+ UserDetail user = SecurityUser.getUser();
+ List list = sysMenuService.getUserMenuList(user, MenuTypeEnum.MENU.value());
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("permissions")
+ @Operation(summary = "权限标识")
+ public Result> permissions() {
+ UserDetail user = SecurityUser.getUser();
+ Set set = shiroService.getUserPermissions(user);
+
+ return new Result>().ok(set);
+ }
+
+ @GetMapping("list")
+ @Operation(summary = "列表")
+ @Parameter(name = "type", description = "菜单类型 0：菜单 1：按钮 null：全部", in = ParameterIn.QUERY, ref = "int")
+ @RequiresPermissions("sys:menu:list")
+ public Result> list(Integer type) {
+ List list = sysMenuService.getAllMenuList(type);
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:menu:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysMenuDTO data = sysMenuService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:menu:save")
+ public Result save(@RequestBody SysMenuDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysMenuService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:menu:update")
+ public Result update(@RequestBody SysMenuDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysMenuService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping("{id}")
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:menu:delete")
+ public Result delete(@PathVariable("id") Long id) {
+ //效验数据
+ AssertUtils.isNull(id, "id");
+
+ //判断是否有子菜单或按钮
+ List list = sysMenuService.getListPid(id);
+ if (list.size() > 0) {
+ return new Result().error(ErrorCode.SUB_MENU_EXIST);
+ }
+
+ sysMenuService.delete(id);
+
+ return new Result();
+ }
+
+ @GetMapping("select")
+ @Operation(summary = "角色菜单权限")
+ @RequiresPermissions("sys:menu:select")
+ public Result> select() {
+ UserDetail user = SecurityUser.getUser();
+ List list = sysMenuService.getUserMenuList(user, null);
+
+ return new Result>().ok(list);
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysParamsController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysParamsController.java
new file mode 100644
index 0000000..c3a1af2
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysParamsController.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.ExcelUtils;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.sys.dto.SysParamsDTO;
+import io.renren.modules.sys.excel.SysParamsExcel;
+import io.renren.modules.sys.service.SysParamsService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("sys/params")
+@Tag(name = "参数管理")
+@AllArgsConstructor
+public class SysParamsController {
+ private final SysParamsService sysParamsService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "paramCode", description = "参数编码", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:params:page")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ PageData page = sysParamsService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:params:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysParamsDTO data = sysParamsService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:params:save")
+ public Result save(@RequestBody SysParamsDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysParamsService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:params:update")
+ public Result update(@RequestBody SysParamsDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysParamsService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:params:delete")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysParamsService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @Operation(summary = "导出")
+ @LogOperation("导出")
+ @RequiresPermissions("sys:params:export")
+ @Parameter(name = "paramCode", description = "参数编码", in = ParameterIn.QUERY, ref = "String")
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysParamsService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, "参数管理", list, SysParamsExcel.class);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysRoleController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysRoleController.java
new file mode 100644
index 0000000..9a3d01f
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysRoleController.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.sys.dto.SysRoleDTO;
+import io.renren.modules.sys.service.SysRoleDataScopeService;
+import io.renren.modules.sys.service.SysRoleMenuService;
+import io.renren.modules.sys.service.SysRoleService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色管理
+ *
+
+ */
+@RestController
+@RequestMapping("/sys/role")
+@Tag(name = "角色管理")
+@AllArgsConstructor
+public class SysRoleController {
+ private final SysRoleService sysRoleService;
+ private final SysRoleMenuService sysRoleMenuService;
+ private final SysRoleDataScopeService sysRoleDataScopeService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "name", description = "角色名", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:role:page")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ PageData page = sysRoleService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("list")
+ @Operation(summary = "列表")
+ @RequiresPermissions("sys:role:list")
+ public Result> list() {
+ List data = sysRoleService.list(new HashMap<>(1));
+
+ return new Result>().ok(data);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:role:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysRoleDTO data = sysRoleService.get(id);
+
+ //查询角色对应的菜单
+ List menuIdList = sysRoleMenuService.getMenuIdList(id);
+ data.setMenuIdList(menuIdList);
+
+ //查询角色对应的数据权限
+ List deptIdList = sysRoleDataScopeService.getDeptIdList(id);
+ data.setDeptIdList(deptIdList);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:role:save")
+ public Result save(@RequestBody SysRoleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysRoleService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:role:update")
+ public Result update(@RequestBody SysRoleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysRoleService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:role:delete")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysRoleService.delete(ids);
+
+ return new Result();
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java b/admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
new file mode 100644
index 0000000..8cede2f
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.controller;
+
+import io.renren.common.annotation.LogOperation;
+import io.renren.common.constant.Constant;
+import io.renren.common.exception.ErrorCode;
+import io.renren.common.page.PageData;
+import io.renren.common.utils.ConvertUtils;
+import io.renren.common.utils.ExcelUtils;
+import io.renren.common.utils.Result;
+import io.renren.common.validator.AssertUtils;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.security.password.PasswordUtils;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.dto.PasswordDTO;
+import io.renren.modules.sys.dto.SysUserDTO;
+import io.renren.modules.sys.excel.SysUserExcel;
+import io.renren.modules.sys.service.SysRoleUserService;
+import io.renren.modules.sys.service.SysUserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户管理
+ *
+
+ */
+@RestController
+@RequestMapping("/sys/user")
+@Tag(name = "用户管理")
+@AllArgsConstructor
+public class SysUserController {
+ private final SysUserService sysUserService;
+ private final SysRoleUserService sysRoleUserService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "username", description = "用户名", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "gender", description = "性别", in = ParameterIn.QUERY, ref = "String"),
+ @Parameter(name = "deptId", description = "部门ID", in = ParameterIn.QUERY, ref = "String")
+ })
+ @RequiresPermissions("sys:user:page")
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params) {
+ PageData page = sysUserService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @RequiresPermissions("sys:user:info")
+ public Result get(@PathVariable("id") Long id) {
+ SysUserDTO data = sysUserService.get(id);
+
+ //用户角色列表
+ List roleIdList = sysRoleUserService.getRoleIdList(id);
+ data.setRoleIdList(roleIdList);
+
+ return new Result().ok(data);
+ }
+
+ @GetMapping("info")
+ @Operation(summary = "登录用户信息")
+ public Result info() {
+ SysUserDTO data = ConvertUtils.sourceToTarget(SecurityUser.getUser(), SysUserDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PutMapping("password")
+ @Operation(summary = "修改密码")
+ @LogOperation("修改密码")
+ public Result password(@RequestBody PasswordDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto);
+
+ UserDetail user = SecurityUser.getUser();
+
+ //原密码不正确
+ if (!PasswordUtils.matches(dto.getPassword(), user.getPassword())) {
+ return new Result().error(ErrorCode.PASSWORD_ERROR);
+ }
+
+ sysUserService.updatePassword(user.getId(), dto.getNewPassword());
+
+ return new Result();
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @RequiresPermissions("sys:user:save")
+ public Result save(@RequestBody SysUserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysUserService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @RequiresPermissions("sys:user:update")
+ public Result update(@RequestBody SysUserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysUserService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @RequiresPermissions("sys:user:delete")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysUserService.deleteBatchIds(Arrays.asList(ids));
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @Operation(summary = "导出")
+ @LogOperation("导出")
+ @RequiresPermissions("sys:user:export")
+ @Parameter(name = "username", description = "用户名", in = ParameterIn.QUERY, ref = "String")
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysUserService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class);
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysDeptDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysDeptDao.java
new file mode 100644
index 0000000..79cd4c7
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysDeptDao.java
@@ -0,0 +1,35 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysDeptEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门管理
+ *
+
+ */
+@Mapper
+public interface SysDeptDao extends BaseDao {
+
+ List getList(Map params);
+
+ SysDeptEntity getById(Long id);
+
+ /**
+ * 获取所有部门的id、pid列表
+ */
+ List getIdAndPidList();
+
+ /**
+ * 根据部门ID，获取所有子部门ID列表
+ * @param id 部门ID
+ */
+ List getSubDeptIdList(String id);
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysDictDataDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysDictDataDao.java
new file mode 100644
index 0000000..477848c
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysDictDataDao.java
@@ -0,0 +1,24 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.DictData;
+import io.renren.modules.sys.entity.SysDictDataEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 字典数据
+ *
+
+ */
+@Mapper
+public interface SysDictDataDao extends BaseDao {
+
+ /**
+ * 字典数据列表
+ */
+ List getDictDataList();
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysDictTypeDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysDictTypeDao.java
new file mode 100644
index 0000000..d36a4b5
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysDictTypeDao.java
@@ -0,0 +1,25 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.DictType;
+import io.renren.modules.sys.entity.SysDictTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 字典类型
+ *
+
+ */
+@Mapper
+public interface SysDictTypeDao extends BaseDao {
+
+ /**
+ * 字典类型列表
+ */
+ List getDictTypeList();
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysMenuDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysMenuDao.java
new file mode 100644
index 0000000..f8866a5
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysMenuDao.java
@@ -0,0 +1,54 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysMenuEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 菜单管理
+ *
+
+ */
+@Mapper
+public interface SysMenuDao extends BaseDao {
+
+ SysMenuEntity getById(@Param("id") Long id);
+
+ /**
+ * 查询所有菜单列表
+ *
+ * @param menuType 菜单类型
+ */
+ List getMenuList(@Param("menuType") Integer menuType);
+
+ /**
+ * 查询用户菜单列表
+ *
+ * @param userId 用户ＩＤ
+ * @param menuType 菜单类型
+ */
+ List getUserMenuList(@Param("userId") Long userId, @Param("menuType") Integer menuType);
+
+ /**
+ * 查询用户权限列表
+ * @param userId 用户ID
+ */
+ List getUserPermissionsList(Long userId);
+
+ /**
+ * 查询所有权限列表
+ */
+ List getPermissionsList();
+
+ /**
+ * 根据父菜单，查询子菜单
+ * @param pid 父菜单ID
+ */
+ List getListPid(Long pid);
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysParamsDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysParamsDao.java
new file mode 100644
index 0000000..9ec83cd
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysParamsDao.java
@@ -0,0 +1,40 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysParamsEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+@Mapper
+public interface SysParamsDao extends BaseDao {
+ /**
+ * 根据参数编码，查询value
+ * @param paramCode 参数编码
+ * @return 参数值
+ */
+ String getValueByCode(String paramCode);
+
+ /**
+ * 获取参数编码列表
+ * @param ids ids
+ * @return 返回参数编码列表
+ */
+ List getParamCodeList(Long[] ids);
+
+ /**
+ * 根据参数编码，更新value
+ * @param paramCode 参数编码
+ * @param paramValue 参数值
+ */
+ int updateValueByCode(@Param("paramCode") String paramCode, @Param("paramValue") String paramValue);
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysRoleDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleDao.java
new file mode 100644
index 0000000..f4c11ec
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleDao.java
@@ -0,0 +1,18 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysRoleEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 角色管理
+ *
+
+ */
+@Mapper
+public interface SysRoleDao extends BaseDao {
+
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysRoleDataScopeDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleDataScopeDao.java
new file mode 100644
index 0000000..20413c7
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleDataScopeDao.java
@@ -0,0 +1,35 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysRoleDataScopeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 角色数据权限
+ *
+
+ * @since 1.0.0
+ */
+@Mapper
+public interface SysRoleDataScopeDao extends BaseDao {
+
+ /**
+ * 根据角色ID，获取部门ID列表
+ */
+ List getDeptIdList(Long roleId);
+
+ /**
+ * 获取用户的部门数据权限列表
+ */
+ List getDataScopeList(Long userId);
+
+ /**
+ * 根据角色id，删除角色数据权限关系
+ * @param roleIds 角色ids
+ */
+ void deleteByRoleIds(Long[] roleIds);
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysRoleMenuDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleMenuDao.java
new file mode 100644
index 0000000..615ddfa
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleMenuDao.java
@@ -0,0 +1,35 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysRoleMenuEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 角色与菜单对应关系
+ *
+
+ */
+@Mapper
+public interface SysRoleMenuDao extends BaseDao {
+
+ /**
+ * 根据角色ID，获取菜单ID列表
+ */
+ List getMenuIdList(Long roleId);
+
+ /**
+ * 根据角色id，删除角色菜单关系
+ * @param roleIds 角色ids
+ */
+ void deleteByRoleIds(Long[] roleIds);
+
+ /**
+ * 根据菜单id，删除角色菜单关系
+ * @param menuId 菜单id
+ */
+ void deleteByMenuId(Long menuId);
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java
new file mode 100644
index 0000000..644afbb
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java
@@ -0,0 +1,39 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysRoleUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 角色用户关系
+ *
+
+ * @since 1.0.0
+ */
+@Mapper
+public interface SysRoleUserDao extends BaseDao {
+
+ /**
+ * 根据角色ids，删除角色用户关系
+ * @param roleIds 角色ids
+ */
+ void deleteByRoleIds(Long[] roleIds);
+
+ /**
+ * 根据用户id，删除角色用户关系
+ * @param userIds 用户ids
+ */
+ void deleteByUserIds(Long[] userIds);
+
+ /**
+ * 角色ID列表
+ * @param userId 用户ID
+ *
+ * @return
+ */
+ List getRoleIdList(Long userId);
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java b/admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java
new file mode 100644
index 0000000..0cde621
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java
@@ -0,0 +1,38 @@
+
+
+package io.renren.modules.sys.dao;
+
+import io.renren.common.dao.BaseDao;
+import io.renren.modules.sys.entity.SysUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统用户
+ *
+
+ */
+@Mapper
+public interface SysUserDao extends BaseDao {
+
+ List getList(Map params);
+
+ SysUserEntity getById(Long id);
+
+ SysUserEntity getByUsername(String username);
+
+ int updatePassword(@Param("id") Long id, @Param("newPassword") String newPassword);
+
+ /**
+ * 根据部门ID，查询用户数
+ */
+ int getCountByDeptId(Long deptId);
+
+ /**
+ * 根据部门ID,查询用户ID列表
+ */
+ List getUserIdListByDeptId(List deptIdList);
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/PasswordDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/PasswordDTO.java
new file mode 100644
index 0000000..eeb4302
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/PasswordDTO.java
@@ -0,0 +1,30 @@
+
+
+package io.renren.modules.sys.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 修改密码
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "修改密码")
+public class PasswordDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "原密码")
+ @NotBlank(message="{sysuser.password.require}")
+ private String password;
+
+ @Schema(title = "新密码")
+ @NotBlank(message="{sysuser.password.require}")
+ private String newPassword;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java
new file mode 100644
index 0000000..4e73f84
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java
@@ -0,0 +1,76 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.utils.TreeNode;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 部门管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(title = "部门管理")
+public class SysDeptDTO extends TreeNode implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "上级ID")
+ @NotNull(message="{sysdept.pid.require}", groups = DefaultGroup.class)
+ private Long pid;
+
+ @Schema(title = "部门名称")
+ @NotBlank(message="{sysdept.name.require}", groups = DefaultGroup.class)
+ private String name;
+
+ @Schema(title = "排序")
+ @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+ private Integer sort;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "上级部门名称")
+ private String parentName;
+
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Override
+ public Long getPid() {
+ return pid;
+ }
+
+ @Override
+ public void setPid(Long pid) {
+ this.pid = pid;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java
new file mode 100644
index 0000000..1980125
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java
@@ -0,0 +1,59 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 字典数据
+ *
+
+ */
+@Data
+@Schema(title = "字典数据")
+public class SysDictDataDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "字典类型ID")
+ @NotNull(message="{sysdict.type.require}", groups = DefaultGroup.class)
+ private Long dictTypeId;
+
+ @Schema(title = "字典标签")
+ @NotBlank(message="{sysdict.label.require}", groups = DefaultGroup.class)
+ private String dictLabel;
+
+ @Schema(title = "字典值")
+ private String dictValue;
+
+ @Schema(title = "备注")
+ private String remark;
+
+ @Schema(title = "排序")
+ @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+ private Integer sort;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "更新时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date updateDate;
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java
new file mode 100644
index 0000000..ad099a1
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java
@@ -0,0 +1,56 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 字典类型
+ *
+
+ */
+@Data
+@Schema(title = "字典类型")
+public class SysDictTypeDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "字典类型")
+ @NotBlank(message="{sysdict.type.require}", groups = DefaultGroup.class)
+ private String dictType;
+
+ @Schema(title = "字典名称")
+ @NotBlank(message="{sysdict.name.require}", groups = DefaultGroup.class)
+ private String dictName;
+
+ @Schema(title = "备注")
+ private String remark;
+
+ @Schema(title = "排序")
+ @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+ private Integer sort;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "更新时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date updateDate;
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysMenuDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysMenuDTO.java
new file mode 100644
index 0000000..f2306cb
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysMenuDTO.java
@@ -0,0 +1,91 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.utils.TreeNode;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 菜单管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(title = "菜单管理")
+public class SysMenuDTO extends TreeNode implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "上级ID")
+ @NotNull(message="{sysmenu.pid.require}", groups = DefaultGroup.class)
+ private Long pid;
+
+ @Schema(title = "菜单名称")
+ @NotBlank(message="sysmenu.name.require", groups = DefaultGroup.class)
+ private String name;
+
+ @Schema(title = "菜单URL")
+ private String url;
+
+ @Schema(title = "类型 0：菜单 1：按钮")
+ @Range(min=0, max=1, message = "{sysmenu.type.range}", groups = DefaultGroup.class)
+ private Integer menuType;
+
+ @Schema(title = "菜单图标")
+ private String icon;
+
+ @Schema(title = "授权(多个用逗号分隔，如：sys:user:list,sys:user:save)")
+ private String permissions;
+
+ @Schema(title = "排序")
+ @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+ private Integer sort;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "上级菜单名称")
+ private String parentName;
+
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Override
+ public Long getPid() {
+ return pid;
+ }
+
+ @Override
+ public void setPid(Long pid) {
+ this.pid = pid;
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysParamsDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysParamsDTO.java
new file mode 100644
index 0000000..0c38e30
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysParamsDTO.java
@@ -0,0 +1,53 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "参数管理")
+public class SysParamsDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "参数编码")
+ @NotBlank(message="{sysparams.paramcode.require}", groups = DefaultGroup.class)
+ private String paramCode;
+
+ @Schema(title = "参数值")
+ @NotBlank(message="{sysparams.paramvalue.require}", groups = DefaultGroup.class)
+ private String paramValue;
+
+ @Schema(title = "备注")
+ private String remark;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "更新时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date updateDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysRoleDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysRoleDTO.java
new file mode 100644
index 0000000..8dfa5de
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysRoleDTO.java
@@ -0,0 +1,52 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 角色管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "角色管理")
+public class SysRoleDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "角色名称")
+ @NotBlank(message="{sysrole.name.require}", groups = DefaultGroup.class)
+ private String name;
+
+ @Schema(title = "备注")
+ private String remark;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "菜单ID列表")
+ private List menuIdList;
+
+ @Schema(title = "部门ID列表")
+ private List deptIdList;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SysUserDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SysUserDTO.java
new file mode 100644
index 0000000..3474b53
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SysUserDTO.java
@@ -0,0 +1,86 @@
+
+
+package io.renren.modules.sys.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.renren.common.validator.group.AddGroup;
+import io.renren.common.validator.group.DefaultGroup;
+import io.renren.common.validator.group.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "用户管理")
+public class SysUserDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "id")
+ @Null(message="{id.null}", groups = AddGroup.class)
+ @NotNull(message="{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ @Schema(title = "用户名", required = true)
+ @NotBlank(message="{sysuser.username.require}", groups = DefaultGroup.class)
+ private String username;
+
+ @Schema(title = "密码")
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ @NotBlank(message="{sysuser.password.require}", groups = AddGroup.class)
+ private String password;
+
+ @Schema(title = "姓名", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message="{sysuser.realName.require}", groups = DefaultGroup.class)
+ private String realName;
+
+ @Schema(title = "头像")
+ private String headUrl;
+
+ @Schema(title = "性别 0：男 1：女 2：保密", required = true)
+ @Range(min=0, max=2, message = "{sysuser.gender.range}", groups = DefaultGroup.class)
+ private Integer gender;
+
+ @Schema(title = "邮箱")
+ @Email(message="{sysuser.email.error}", groups = DefaultGroup.class)
+ private String email;
+
+ @Schema(title = "手机号")
+ private String mobile;
+
+ @Schema(title = "部门ID", required = true)
+ @NotNull(message="{sysuser.deptId.require}", groups = DefaultGroup.class)
+ private Long deptId;
+
+ @Schema(title = "状态 0：停用 1：正常", required = true)
+ @Range(min=0, max=1, message = "{sysuser.status.range}", groups = DefaultGroup.class)
+ private Integer status;
+
+ @Schema(title = "创建时间")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Date createDate;
+
+ @Schema(title = "超级管理员 0：否 1：是")
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ private Integer superAdmin;
+
+ @Schema(title = "角色ID列表")
+ private List roleIdList;
+
+ @Schema(title = "部门名称")
+ private String deptName;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/dto/SystemDTO.java b/admin/src/main/java/io/renren/modules/sys/dto/SystemDTO.java
new file mode 100644
index 0000000..23d94db
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/dto/SystemDTO.java
@@ -0,0 +1,42 @@
+
+
+package io.renren.modules.sys.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 系统数据
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@Schema(title = "系统数据")
+public class SystemDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Long sysTime;
+ private String osName;
+ private String osArch;
+ private String osVersion;
+ private String userLanguage;
+ private String userDir;
+ private Long totalPhysical;
+ private Long freePhysical;
+ private BigDecimal memoryRate;
+ private Integer processors;
+ private String jvmName;
+ private String javaVersion;
+ private String javaHome;
+ private Long javaTotalMemory;
+ private Long javaFreeMemory;
+ private Long javaMaxMemory;
+ private String userName;
+ private BigDecimal systemCpuLoad;
+ private String userTimezone;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/DictData.java b/admin/src/main/java/io/renren/modules/sys/entity/DictData.java
new file mode 100644
index 0000000..5ead4d2
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/DictData.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+/**
+ * 字典数据
+ *
+
+ */
+@Data
+public class DictData {
+ @JsonIgnore
+ private Long dictTypeId;
+ private String dictLabel;
+ private String dictValue;
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/DictType.java b/admin/src/main/java/io/renren/modules/sys/entity/DictType.java
new file mode 100644
index 0000000..d0bf5f8
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/DictType.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 字典类型
+ *
+
+ */
+@Data
+public class DictType {
+ @JsonIgnore
+ private Long id;
+ private String dictType;
+ private List dataList = new ArrayList<>();
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java
new file mode 100644
index 0000000..bb9d4da
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java
@@ -0,0 +1,55 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 部门管理
+ *
+
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_dept")
+public class SysDeptEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 上级ID
+ */
+ private Long pid;
+ /**
+ * 所有上级ID，用逗号分开
+ */
+ private String pids;
+ /**
+ * 部门名称
+ */
+ private String name;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+ /**
+ * 上级部门名称
+ */
+ @TableField(exist = false)
+ private String parentName;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java
new file mode 100644
index 0000000..4c27b12
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java
@@ -0,0 +1,54 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 数据字典
+ *
+
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_dict_data")
+public class SysDictDataEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 字典类型ID
+ */
+ private Long dictTypeId;
+ /**
+ * 字典标签
+ */
+ private String dictLabel;
+ /**
+ * 字典值
+ */
+ private String dictValue;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java
new file mode 100644
index 0000000..ddd4380
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java
@@ -0,0 +1,50 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 字典类型
+ *
+
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_dict_type")
+public class SysDictTypeEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 字典类型
+ */
+ private String dictType;
+ /**
+ * 字典名称
+ */
+ private String dictName;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysMenuEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysMenuEntity.java
new file mode 100644
index 0000000..dc16841
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysMenuEntity.java
@@ -0,0 +1,69 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 菜单管理
+ *
+
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_menu")
+public class SysMenuEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 父菜单ID，一级菜单为0
+ */
+ private Long pid;
+ /**
+ * 菜单名称
+ */
+ private String name;
+ /**
+ * 菜单URL
+ */
+ private String url;
+ /**
+ * 授权(多个用逗号分隔，如：sys:user:list,sys:user:save)
+ */
+ private String permissions;
+ /**
+ * 类型 0：菜单 1：按钮
+ */
+ private Integer menuType;
+ /**
+ * 菜单图标
+ */
+ private String icon;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+ /**
+ * 上级菜单名称
+ */
+ @TableField(exist = false)
+ private String parentName;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysParamsEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysParamsEntity.java
new file mode 100644
index 0000000..7bac358
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysParamsEntity.java
@@ -0,0 +1,53 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_params")
+public class SysParamsEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 参数编码
+ */
+ private String paramCode;
+ /**
+ * 参数值
+ */
+ private String paramValue;
+ /**
+ * 类型 0：系统参数 1：非系统参数
+ */
+ private Integer paramType;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysRoleDataScopeEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleDataScopeEntity.java
new file mode 100644
index 0000000..ddace9f
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleDataScopeEntity.java
@@ -0,0 +1,31 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 角色数据权限
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_role_data_scope")
+public class SysRoleDataScopeEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysRoleEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleEntity.java
new file mode 100644
index 0000000..43f1efb
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleEntity.java
@@ -0,0 +1,48 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 角色
+ *
+
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_role")
+public class SysRoleEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色名称
+ */
+ private String name;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 部门ID
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysRoleMenuEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleMenuEntity.java
new file mode 100644
index 0000000..5a49d0d
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleMenuEntity.java
@@ -0,0 +1,30 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 角色菜单关系
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_role_menu")
+public class SysRoleMenuEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+ /**
+ * 菜单ID
+ */
+ private Long menuId;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysRoleUserEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleUserEntity.java
new file mode 100644
index 0000000..0feef40
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysRoleUserEntity.java
@@ -0,0 +1,31 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 角色用户关系
+ *
+
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_role_user")
+public class SysRoleUserEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java b/admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
new file mode 100644
index 0000000..78190e1
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
@@ -0,0 +1,80 @@
+
+
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.renren.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 系统用户
+ *
+
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_user")
+public class SysUserEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 用户名
+ */
+ private String username;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * 姓名
+ */
+ private String realName;
+ /**
+ * 头像
+ */
+ private String headUrl;
+ /**
+ * 性别 0：男 1：女 2：保密
+ */
+ private Integer gender;
+ /**
+ * 邮箱
+ */
+ private String email;
+ /**
+ * 手机号
+ */
+ private String mobile;
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+ /**
+ * 超级管理员 0：否 1：是
+ */
+ private Integer superAdmin;
+ /**
+ * 状态 0：停用 1：正常
+ */
+ private Integer status;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+ /**
+ * 部门名称
+ */
+ @TableField(exist=false)
+ private String deptName;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/enums/MenuTypeEnum.java b/admin/src/main/java/io/renren/modules/sys/enums/MenuTypeEnum.java
new file mode 100644
index 0000000..f18bd54
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/enums/MenuTypeEnum.java
@@ -0,0 +1,30 @@
+
+
+package io.renren.modules.sys.enums;
+
+/**
+ * 菜单类型枚举
+ *
+
+ * @since 1.0.0
+ */
+public enum MenuTypeEnum {
+ /**
+ * 菜单
+ */
+ MENU(0),
+ /**
+ * 按钮
+ */
+ BUTTON(1);
+
+ private int value;
+
+ MenuTypeEnum(int value) {
+ this.value = value;
+ }
+
+ public int value() {
+ return this.value;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/enums/SuperAdminEnum.java b/admin/src/main/java/io/renren/modules/sys/enums/SuperAdminEnum.java
new file mode 100644
index 0000000..929740a
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/enums/SuperAdminEnum.java
@@ -0,0 +1,24 @@
+
+
+package io.renren.modules.sys.enums;
+
+/**
+ * 超级管理员枚举
+ *
+
+ * @since 1.0.0
+ */
+public enum SuperAdminEnum {
+ YES(1),
+ NO(0);
+
+ private int value;
+
+ SuperAdminEnum(int value) {
+ this.value = value;
+ }
+
+ public int value() {
+ return this.value;
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/enums/UserStatusEnum.java b/admin/src/main/java/io/renren/modules/sys/enums/UserStatusEnum.java
new file mode 100644
index 0000000..f00245f
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/enums/UserStatusEnum.java
@@ -0,0 +1,24 @@
+
+
+package io.renren.modules.sys.enums;
+
+/**
+ * 用户状态
+ *
+
+ * @since 1.0.0
+ */
+public enum UserStatusEnum {
+ DISABLE(0),
+ ENABLED(1);
+
+ private int value;
+
+ UserStatusEnum(int value) {
+ this.value = value;
+ }
+
+ public int value() {
+ return this.value;
+ }
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/excel/SysParamsExcel.java b/admin/src/main/java/io/renren/modules/sys/excel/SysParamsExcel.java
new file mode 100644
index 0000000..474f024
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/excel/SysParamsExcel.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+public class SysParamsExcel {
+ @ExcelProperty("参数编码")
+ private String paramCode;
+ @ExcelProperty("参数值")
+ private String paramValue;
+ @ExcelProperty("备注")
+ private String remark;
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/excel/SysUserExcel.java b/admin/src/main/java/io/renren/modules/sys/excel/SysUserExcel.java
new file mode 100644
index 0000000..6ef8258
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/excel/SysUserExcel.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import io.renren.modules.sys.excel.converter.GenderConverter;
+import io.renren.modules.sys.excel.converter.StatusConverter;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户管理
+ *
+
+ * @since 1.0.0
+ */
+@Data
+public class SysUserExcel {
+ @ExcelProperty("用户名")
+ private String username;
+ @ExcelProperty("姓名")
+ private String realName;
+ @ExcelProperty(value = "性别", converter = GenderConverter.class)
+ private Integer gender;
+ @ExcelProperty("邮箱")
+ private String email;
+ @ExcelProperty("手机号")
+ private String mobile;
+ @ExcelProperty("部门名称")
+ private String deptName;
+ @ExcelProperty(value = "状态", converter = StatusConverter.class)
+ private Integer status;
+ @ExcelProperty("备注")
+ private String remark;
+ @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty("创建时间")
+ private Date createDate;
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/excel/converter/GenderConverter.java b/admin/src/main/java/io/renren/modules/sys/excel/converter/GenderConverter.java
new file mode 100644
index 0000000..6342de7
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/excel/converter/GenderConverter.java
@@ -0,0 +1,45 @@
+package io.renren.modules.sys.excel.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+
+public class GenderConverter implements Converter {
+
+
+ @Override
+ public Class supportJavaTypeKey() {
+ return Integer.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if(cellData.getStringValue().equals("男")){
+ return 0;
+ }else if(cellData.getStringValue().equals("女")){
+ return 1;
+ }else {
+ return 2;
+ }
+ }
+
+ @Override
+ public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if(value == 0){
+ return new WriteCellData<>("男");
+ }else if(value == 1){
+ return new WriteCellData<>("女");
+ }else {
+ return new WriteCellData<>("保密");
+ }
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/excel/converter/StatusConverter.java b/admin/src/main/java/io/renren/modules/sys/excel/converter/StatusConverter.java
new file mode 100644
index 0000000..3fdb458
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/excel/converter/StatusConverter.java
@@ -0,0 +1,30 @@
+package io.renren.modules.sys.excel.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class StatusConverter implements Converter {
+ @Override
+ public Class supportJavaTypeKey() {
+ return Integer.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ return cellData.getStringValue().equals("正常") ? 1 : 0;
+ }
+
+ @Override
+ public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value == 1 ? "正常" : "停用");
+ }
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/redis/SysParamsRedis.java b/admin/src/main/java/io/renren/modules/sys/redis/SysParamsRedis.java
new file mode 100644
index 0000000..a008869
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/redis/SysParamsRedis.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package io.renren.modules.sys.redis;
+
+import io.renren.common.redis.RedisKeys;
+import io.renren.common.redis.RedisUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+@Component
+@AllArgsConstructor
+public class SysParamsRedis {
+ private final RedisUtils redisUtils;
+
+ public void delete(Object[] paramCodes) {
+ String key = RedisKeys.getSysParamsKey();
+ redisUtils.hDel(key, paramCodes);
+ }
+
+ public void set(String paramCode, String paramValue) {
+ if (paramValue == null) {
+ return;
+ }
+ String key = RedisKeys.getSysParamsKey();
+ redisUtils.hSet(key, paramCode, paramValue);
+ }
+
+ public String get(String paramCode) {
+ String key = RedisKeys.getSysParamsKey();
+ return (String) redisUtils.hGet(key, paramCode);
+ }
+
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/service/SysDeptService.java b/admin/src/main/java/io/renren/modules/sys/service/SysDeptService.java
new file mode 100644
index 0000000..968806e
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/service/SysDeptService.java
@@ -0,0 +1,34 @@
+
+
+package io.renren.modules.sys.service;
+
+import io.renren.common.service.BaseService;
+import io.renren.modules.sys.dto.SysDeptDTO;
+import io.renren.modules.sys.entity.SysDeptEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门管理
+ *
+
+ */
+public interface SysDeptService extends BaseService {
+
+ List list(Map params);
+
+ SysDeptDTO get(Long id);
+
+ void save(SysDeptDTO dto);
+
+ void update(SysDeptDTO dto);
+
+ void delete(Long id);
+
+ /**
+ * 根据部门ID，获取本部门及子部门ID列表
+ * @param id 部门ID
+ */
+ List getSubDeptIdList(Long id);
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/service/SysDictDataService.java b/admin/src/main/java/io/renren/modules/sys/service/SysDictDataService.java
new file mode 100644
index 0000000..5c2d180
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/service/SysDictDataService.java
@@ -0,0 +1,29 @@
+
+
+package io.renren.modules.sys.service;
+
+import io.renren.common.page.PageData;
+import io.renren.common.service.BaseService;
+import io.renren.modules.sys.dto.SysDictDataDTO;
+import io.renren.modules.sys.entity.SysDictDataEntity;
+
+import java.util.Map;
+
+/**
+ * 数据字典
+ *
+
+ */
+public interface SysDictDataService extends BaseService {
+
+ PageData page(Map params);
+
+ SysDictDataDTO get(Long id);
+
+ void save(SysDictDataDTO dto);
+
+ void update(SysDictDataDTO dto);
+
+ void delete(Long[] ids);
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/service/SysDictTypeService.java b/admin/src/main/java/io/renren/modules/sys/service/SysDictTypeService.java
new file mode 100644
index 0000000..56f8f48
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/service/SysDictTypeService.java
@@ -0,0 +1,36 @@
+
+
+package io.renren.modules.sys.service;
+
+import io.renren.common.page.PageData;
+import io.renren.common.service.BaseService;
+import io.renren.modules.sys.dto.SysDictTypeDTO;
+import io.renren.modules.sys.entity.DictType;
+import io.renren.modules.sys.entity.SysDictTypeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据字典
+ *
+
+ */
+public interface SysDictTypeService extends BaseService {
+
+ PageData page(Map params);
+
+ SysDictTypeDTO get(Long id);
+
+ void save(SysDictTypeDTO dto);
+
+ void update(SysDictTypeDTO dto);
+
+ void delete(Long[] ids);
+
+ /**
+ * 获取所有字典
+ */
+ List getAllList();
+
+}
\ No newline at end of file
diff --git a/admin/src/main/java/io/renren/modules/sys/service/SysMenuService.java b/admin/src/main/java/io/renren/modules/sys/service/SysMenuService.java
new file mode 100644
index 0000000..a72939b
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/service/SysMenuService.java
@@ -0,0 +1,48 @@
+
+
+package io.renren.modules.sys.service;
+
+import io.renren.common.service.BaseService;
+import io.renren.modules.security.user.UserDetail;
+import io.renren.modules.sys.dto.SysMenuDTO;
+import io.renren.modules.sys.entity.SysMenuEntity;
+
+import java.util.List;
+
+
+/**
+ * 菜单管理
+ *
+
+ */
+public interface SysMenuService extends BaseService {
+
+ SysMenuDTO get(Long id);
+
+ void save(SysMenuDTO dto);
+
+ void update(SysMenuDTO dto);
+
+ void delete(Long id);
+
+ /**
+ * 菜单列表
+ *
+ * @param menuType 菜单类型
+ */
+ List getAllMenuList(Integer menuType);
+
+ /**
+ * 用户菜单列表
+ *
+ * @param user 用户
+ * @param menuType 菜单类型
+ */
+ List getUserMenuList(UserDetail user, Integer menuType);
+
+ /**
+ * 根据父菜单，查询子菜单
+ * @param pid 父菜单ID
+ */
+ List getListPid(Long pid);
+}
diff --git a/admin/src/main/java/io/renren/modules/sys/service/SysParamsService.java b/admin/src/main/java/io/renren/modules/sys/service/SysParamsService.java
new file mode 100644
index 0000000..a51da37
--- /dev/null
+++ b/admin/src/main/java/io/renren/modules/sys/service/SysParamsService.java
@@ -0,0 +1,54 @@
+
+
+package io.renren.modules.sys.service;
+
+
+import io.renren.common.page.PageData;
+import io.renren.common.service.BaseService;
+import io.renren.modules.sys.dto.SysParamsDTO;
+import io.renren.modules.sys.entity.SysParamsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 参数管理
+ *
+
+ * @since 1.0.0
+ */
+public interface SysParamsService extends BaseService {
+
+ PageData page(Map