WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 用户平台模块数据库更新

Browse Source
This commit is contained in:
TsMask
2024-11-30 16:23:49 +08:00
parent 66c6a05800
commit c362641c21
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
sql/wfc-user-platform/wfc-user-platform.sql
View File

@@ -39,9 +39,9 @@ CREATE TABLE `u_config` (
-- Records of u_config -- Records of u_config
-- ---------------------------- -- ----------------------------
INSERT INTO `u_config` VALUES (1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow'); INSERT INTO `u_config` VALUES (1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow');
INSERT INTO `u_config` VALUES (2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '初始化密码 123456'); INSERT INTO `u_config` VALUES (2, '用户管理-账号初始密码', 'user.initPassword', '123456', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '初始化密码 123456');
INSERT INTO `u_config` VALUES (3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '深色主题theme-dark，浅色主题theme-light'); INSERT INTO `u_config` VALUES (3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '深色主题theme-dark，浅色主题theme-light');
INSERT INTO `u_config` VALUES (4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '是否开启注册用户功能（true开启，false关闭）'); INSERT INTO `u_config` VALUES (4, '账号自助-是否开启用户注册功能', 'user.register', 'true', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '是否开启注册用户功能（true开启，false关闭）');
INSERT INTO `u_config` VALUES (5, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）'); INSERT INTO `u_config` VALUES (5, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', '2024-05-08 21:50:55', '', NULL, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
-- ---------------------------- -- ----------------------------
@@ -432,34 +432,37 @@ INSERT INTO `u_role_menu` VALUES (2, 1029);
-- Table structure for u_user -- Table structure for u_user
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `u_user`; DROP TABLE IF EXISTS `u_user`;
CREATE TABLE `u_user` ( CREATE TABLE `u_user` (
`user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID', `user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID',
`dept_id` bigint NULL DEFAULT NULL COMMENT '部门ID', `dept_id` bigint DEFAULT NULL COMMENT '部门ID',
`user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户账号', `user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户账号',
`nick_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户昵称', `nick_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户昵称',
`user_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '00' COMMENT '用户类型（00系统用户）', `full_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户姓名',
`email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱', `user_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '00' COMMENT '用户类型（00系统用户）',
`phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码', `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户邮箱',
`sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）', `phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '手机号码',
`avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '头像地址', `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）',
`password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '密码', `avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '头像地址',
`status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）', `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '密码',
`del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', `age` int DEFAULT NULL COMMENT '年龄',
`login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP', `address` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '地址',
`login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间', `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
`create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '最后登录IP',
`update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', `login_date` datetime DEFAULT NULL COMMENT '最后登录时间',
`update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`user_id`) USING BTREE PRIMARY KEY (`user_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户平台_用户信息表' ROW_FORMAT = DYNAMIC; ) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户平台_用户信息表';
-- ---------------------------- -- ----------------------------
-- Records of u_user password=123456 -- Records of u_user password=123456
-- ---------------------------- -- ----------------------------
INSERT INTO `u_user` VALUES (1, 100, '123456', '高级用户', '00', '123456@163.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', '0', '0', '127.0.0.1', '2024-11-27 15:41:48', 'system', '2024-05-08 21:50:54', '', NULL, '管理员'); INSERT INTO `u_user` VALUES (1, 100, '123456', '高级用户', '高级用户', '00', '123456@163.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '127.0.0.1', '2024-11-27 15:41:48', 'system', '2024-05-08 21:50:54', '', NULL, '管理员');
INSERT INTO `u_user` VALUES (2, 101, '1000', '普通用户', '00', '1000@qq.com', '1000', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', '0', '0', '127.0.0.1', '2024-11-27 15:41:48', 'system', '2024-05-08 21:50:54', '', '2024-11-27 15:41:48', ''); INSERT INTO `u_user` VALUES (2, 101, '1000', '普通用户', '高级用户', '00', '1000@qq.com', '1000', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '127.0.0.1', '2024-11-27 15:41:48', 'system', '2024-05-08 21:50:54', '', '2024-11-27 15:41:48', '');
-- ---------------------------- -- ----------------------------
-- Table structure for u_user_post -- Table structure for u_user_post

4
wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java
View File

@@ -173,7 +173,7 @@ public class UUserController extends BaseController
public R<Boolean> register(@RequestBody UUser uUser) public R<Boolean> register(@RequestBody UUser uUser)
{ {
String username = uUser.getUserName(); String username = uUser.getUserName();
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) if (!("true".equals(configService.selectConfigByKey("user.register"))))
{ {
return R.fail("当前系统没有开启注册功能！"); return R.fail("当前系统没有开启注册功能！");
} }
@@ -184,7 +184,7 @@ public class UUserController extends BaseController
if (!userService.checkPhoneUnique(uUser)) if (!userService.checkPhoneUnique(uUser))
{ {
return R.fail("user.register.phone.save.error"); return R.fail("user.register.phone.save.error " + username);
} }
if (!userService.checkEmailUnique(uUser)) if (!userService.checkEmailUnique(uUser))

2
wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java
View File

@@ -496,7 +496,7 @@ public class UUserServiceImpl implements IUUserService
{ {
BeanValidators.validateWithException(validator, user); BeanValidators.validateWithException(validator, user);
deptService.checkDeptDataScope(user.getDeptId()); deptService.checkDeptDataScope(user.getDeptId());
String password = configService.selectConfigByKey("U.user.initPassword"); String password = configService.selectConfigByKey("user.initPassword");
user.setPassword(SecurityUtils.encryptPassword(password)); user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName); user.setCreateBy(operName);
userMapper.insertUser(user); userMapper.insertUser(user);