Browse Source

Merge pull request #260 in CORE/base-third from release/10.0 to feature/10.0

* commit '13189f8726d97977f9912a912d7a03d25e9f99ae':
  REPORT-19507 滚动消息插件,效果不正常,包名修改
  REPORT-19507 滚动消息插件,效果不正常,包名修改
  REPORT-19507 滚动消息插件,效果不正常
  fix
  fix
  fix
  无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
  DEC-8889 jackson高危漏洞
research/11.0
Harrison 5 years ago
parent
commit
3cccc55882
  1. 3
      build.third_step6.gradle
  2. 3
      fine-third-default/readme.md
  3. 1133
      fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java

3
build.third_step6.gradle

@ -25,6 +25,7 @@ sourceSets{
main{ main{
java{ java{
srcDirs=[ srcDirs=[
"${srcDir}/fine-third-default/src",
"${srcDir}/fine-commons-codec/src", "${srcDir}/fine-commons-codec/src",
"${srcDir}/fine-icu4j/src", "${srcDir}/fine-icu4j/src",
"${srcDir}/fine-itext-old/src", "${srcDir}/fine-itext-old/src",
@ -70,6 +71,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
// //
dependencies{ dependencies{
compile fileTree(dir:"${srcDir}/fine-third-default/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-commons-codec/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-commons-codec/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-icu4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-icu4j/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jackson/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-jackson/lib",include:'**/*.jar')
@ -101,6 +103,7 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{
println "------------------------------------------------copyfiles" println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-third-default/src")
with dataContent.call("${srcDir}/fine-commons-codec/src") with dataContent.call("${srcDir}/fine-commons-codec/src")
with dataContent.call("${srcDir}/fine-icu4j/src") with dataContent.call("${srcDir}/fine-icu4j/src")
with dataContent.call("${srcDir}/fine-icu4j/resources") with dataContent.call("${srcDir}/fine-icu4j/resources")

3
fine-third-default/readme.md

@ -0,0 +1,3 @@
用于针对性的修改原3rd中的class
1.修改javax.xml.stream.XMLEntityReaderImpl 阅读特殊字符出现的问题 责任人-Bryant 2019/08/01

1133
fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save