diff --git a/database/install/sys_log_operate.sql b/database/install/sys_log_operate.sql index 240de2ad..dd3ae0a3 100644 --- a/database/install/sys_log_operate.sql +++ b/database/install/sys_log_operate.sql @@ -27,7 +27,7 @@ CREATE TABLE `sys_log_operate` ( `business_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '业务类型（0其它 1新增 2修改 3删除 4授权 5导出 6导入 7强退 8清空数据）', `method` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '方法名称', `request_method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '请求方式', - `operator_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '操作人员类别（0其它 1后台用户 2手机端用户）', + `operator_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'System' COMMENT '操作人员类别 来自用户类型', `oper_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作人员', `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '部门名称', `oper_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '请求URL', diff --git a/database/upgrade/upg_sys_log_operate.sql b/database/upgrade/upg_sys_log_operate.sql index 3073bcb1..674d2fc0 100644 --- a/database/upgrade/upg_sys_log_operate.sql +++ b/database/upgrade/upg_sys_log_operate.sql @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `sys_log_operate` ( `business_type` char(1) DEFAULT '0' COMMENT '业务类型（0其它 1新增 2修改 3删除 4授权 5导出 6导入 7强退 8清空数据）', `method` varchar(100) DEFAULT '' COMMENT '方法名称', `request_method` varchar(10) DEFAULT '' COMMENT '请求方式', - `operator_type` char(1) DEFAULT '0' COMMENT '操作人员类别（0其它 1后台用户 2手机端用户）', + `operator_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'System' COMMENT '操作人员类别 来自用户类型', `oper_name` varchar(50) DEFAULT '' COMMENT '操作人员', `dept_name` varchar(50) DEFAULT '' COMMENT '部门名称', `oper_url` varchar(255) DEFAULT '' COMMENT '请求URL', @@ -30,6 +30,5 @@ CREATE TABLE IF NOT EXISTS `sys_log_operate` ( PRIMARY KEY (`oper_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='系统操作日志表'; +ALTER TABLE `sys_log_operate` MODIFY COLUMN `operator_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'System' AFTER `request_method`; ALTER TABLE `sys_log_operate` ADD COLUMN IF NOT EXISTS `tenant_id` varchar(32) NULL DEFAULT NULL AFTER `cost_time`; - - diff --git a/database/upgrade/upg_sys_user.sql b/database/upgrade/upg_sys_user.sql index aeca6d49..1c608517 100644 --- a/database/upgrade/upg_sys_user.sql +++ b/database/upgrade/upg_sys_user.sql @@ -26,8 +26,9 @@ CREATE TABLE IF NOT EXISTS `sys_user` ( -- multi-tenancy ALTER TABLE `sys_user` ADD COLUMN IF NOT EXISTS `tenant_id` bigint(20) NULL DEFAULT NULL DEFAULT NULL COMMENT 'Tenant ID' AFTER `dept_id`; -ALTER TABLE `sys_user` ADD COLUMN IF NOT EXISTS `user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'System' COMMENT '用户类型（System系统用户）' AFTER `password`; +ALTER TABLE `sys_user` MODIFY COLUMN IF EXISTS `user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'System' COMMENT '用户类型（System系统用户）' AFTER `nick_name`; ALTER TABLE `sys_user` ADD COLUMN IF NOT EXISTS `user_source` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '#' COMMENT '用户来源UID (系统#)' AFTER `user_type`; UPDATE `sys_user` SET `status` = '1', `user_type` = 'System', `user_source` = '#' WHERE `user_id` in (1,2,3,4); +UPDATE `sys_user` SET `user_type` = 'System', `user_source` = '#' WHERE `user_type` = 'sys'; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/src/modules/common/service/register.impl.go b/src/modules/common/service/register.impl.go index 3c203fe5..4c8dd7e2 100644 --- a/src/modules/common/service/register.impl.go +++ b/src/modules/common/service/register.impl.go @@ -71,11 +71,12 @@ func (s *RegisterImpl) ByUserName(username, password, userType string) (string, Password: password, // 原始密码 Status: common.STATUS_YES, // 账号状态激活 DeptID: "100", // 归属部门为根节点 - CreateBy: "register", // 创建来源 + CreateBy: "System", // 创建来源 } // 标记用户类型 if userType == "" { - sysUser.UserType = "sys" + sysUser.UserType = "System" + sysUser.UserSource = "#" } // 新增用户的角色管理 sysUser.RoleIDs = s.registerRoleInit(userType) @@ -91,7 +92,7 @@ func (s *RegisterImpl) ByUserName(username, password, userType string) (string, // registerRoleInit 注册初始角色 func (s *RegisterImpl) registerRoleInit(userType string) []string { - if userType == "sys" { + if userType == "System" { return []string{} } return []string{} @@ -99,7 +100,7 @@ func (s *RegisterImpl) registerRoleInit(userType string) []string { // registerPostInit 注册初始岗位 func (s *RegisterImpl) registerPostInit(userType string) []string { - if userType == "sys" { + if userType == "System" { return []string{} } return []string{} diff --git a/src/modules/system/controller/sys_user.go b/src/modules/system/controller/sys_user.go index 6ff2ae39..ca1ec81b 100644 --- a/src/modules/system/controller/sys_user.go +++ b/src/modules/system/controller/sys_user.go @@ -715,7 +715,8 @@ func (s *SysUserController) ImportData(c *gin.Context) { // 构建用户实体信息 newSysUser := model.SysUser{ - UserType: "sys", + UserType: "System", + UserSource: "#", Password: initPassword, DeptID: row["I"], UserName: row["B"], diff --git a/src/modules/system/model/sys_log_operate.go b/src/modules/system/model/sys_log_operate.go index 9843b741..a2fffbcc 100644 --- a/src/modules/system/model/sys_log_operate.go +++ b/src/modules/system/model/sys_log_operate.go @@ -12,7 +12,7 @@ type SysLogOperate struct { Method string `json:"method"` // 请求方式 RequestMethod string `json:"requestMethod"` - // 操作人员类别（0其它 1后台用户 2手机端用户） + // 操作人员类别 来自用户类型 OperatorType string `json:"operatorType"` // 操作人员 OperName string `json:"operName"`