gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ASW-47 user 接口开发

Browse Source
This commit is contained in:
zhangshuai
2024-08-21 10:19:01 +08:00
parent 6ea9ad9413
commit 756d8c5cd1
19 changed files with 447 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/resources/db/mapper/sys/SysUserMapper.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.geedge.asw.module.sys.dao.SysUserDao">
<resultMap id="userList" type="net.geedge.asw.module.sys.entity.SysUserEntity">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="userName" column="user_name"/>
<result property="accessLevel" column="access_level"/>
<result property="language" column="language"/>
<result property="lastLoginIp" column="last_login_ip"/>
<result property="lastLoginTimestamp" column="last_login_timestamp"/>
<result property="createUserId" column="create_user_id"/>
<result property="updateUserId" column="update_user_id"/>
<result property="createTimestamp" column="create_timestamp"/>
<result property="updateTimestamp" column="update_timestamp"/>
<association property="createUser" columnPrefix="cu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
</association>
<association property="updateUser" columnPrefix="uu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
</association>
</resultMap>
<select id="queryList" resultMap="userList">
SELECT
su.*,
cu.id as cu_id,
cu.name as cu_name,
uu.id as uu_id,
uu.id as uu_name
FROM
sys_user su
left join sys_user cu on su.create_user_id = cu.id
left join sys_user uu on su.update_user_id = uu.id
<where>
<if test="params.ids != null and params.ids != ''">
su.id in
<foreach item="id" collection="params.ids.split(',')" separator="," open="(" close=")">
#{id}
</foreach>
</if>
<if test="params.q != null and params.q != ''">
AND ( locate(#{params.q}, su.name) OR locate(#{params.q}, su.user_name) )
</if>
</where>
<if test="params.orderBy == null or params.orderBy == ''">
ORDER BY su.id
</if>
</select>
</mapper>

18
src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
View File

@@ -25,6 +25,11 @@
<result property="name" column="name"/>
</association>
<association property="workspace" columnPrefix="w_" javaType="net.geedge.asw.module.workspace.entity.WorkspaceEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
</association>
</resultMap>
<select id="queryList" resultMap="workspaceMemberResultMap">
SELECT
@@ -34,15 +39,22 @@
su.id AS su_id,
su.name AS su_name,
sr.id AS sr_id,
sr.name AS sr_name
sr.name AS sr_name,
ws.id AS w_id,
ws.name AS w_name
FROM
workspace_member wm
LEFT JOIN sys_user cu ON wm.create_user_id = cu.id
LEFT JOIN sys_user su ON wm.user_id = su.id
LEFT JOIN sys_role sr ON wm.role_id = sr.id
LEFT JOIN workspace ws ON wm.workspace_id = ws.id
<where>
<if test="workspaceId != null and workspaceId != ''">
wm.workspace_id = #{workspaceId}
<if test="params.workspaceId != null and params.workspaceId != ''">
wm.workspace_id = #{params.workspaceId}
</if>
<if test="params.userId != null and params.userId != ''">
wm.user_id = #{params.userId}
</if>
</where>
</select>

11
src/main/resources/db/migration/R__AZ_sys_i18n.sql
View File

@@ -93,5 +93,16 @@ INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (143, '501001', 'PCAP_UPLOAD_WEB_SHARK_ERROR', 'pcap 上传失败', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (145, '201009', 'APP_PACKAGE_NAME_FORMAT_ERROR', 'application package name format error', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (147, '201009', 'APP_PACKAGE_NAME_FORMAT_ERROR', '应用安装包名称格式错误', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (149, '100013', 'SYS_USER_NAME_CANNOT_EMPTY', 'username cannot be empty', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (151, '100013', 'SYS_USER_NAME_CANNOT_EMPTY', '用户名称不能为空', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (153, '100014', 'SYS_ACCESS_LEVEL_CANNOT_EMPTY', 'accessLevel cannot be empty', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (155, '100014', 'SYS_ACCESS_LEVEL_CANNOT_EMPTY', '访问级别不能为空', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (157, '100015', 'SYS_WORKSPACE_ROLES_CANNOT_EMPTY', 'workspaceRoles cannot be empty', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (159, '100015', 'SYS_WORKSPACE_ROLES_CANNOT_EMPTY', '工作空间用户与权限不能为空', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (161, '100016', 'SYS_USER_BUILT_IN', 'Built-in user are not allowed to delete or update', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (163, '100016', 'SYS_USER_BUILT_IN', '内置用户不允许删除或更新', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (165, '401010', 'WORKSPACE_NOT_EXIST', 'Workspace does not exist', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (167, '401010', 'WORKSPACE_NOT_EXIST', '工作空间不存在', 'zh', '', 'admin', 1724030366000);
SET FOREIGN_KEY_CHECKS = 1;

16
src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql
View File

@@ -9,13 +9,19 @@ CREATE TABLE `sys_user` (
`user_name` varchar(255) NOT NULL,
`pwd` varchar(255) NOT NULL,
`access_level` varchar(255) NOT NULL,
`create_timestamp` bigint(20) NOT NULL,
`language` VARCHAR(256) NOT NULL DEFAULT 'en' COMMENT '语言',
`last_login_ip` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '最后登录IP',
`last_login_timestamp` BIGINT(20) NOT NULL COMMENT '最后登录时间',
`create_timestamp` BIGINT(20) NOT NULL COMMENT '创建时间戳',
`update_timestamp` BIGINT(20) NOT NULL COMMENT '更新时间戳',
`create_user_id` VARCHAR(64) NOT NULL COMMENT '创建人id',
`update_user_id` VARCHAR(64) NOT NULL COMMENT '更新人id',
PRIMARY KEY (`id`),
UNIQUE KEY `idx_user_name` (`user_name`) USING BTREE,
KEY `idx_name` (`name`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 添加内置用户
INSERT INTO `sys_user`(`id`, `name`, `user_name`, `pwd`, `access_level`, `create_timestamp`) VALUES ('admin', 'admin', 'admin', 'ad9d757e620d5d9cd8e32c3dbcf37525', 'administrator', UNIX_TIMESTAMP(NOW())*1000);
INSERT INTO `sys_user`(`id`, `name`, `user_name`, `pwd`, `access_level`, `language`, `last_login_ip`, `last_login_timestamp`, `create_timestamp`, `update_timestamp`, `create_user_id`, `update_user_id`) VALUES ('admin', 'admin', 'admin', 'ad9d757e620d5d9cd8e32c3dbcf37525', 'administrator', 'en', '', UNIX_TIMESTAMP(NOW())*1000, UNIX_TIMESTAMP(NOW())*1000, UNIX_TIMESTAMP(NOW())*1000, 'admin', 'admin');
/**
* 1、新增 sys_role 表
@@ -394,7 +400,7 @@ CREATE TABLE `workspace` (
KEY `idx_name` (`name`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
INSERT INTO `workspace` (`id`, `name`, `tags`, `visibility`, `description`, `create_timestamp`, `update_timestamp`, `create_user_id`, `update_user_id`) VALUES ('1', 'default', '', 'public', '', 1722482392000, 1722482392000, 'admin', 'admin');
INSERT INTO `workspace` (`id`, `name`, `tags`, `visibility`, `description`, `create_timestamp`, `update_timestamp`, `create_user_id`, `update_user_id`) VALUES ('1', 'default', '', 'private', '', 1722482392000, 1722482392000, 'admin', 'admin');
DROP TABLE IF EXISTS `workspace_member`;
CREATE TABLE `workspace_member` (
@@ -406,4 +412,6 @@ CREATE TABLE `workspace_member` (
KEY `idx_workspace_id` (`workspace_id`) USING BTREE,
KEY `idx_user_id` (`user_id`) USING BTREE,
KEY `idx_role_id` (`role_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
INSERT INTO `workspace_member` (`workspace_id`, `user_id`, `role_id`, `create_timestamp`, `create_user_id`) VALUES ('1', 'admin', 'admin', 1724291229000, 'admin');