OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

feat: 更新用户类型字段为"System"并添加用户来源字段

Browse Source
This commit is contained in:
TsMask
2025-08-14 16:08:57 +08:00
parent c7f4a5f3d1
commit 4ad4060913
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/install/sys_log_operate.sql
View File

@@ -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',

5
database/upgrade/upg_sys_log_operate.sql
View File

@@ -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`;

3
database/upgrade/upg_sys_user.sql
View File

@@ -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;

9
src/modules/common/service/register.impl.go
View File

@@ -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{}

3
src/modules/system/controller/sys_user.go
View File

@@ -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"],

2
src/modules/system/model/sys_log_operate.go
View File

@@ -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"`