From c362641c215944a76517fa0847e8574c221d4b37 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 30 Nov 2024 16:23:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/wfc-user-platform/wfc-user-platform.sql | 47 ++++++++++--------- .../wfc/user/controller/UUserController.java | 4 +- .../user/service/impl/UUserServiceImpl.java | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/sql/wfc-user-platform/wfc-user-platform.sql b/sql/wfc-user-platform/wfc-user-platform.sql index 1b6cc95..a54e850 100644 --- a/sql/wfc-user-platform/wfc-user-platform.sql +++ b/sql/wfc-user-platform/wfc-user-platform.sql @@ -39,9 +39,9 @@ CREATE TABLE `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 (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 (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黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）'); -- ---------------------------- @@ -432,34 +432,37 @@ INSERT INTO `u_role_menu` VALUES (2, 1029); -- Table structure for 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', - `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 '用户账号', `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系统用户）', - `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱', - `phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码', - `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）', - `avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '头像地址', - `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '密码', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', - `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP', - `login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `full_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户姓名', + `user_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '00' COMMENT '用户类型（00系统用户）', + `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户邮箱', + `phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '手机号码', + `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）', + `avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '头像地址', + `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '密码', + `age` int DEFAULT NULL COMMENT '年龄', + `address` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '地址', + `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '帐号状态（0正常 1停用）', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', + `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '最后登录IP', + `login_date` datetime DEFAULT NULL COMMENT '最后登录时间', + `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' 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 -) 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 -- ---------------------------- -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 (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 (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', 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 diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java index b9fdc6f..7a46206 100644 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java @@ -173,7 +173,7 @@ public class UUserController extends BaseController public R register(@RequestBody UUser uUser) { String username = uUser.getUserName(); - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + if (!("true".equals(configService.selectConfigByKey("user.register")))) { return R.fail("当前系统没有开启注册功能！"); } @@ -184,7 +184,7 @@ public class UUserController extends BaseController 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)) diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java index 41645be..abe1d82 100644 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java @@ -496,7 +496,7 @@ public class UUserServiceImpl implements IUUserService { BeanValidators.validateWithException(validator, user); deptService.checkDeptDataScope(user.getDeptId()); - String password = configService.selectConfigByKey("U.user.initPassword"); + String password = configService.selectConfigByKey("user.initPassword"); user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); userMapper.insertUser(user);