Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LFFZC
xxl-job
提交
1970f7f3
X
xxl-job
项目概览
LFFZC
/
xxl-job
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
xxl-job
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1970f7f3
编写于
8月 30, 2017
作者:
许雪里
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean Code
上级
3595d9c0
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
31 addition
and
120 deletion
+31
-120
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
...l/job/admin/controller/resolver/WebExceptionResolver.java
+1
-1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/impl/DemoConcurrentJobBean.java
...xl/job/admin/core/jobbean/impl/DemoConcurrentJobBean.java
+1
-1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/impl/DemoNomalJobBean.java
...com/xxl/job/admin/core/jobbean/impl/DemoNomalJobBean.java
+1
-1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
...m/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
+2
-2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java
...rc/main/java/com/xxl/job/admin/core/util/JacksonUtil.java
+0
-93
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
...n/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
+1
-1
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
...ava/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+4
-4
xxl-job-admin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java
...dmin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java
+1
-1
xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java
...core/src/main/java/com/xxl/job/core/glue/GlueFactory.java
+2
-2
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
...rc/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
+2
-2
xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java
...e/src/main/java/com/xxl/job/core/util/HttpClientUtil.java
+2
-2
xxl-job-core/src/main/java/com/xxl/job/core/util/JacksonUtil.java
...core/src/main/java/com/xxl/job/core/util/JacksonUtil.java
+14
-10
未找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
浏览文件 @
1970f7f3
package
com.xxl.job.admin.controller.resolver
;
import
com.xxl.job.admin.core.util.JacksonUtil
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.util.JacksonUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.web.bind.annotation.ResponseBody
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/impl/DemoConcurrentJobBean.java
浏览文件 @
1970f7f3
...
...
@@ -21,7 +21,7 @@ package com.xxl.job.admin.core.jobbean.impl;
// try {
// TimeUnit.SECONDS.sleep(10);
// } catch (InterruptedException e) {
//
e.printStackTrace(
);
//
logger.error(e.getMessage(), e
);
// }
//
// return false;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/impl/DemoNomalJobBean.java
浏览文件 @
1970f7f3
...
...
@@ -23,7 +23,7 @@ package com.xxl.job.admin.core.jobbean.impl;
// try {
// TimeUnit.SECONDS.sleep(10);
// } catch (InterruptedException e) {
//
e.printStackTrace(
);
//
logger.error(e.getMessage(), e
);
// }
//
// return false;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
浏览文件 @
1970f7f3
...
...
@@ -143,7 +143,7 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware {
}
}
catch
(
SchedulerException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
...
...
@@ -377,7 +377,7 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware {
}
} catch (SchedulerException e) {
e.printStackTrace(
);
logger.error(e.getMessage(), e
);
return null;
}
return jobList;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java
已删除
100644 → 0
浏览文件 @
3595d9c0
package
com.xxl.job.admin.core.util
;
import
org.codehaus.jackson.JsonGenerationException
;
import
org.codehaus.jackson.JsonParseException
;
import
org.codehaus.jackson.map.JsonMappingException
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.codehaus.jackson.type.TypeReference
;
import
java.io.IOException
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* Jackson util
*
* 1、obj need private and set/get;
* 2、do not support inner class;
*
* @author xuxueli 2015-9-25 18:02:56
*/
public
class
JacksonUtil
{
private
final
static
ObjectMapper
objectMapper
=
new
ObjectMapper
();
public
static
ObjectMapper
getInstance
()
{
return
objectMapper
;
}
/**
* bean、array、List、Map --> json
*
* @param obj
* @return json string
* @throws Exception
*/
public
static
String
writeValueAsString
(
Object
obj
)
{
try
{
return
getInstance
().
writeValueAsString
(
obj
);
}
catch
(
JsonGenerationException
e
)
{
e
.
printStackTrace
();
}
catch
(
JsonMappingException
e
)
{
e
.
printStackTrace
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
null
;
}
/**
* string --> bean、Map、List(array)
*
* @param jsonStr
* @param clazz
* @return obj
* @throws Exception
*/
public
static
<
T
>
T
readValue
(
String
jsonStr
,
Class
<
T
>
clazz
)
{
try
{
return
getInstance
().
readValue
(
jsonStr
,
clazz
);
}
catch
(
JsonParseException
e
)
{
e
.
printStackTrace
();
}
catch
(
JsonMappingException
e
)
{
e
.
printStackTrace
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
null
;
}
public
static
<
T
>
T
readValueRefer
(
String
jsonStr
,
Class
<
T
>
clazz
)
{
try
{
return
getInstance
().
readValue
(
jsonStr
,
new
TypeReference
<
T
>()
{
});
}
catch
(
JsonParseException
e
)
{
e
.
printStackTrace
();
}
catch
(
JsonMappingException
e
)
{
e
.
printStackTrace
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
null
;
}
public
static
void
main
(
String
[]
args
)
{
try
{
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
"aaa"
,
"111"
);
map
.
put
(
"bbb"
,
"222"
);
String
json
=
writeValueAsString
(
map
);
System
.
out
.
println
(
json
);
System
.
out
.
println
(
readValue
(
json
,
Map
.
class
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
浏览文件 @
1970f7f3
...
...
@@ -147,7 +147,7 @@ public class MailUtil {
mailSender
.
send
(
mimeMessage
);
return
true
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
false
;
}
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
浏览文件 @
1970f7f3
...
...
@@ -226,7 +226,7 @@ public class XxlJobServiceImpl implements XxlJobService {
xxlJobLogGlueDao
.
deleteByJobId
(
id
);
return
ReturnT
.
SUCCESS
;
}
catch
(
SchedulerException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
ReturnT
.
FAIL
;
}
...
...
@@ -241,7 +241,7 @@ public class XxlJobServiceImpl implements XxlJobService {
boolean
ret
=
XxlJobDynamicScheduler
.
pauseJob
(
name
,
group
);
// jobStatus do not store
return
ret
?
ReturnT
.
SUCCESS
:
ReturnT
.
FAIL
;
}
catch
(
SchedulerException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
return
ReturnT
.
FAIL
;
}
}
...
...
@@ -256,7 +256,7 @@ public class XxlJobServiceImpl implements XxlJobService {
boolean
ret
=
XxlJobDynamicScheduler
.
resumeJob
(
name
,
group
);
return
ret
?
ReturnT
.
SUCCESS
:
ReturnT
.
FAIL
;
}
catch
(
SchedulerException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
return
ReturnT
.
FAIL
;
}
}
...
...
@@ -271,7 +271,7 @@ public class XxlJobServiceImpl implements XxlJobService {
XxlJobDynamicScheduler
.
triggerJob
(
name
,
group
);
return
ReturnT
.
SUCCESS
;
}
catch
(
SchedulerException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
return
ReturnT
.
FAIL
;
}
}
...
...
xxl-job-admin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java
浏览文件 @
1970f7f3
...
...
@@ -43,7 +43,7 @@ public class AdminBizTest {
AdminBiz
adminBiz
=
(
AdminBiz
)
new
NetComClientProxy
(
AdminBiz
.
class
,
addressUrl
,
accessToken
).
getObject
();
int
jobId
=
1
;
ReturnT
<
String
>
returnT
=
adminBiz
.
triggerJob
(
1
);
ReturnT
<
String
>
returnT
=
adminBiz
.
triggerJob
(
jobId
);
Assert
.
assertTrue
(
returnT
.
getCode
()
==
ReturnT
.
SUCCESS_CODE
);
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java
浏览文件 @
1970f7f3
...
...
@@ -75,9 +75,9 @@ public class GlueFactory {
try
{
field
.
set
(
instance
,
fieldBean
);
}
catch
(
IllegalArgumentException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
IllegalAccessException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
浏览文件 @
1970f7f3
...
...
@@ -174,13 +174,13 @@ public class XxlJobFileAppender {
return
sb
.
toString
();
}
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
finally
{
if
(
reader
!=
null
)
{
try
{
reader
.
close
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java
浏览文件 @
1970f7f3
...
...
@@ -71,7 +71,7 @@ public class HttpClientUtil {
try
{
httpClient
.
close
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
return
responseBytes
;
...
...
@@ -101,7 +101,7 @@ public class HttpClientUtil {
}
return
message
;
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
throw
e
;
}
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/JacksonUtil.java
浏览文件 @
1970f7f3
...
...
@@ -6,6 +6,8 @@ import org.codehaus.jackson.JsonParseException;
import
org.codehaus.jackson.map.JsonMappingException
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.codehaus.jackson.type.TypeReference
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.io.IOException
;
import
java.util.HashMap
;
...
...
@@ -20,6 +22,8 @@ import java.util.Map;
* @author xuxueli 2015-9-25 18:02:56
*/
public
class
JacksonUtil
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
JacksonUtil
.
class
);
private
final
static
ObjectMapper
objectMapper
=
new
ObjectMapper
();
public
static
ObjectMapper
getInstance
()
{
return
objectMapper
;
...
...
@@ -36,11 +40,11 @@ public class JacksonUtil {
try
{
return
getInstance
().
writeValueAsString
(
obj
);
}
catch
(
JsonGenerationException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
JsonMappingException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
null
;
}
...
...
@@ -57,11 +61,11 @@ public class JacksonUtil {
try
{
return
getInstance
().
readValue
(
jsonStr
,
clazz
);
}
catch
(
JsonParseException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
JsonMappingException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
null
;
}
...
...
@@ -69,11 +73,11 @@ public class JacksonUtil {
try
{
return
getInstance
().
readValue
(
jsonStr
,
new
TypeReference
<
T
>()
{
});
}
catch
(
JsonParseException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
JsonMappingException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
null
;
}
...
...
@@ -87,7 +91,7 @@ public class JacksonUtil {
System
.
out
.
println
(
json
);
System
.
out
.
println
(
readValue
(
json
,
Map
.
class
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录