diff --git a/escheduler-dao/readme.txt b/escheduler-dao/readme.txt index d3659dc68a..c47308a1a1 100644 --- a/escheduler-dao/readme.txt +++ b/escheduler-dao/readme.txt @@ -1 +1,13 @@ -alter table t_escheduler_user add queue varchar(64); \ No newline at end of file +-- 用户指定队列 +alter table t_escheduler_user add queue varchar(64); + +-- 访问token +CREATE TABLE `t_escheduler_access_token` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` int(11) DEFAULT NULL COMMENT '用户id', + `token` varchar(64) DEFAULT NULL COMMENT 'token令牌', + `expire_time` datetime DEFAULT NULL COMMENT 'token有效结束时间', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java index ad823a60ad..d5dfdcb1ec 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java +++ b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java @@ -16,10 +16,9 @@ */ package cn.escheduler.dao.mapper; -import cn.escheduler.common.enums.UserType; +import cn.escheduler.common.utils.EncryptionUtils; import cn.escheduler.dao.datasource.ConnectionFactory; import cn.escheduler.dao.model.AccessToken; -import cn.escheduler.dao.model.User; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -28,6 +27,7 @@ import java.util.Date; import java.util.List; + public class AccessTokenMapperTest { @@ -51,12 +51,12 @@ public class AccessTokenMapperTest { @Test public void testListPaging(){ - Integer integer = accessTokenMapper.countAccessTokenPaging(""); - System.out.println(integer); + Integer count = accessTokenMapper.countAccessTokenPaging(""); + Assert.assertEquals(count, (Integer) 5); + List accessTokenList = accessTokenMapper.queryAccessTokenPaging("", 0, 2); - System.out.println(accessTokenList); + Assert.assertEquals(accessTokenList.size(), 5); } - } diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java index 08fdbc51b4..adede0c329 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java +++ b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java @@ -68,7 +68,7 @@ public class UserMapperTest { @Test public void testQueryUserByToken(){ - User user = userMapper.queryUserByToken("ssssssssssssssssssssssssss"); + User user = userMapper.queryUserByToken("ad9e8fccfc11bd18bb45aa994568b8ef"); Assert.assertEquals(user.getUserName(), "qiaozhanwei"); }