diff --git a/doc/sql/easy_retry_mysql.sql b/doc/sql/easy_retry_mysql.sql index 8078360f..a2f2e588 100644 --- a/doc/sql/easy_retry_mysql.sql +++ b/doc/sql/easy_retry_mysql.sql @@ -39,7 +39,7 @@ CREATE TABLE `group_config` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - UNIQUE KEY `uk_name` (`group_name`) + UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='组配置' @@ -62,7 +62,7 @@ CREATE TABLE `notify_config` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - KEY `idx_group_name` (`group_name`) + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='通知配置' @@ -83,11 +83,11 @@ CREATE TABLE `retry_dead_letter_0` `task_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '任务类型 1、重试数据 2、回调数据', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`), - KEY `idx_group_name_scene_name` (`group_name`, `scene_name`), + KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), KEY `idx_idempotent_id` (`idempotent_id`), KEY `idx_biz_no` (`biz_no`), KEY `idx_create_dt` (`create_dt`), - UNIQUE KEY `uk_name_unique_id` (`group_name`, `unique_id`) + UNIQUE KEY `uk_namespace_id_group_name_unique_id` (`namespace_id`, `group_name`, `unique_id`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='死信队列表' @@ -112,12 +112,13 @@ CREATE TABLE `retry_task_0` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - KEY `idx_group_name_scene_name` (`group_name`, `scene_name`), - KEY `idx_retry_status` (`retry_status`), + KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`,`group_name`, `scene_name`), + KEY `idx_namespace_id_group_name_task_type` (`namespace_id`,`group_name`, `task_type`), + KEY `idx_namespace_id_group_name_retry_status` (`namespace_id`,`group_name`, `retry_status`), KEY `idx_idempotent_id` (`idempotent_id`), KEY `idx_biz_no` (`biz_no`), KEY `idx_create_dt` (`create_dt`), - UNIQUE KEY `uk_name_unique_id` (`group_name`, `unique_id`) + UNIQUE KEY `uk_name_unique_id` (`namespace_id`, `group_name`, `unique_id`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='任务表' @@ -139,7 +140,7 @@ CREATE TABLE `retry_task_log` `task_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '任务类型 1、重试数据 2、回调数据', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`), - KEY `idx_group_name_scene_name` (`group_name`, `scene_name`), + KEY `idx_group_name_scene_name` (`namespace_id`,`group_name`, `scene_name`), KEY `idx_retry_status` (`retry_status`), KEY `idx_idempotent_id` (`idempotent_id`), KEY `idx_unique_id` (`unique_id`), @@ -160,7 +161,7 @@ CREATE TABLE `retry_task_log_message` `message` text NOT NULL COMMENT '异常信息', `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port', PRIMARY KEY (`id`), - KEY `idx_group_name_unique_id` (`group_name`, `unique_id`), + KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`,`group_name`, `unique_id`), KEY `idx_create_dt` (`create_dt`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 @@ -184,7 +185,7 @@ CREATE TABLE `scene_config` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - UNIQUE KEY `uk_group_name_scene_name` (`group_name`, `scene_name`) + UNIQUE KEY `uk_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='场景配置' @@ -205,6 +206,7 @@ CREATE TABLE `server_node` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), + KEY `idx_namespace_id_group_name` (`namespace_id`,`group_name`), KEY `idx_expire_at_node_type` (`expire_at`, `node_type`), UNIQUE KEY `uk_host_id_host_ip` (`host_id`, `host_ip`) ) ENGINE = InnoDB @@ -254,20 +256,20 @@ CREATE TABLE `system_user_permission` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - UNIQUE KEY `uk_group_name_system_user_id` (`group_name`, `system_user_id`) USING BTREE + UNIQUE KEY `uk_namespace_id_group_name_system_user_id` (`namespace_id`, `group_name`, `system_user_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户权限表'; CREATE TABLE `sequence_alloc` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称', - `max_id` bigint(20) NOT NULL DEFAULT '1' COMMENT '最大id', - `step` int(11) NOT NULL DEFAULT '100' COMMENT '步长', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称', + `max_id` bigint(20) NOT NULL DEFAULT '1' COMMENT '最大id', + `step` int(11) NOT NULL DEFAULT '100' COMMENT '步长', + `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`), - UNIQUE KEY `uk_group_name` (`group_name`) USING BTREE + UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='号段模式序号ID分配表'; @@ -301,7 +303,7 @@ CREATE TABLE `job` `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `deleted` tinyint(4) NOT NULL DEFAULT '0' COMMENT '逻辑删除 1、删除', PRIMARY KEY (`id`), - KEY `idx_group_name` (`group_name`), + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), KEY `idx_job_status_bucket_index` (`job_status`, `bucket_index`), KEY `idx_create_dt` (`create_dt`) ) ENGINE = InnoDB @@ -322,7 +324,7 @@ CREATE TABLE `job_log_message` PRIMARY KEY (`id`), KEY `idx_task_batch_id_task_id` (`task_batch_id`, `task_id`), KEY `idx_create_dt` (`create_dt`), - KEY `idx_group_name` (`group_name`) + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='调度日志'; @@ -347,7 +349,7 @@ CREATE TABLE `job_task` PRIMARY KEY (`id`), KEY `idx_task_batch_id_task_status` (`task_batch_id`, `task_status`), KEY `idx_create_dt` (`create_dt`), - KEY `idx_group_name` (`group_name`) + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='任务实例'; @@ -369,7 +371,7 @@ CREATE TABLE `job_task_batch` PRIMARY KEY (`id`), KEY `idx_job_id_task_batch_status` (`job_id`, `task_batch_status`), KEY `idx_create_dt` (`create_dt`), - KEY `idx_group_name` (`group_name`) + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='任务批次'; diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/ServerNodeMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/ServerNodeMapper.java index f8599cc6..164a7f5d 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/ServerNodeMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/ServerNodeMapper.java @@ -12,8 +12,6 @@ import java.util.List; @Mapper public interface ServerNodeMapper extends BaseMapper { - int insertOrUpdate(ServerNode record); - int insertOrUpdate(List records); int deleteByExpireAt(@Param("endTime") LocalDateTime endTime); diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml index 46550210..60e21271 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml @@ -3,6 +3,7 @@ + @@ -15,16 +16,16 @@ - id, group_name, context_path, host_id, host_ip, host_port, expire_at, node_type,create_dt,update_dt + id, namespace_id, group_name, context_path, host_id, host_ip, host_port, expire_at, node_type,create_dt,update_dt - - insert into server_node (id, group_name, host_id, host_ip, host_port, + + insert into server_node (namespace_id, group_name, host_id, host_ip, host_port, expire_at, node_type, ext_attrs, context_path, create_dt) values - #{id,jdbcType=BIGINT}, #{groupName,jdbcType=VARCHAR}, #{hostId,jdbcType=VARCHAR}, #{hostIp,jdbcType=VARCHAR}, - #{hostPort,jdbcType=INTEGER}, - #{expireAt,jdbcType=TIMESTAMP}, #{nodeType,jdbcType=TINYINT}, #{extAttrs,jdbcType=VARCHAR}, #{contextPath,jdbcType=VARCHAR}, #{createDt,jdbcType=TIMESTAMP} + #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.hostId,jdbcType=VARCHAR}, #{item.hostIp,jdbcType=VARCHAR}, + #{item.hostPort,jdbcType=INTEGER}, #{item.expireAt,jdbcType=TIMESTAMP}, #{item.nodeType,jdbcType=TINYINT}, + #{item.extAttrs,jdbcType=VARCHAR}, #{item.contextPath,jdbcType=VARCHAR}, #{item.createDt,jdbcType=TIMESTAMP} ON DUPLICATE KEY UPDATE expire_at = values(`expire_at`) diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java index 3a727b44..1aec0617 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java @@ -135,7 +135,7 @@ public class CacheRegisterTable implements Lifecycle { LogUtils.info(log, "Add cache. groupName:[{}] namespaceId:[{}] hostId:[{}]", serverNode.getGroupName(), serverNode.getNamespaceId(), serverNode.getHostId()); concurrentMap = new ConcurrentHashMap<>(); registerNodeInfo = RegisterNodeInfoConverter.INSTANCE.toRegisterNodeInfo(serverNode); - CACHE.put(serverNode.getGroupName(), concurrentMap); + CACHE.put(getKey(serverNode.getGroupName(), serverNode.getNamespaceId()), concurrentMap); } else { // 复用缓存中的对象 registerNodeInfo = concurrentMap.getOrDefault(serverNode.getHostId(), RegisterNodeInfoConverter.INSTANCE.toRegisterNodeInfo(serverNode)); diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/handler/ServerNodeBalance.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/handler/ServerNodeBalance.java index bbbf6ad2..c1091577 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/handler/ServerNodeBalance.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/handler/ServerNodeBalance.java @@ -1,6 +1,7 @@ package com.aizuda.easy.retry.server.common.handler; import cn.hutool.core.util.StrUtil; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.common.Lifecycle; @@ -64,7 +65,7 @@ public class ServerNodeBalance implements Lifecycle, Runnable { try { // 为了保证客户端分配算法的一致性,serverNodes 从数据库从数据获取 - Set podIpSet = CacheRegisterTable.getPodIdSet(ServerRegister.GROUP_NAME, StrUtil.EMPTY); + Set podIpSet = CacheRegisterTable.getPodIdSet(ServerRegister.GROUP_NAME, ServerRegister.NAMESPACE_ID); if (CollectionUtils.isEmpty(podIpSet)) { LogUtils.error(log, "server node is empty"); @@ -168,7 +169,7 @@ public class ServerNodeBalance implements Lifecycle, Runnable { // 获取缓存中的节点 ConcurrentMap concurrentMap = Optional.ofNullable(CacheRegisterTable - .get(ServerRegister.GROUP_NAME, StrUtil.EMPTY)).orElse(new ConcurrentHashMap<>()); + .get(ServerRegister.GROUP_NAME, ServerRegister.NAMESPACE_ID)).orElse(new ConcurrentHashMap<>()); Set remoteHostIds = remotePods.stream().map(ServerNode::getHostId).collect(Collectors.toSet()); @@ -201,7 +202,7 @@ public class ServerNodeBalance implements Lifecycle, Runnable { // 再次获取最新的节点信息 concurrentMap = CacheRegisterTable - .get(ServerRegister.GROUP_NAME, StrUtil.EMPTY); + .get(ServerRegister.GROUP_NAME, ServerRegister.NAMESPACE_ID); // 找出过期的节点 Set expireNodeSet = concurrentMap.values().stream() diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java index 8381d501..52b5f0f3 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java @@ -60,6 +60,7 @@ public abstract class AbstractRegister implements Register, Lifecycle { ServerNode serverNode = new ServerNode(); serverNode.setHostId(context.getHostId()); serverNode.setHostIp(context.getHostIp()); + serverNode.setNamespaceId(context.getNamespaceId()); serverNode.setGroupName(context.getGroupName()); serverNode.setHostPort(context.getHostPort()); serverNode.setNodeType(getNodeType()); diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/RegisterContext.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/RegisterContext.java index d103662d..a63ebcf3 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/RegisterContext.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/RegisterContext.java @@ -12,6 +12,8 @@ import java.time.LocalDateTime; @Data public class RegisterContext { + private String namespaceId; + private String groupName; private String hostId; diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java index 75381c4a..424704c0 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java @@ -38,6 +38,7 @@ public class ServerRegister extends AbstractRegister { public static final int DELAY_TIME = 30; public static final String CURRENT_CID; public static final String GROUP_NAME = "DEFAULT_SERVER"; + public static final String NAMESPACE_ID = "DEFAULT_SERVER_NAMESPACE_ID"; @Autowired public ServerNodeBalance serverNodeBalance; @@ -67,6 +68,7 @@ public class ServerRegister extends AbstractRegister { context.setHostIp(HostUtils.getIp()); context.setHostPort(systemProperties.getNettyPort()); context.setContextPath(StrUtil.EMPTY); + context.setNamespaceId(NAMESPACE_ID); context.setExtAttrs(JsonUtil.toJsonString(serverNodeExtAttrs)); } diff --git a/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/starter/server/RequestHandlerActor.java b/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/starter/server/RequestHandlerActor.java index b6a77304..a8b94cbb 100644 --- a/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/starter/server/RequestHandlerActor.java +++ b/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/starter/server/RequestHandlerActor.java @@ -87,6 +87,7 @@ public class RequestHandlerActor extends AbstractActor { Integer hostPort = headers.getInt(HeadersEnum.HOST_PORT.getKey()); String groupName = headers.get(HeadersEnum.GROUP_NAME.getKey()); String contextPath = headers.get(HeadersEnum.CONTEXT_PATH.getKey()); + String namespace = headers.get(HeadersEnum.NAMESPACE.getKey()); // 注册版本 RegisterContext registerContext = new RegisterContext(); @@ -96,6 +97,7 @@ public class RequestHandlerActor extends AbstractActor { registerContext.setHostIp(hostIp); registerContext.setHostId(hostId); registerContext.setUri(uri); + registerContext.setNamespaceId(namespace); boolean result = register.register(registerContext); if (!result) { LogUtils.warn(log, "client register error. groupName:[{}]", groupName); diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java index 3095060c..65fd389e 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java @@ -295,7 +295,8 @@ public class GroupConfigServiceImpl implements GroupConfigService { List groupConfigs = groupConfigAccess.list(new LambdaQueryWrapper() .in(GroupConfig::getNamespaceId, UserSessionUtils.currentUserSession().getNamespaceId()) - .select(GroupConfig::getGroupName)).stream() + .select(GroupConfig::getGroupName)) + .stream() .collect(Collectors.toList()); return groupConfigs.stream().map(GroupConfig::getGroupName).collect(Collectors.toList()); diff --git a/frontend/src/api/manage.js b/frontend/src/api/manage.js index f37eb8eb..58ce92cf 100644 --- a/frontend/src/api/manage.js +++ b/frontend/src/api/manage.js @@ -188,13 +188,6 @@ export function getPartitionTableList () { }) } -export function getTotalPartition () { - return request({ - url: api.totalPartition, - method: 'get' - }) -} - export function getLineDispatchQuantity (parameter) { return request({ url: api.lineDispatchQuantity, @@ -240,11 +233,10 @@ export function getGroupConfigForPage (parameter) { }) } -export function getAllGroupNameList (data) { +export function getAllGroupNameList () { return request({ url: api.allGroupNameList, - method: 'post', - data + method: 'get' }) } diff --git a/frontend/src/views/namespace/NamespaceForm.vue b/frontend/src/views/namespace/NamespaceForm.vue index f1e2bca9..a448f3c8 100644 --- a/frontend/src/views/namespace/NamespaceForm.vue +++ b/frontend/src/views/namespace/NamespaceForm.vue @@ -57,7 +57,6 @@ export default { methods: { isShow (record) { this.formType = record ? 'edit' : 'create' - console.log(this.formType) this.loadEditInfo(record) this.visible = true this.form.resetFields() @@ -79,6 +78,8 @@ export default { this.visible = false }) } + + this.$store.dispatch('GetInfo') } }) }, diff --git a/frontend/src/views/user/UserList.vue b/frontend/src/views/user/UserList.vue index 2971c465..65523047 100644 --- a/frontend/src/views/user/UserList.vue +++ b/frontend/src/views/user/UserList.vue @@ -43,7 +43,7 @@ :rowSelection="options.rowSelection" > - {{ record.id }} + {{ record.id }} {{ record.role === 2 ? '所有组' : text.toString() }} @@ -66,6 +66,33 @@ + +

Some contents...

+

Some contents...

+

Some contents...

+ +
+ + +
@@ -150,7 +177,8 @@ export default { onChange: this.onSelectChange } }, - optionAlertShow: false + optionAlertShow: false, + openDrawer: false } }, filters: { @@ -175,6 +203,12 @@ export default { handleGoBack () { this.record = '' this.currentComponet = 'List' + }, + handlerDetail () { + this.openDrawer = true + }, + onClose () { + this.openDrawer = false } }, watch: {