Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
3118a762
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3118a762
编写于
4月 18, 2019
作者:
Q
qiaozhanwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
api access token dev update
上级
d1b6cbf1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
5 deletion
+9
-5
escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java
...in/java/cn/escheduler/api/service/AccessTokenService.java
+3
-2
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java
...main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java
+1
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
...a/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
+2
-1
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java
.../java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java
+3
-2
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java
浏览文件 @
3118a762
...
...
@@ -111,6 +111,8 @@ public class AccessTokenService extends BaseService {
accessToken
.
setUserId
(
userId
);
accessToken
.
setExpireTime
(
DateUtils
.
stringToDate
(
expireTime
));
accessToken
.
setToken
(
token
);
accessToken
.
setCreateTime
(
new
Date
());
accessToken
.
setUpdateTime
(
new
Date
());
// insert
int
insert
=
accessTokenMapper
.
insert
(
accessToken
);
...
...
@@ -120,6 +122,7 @@ public class AccessTokenService extends BaseService {
}
else
{
putMsg
(
result
,
Status
.
CREATE_ALERT_GROUP_ERROR
);
}
return
result
;
}
...
...
@@ -173,8 +176,6 @@ public class AccessTokenService extends BaseService {
accessToken
.
setToken
(
token
);
accessToken
.
setUpdateTime
(
new
Date
());
accessTokenMapper
.
update
(
accessToken
);
putMsg
(
result
,
Status
.
SUCCESS
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java
浏览文件 @
3118a762
...
...
@@ -68,6 +68,7 @@ public interface AccessTokenMapper {
@Results
(
value
=
{
@Result
(
property
=
"id"
,
column
=
"id"
,
id
=
true
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"userId"
,
column
=
"user_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"token"
,
column
=
"token"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"userName"
,
column
=
"user_name"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"expireTime"
,
column
=
"expire_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"createTime"
,
column
=
"create_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"updateTime"
,
column
=
"update_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
)
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
浏览文件 @
3118a762
...
...
@@ -96,8 +96,9 @@ public class AccessTokenMapperProvider {
SELECT
(
"count(0)"
);
FROM
(
TABLE_NAME
+
" t,t_escheduler_user u"
);
Object
searchVal
=
parameter
.
get
(
"searchVal"
);
WHERE
(
"u.id = t.user_id"
);
if
(
searchVal
!=
null
&&
StringUtils
.
isNotEmpty
(
searchVal
.
toString
())){
WHERE
(
"
u.id = t.user_id and
u.user_name like concat('%', #{searchVal}, '%')"
);
WHERE
(
" u.user_name like concat('%', #{searchVal}, '%')"
);
}
}}.
toString
();
}
...
...
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java
浏览文件 @
3118a762
...
...
@@ -51,8 +51,9 @@ public class AccessTokenMapperTest {
@Test
public
void
testListPaging
(){
Integer
integer
=
accessTokenMapper
.
countAccessTokenPaging
(
"hw"
);
List
<
AccessToken
>
accessTokenList
=
accessTokenMapper
.
queryAccessTokenPaging
(
"hw"
,
0
,
2
);
Integer
integer
=
accessTokenMapper
.
countAccessTokenPaging
(
""
);
System
.
out
.
println
(
integer
);
List
<
AccessToken
>
accessTokenList
=
accessTokenMapper
.
queryAccessTokenPaging
(
""
,
0
,
2
);
System
.
out
.
println
(
accessTokenList
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录