Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
393cb759
authored
Nov 22, 2019
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
upgrade version
parent
355c0e07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
View file @
393cb759
...
@@ -4,6 +4,8 @@ import freemarker.ext.beans.BeansWrapper;
...
@@ -4,6 +4,8 @@ import freemarker.ext.beans.BeansWrapper;
import
freemarker.ext.beans.BeansWrapperBuilder
;
import
freemarker.ext.beans.BeansWrapperBuilder
;
import
freemarker.template.Configuration
;
import
freemarker.template.Configuration
;
import
freemarker.template.TemplateHashModel
;
import
freemarker.template.TemplateHashModel
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
/**
* ftl util
* ftl util
...
@@ -11,6 +13,7 @@ import freemarker.template.TemplateHashModel;
...
@@ -11,6 +13,7 @@ import freemarker.template.TemplateHashModel;
* @author xuxueli 2018-01-17 20:37:48
* @author xuxueli 2018-01-17 20:37:48
*/
*/
public
class
FtlUtil
{
public
class
FtlUtil
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
FtlUtil
.
class
);
private
static
BeansWrapper
wrapper
=
new
BeansWrapperBuilder
(
Configuration
.
DEFAULT_INCOMPATIBLE_IMPROVEMENTS
).
build
();
//BeansWrapper.getDefaultInstance();
private
static
BeansWrapper
wrapper
=
new
BeansWrapperBuilder
(
Configuration
.
DEFAULT_INCOMPATIBLE_IMPROVEMENTS
).
build
();
//BeansWrapper.getDefaultInstance();
...
@@ -20,7 +23,7 @@ public class FtlUtil {
...
@@ -20,7 +23,7 @@ public class FtlUtil {
TemplateHashModel
fileStatics
=
(
TemplateHashModel
)
staticModels
.
get
(
packageName
);
TemplateHashModel
fileStatics
=
(
TemplateHashModel
)
staticModels
.
get
(
packageName
);
return
fileStatics
;
return
fileStatics
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
return
null
;
return
null
;
}
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
View file @
393cb759
...
@@ -98,7 +98,7 @@ public class XxlJobRemotingUtil {
...
@@ -98,7 +98,7 @@ public class XxlJobRemotingUtil {
}
}
return
returnT
;
return
returnT
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
e
.
getMessage
(),
e
);
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
"xxl-rpc remoting response content invalid("
+
resultJson
+
"), for url : "
+
url
);
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
"xxl-rpc remoting response content invalid("
+
resultJson
+
"), for url : "
+
url
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment