zed
0bcaa00710
无jira任务，编译失败
4 years ago
zed
a0a888230c
Pull request #466 : KERNEL-4410 集群定时任务，支持切换执行节点
...
Merge in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit '137133d895fd71e2f9465d06c796b474017c1b0a':
KERNEL-4410 集群定时任务，支持切换执行节点
4 years ago
308b807c79
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
4 years ago
ed07433555
REPORT-33491 无插件PDF导出-HTML解析：支持<th>标签加粗样式
4 years ago
zed
137133d895
KERNEL-4410 集群定时任务，支持切换执行节点
4 years ago
Harrison
26cf39def4
Pull request #465 : REPORT-31492word导出中Html无法解析小于号
...
Merge in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit 'aae332b0fa5e530d02e2bacfbaab688aeaab36fd':
无 jira 任务， bugfix -> release 解决冲突， 更新目录结构。
REPORT-31492 word导出中Html无法解析小于号（漏提）
REPORT-31492 word导出中Html无法解析小于号
4 years ago
Harrison
aae332b0fa
无 jira 任务， bugfix -> release 解决冲突， 更新目录结构。
4 years ago
Harrison
137f6be183
Merge branch 'bugfix/10.0' of http://code.fineres.com/scm/~harrison/base-third into release/10.0
...
# Conflicts:
# fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java
4 years ago
3b0ca68d87
Pull request #463 : REPORT-33025 无插件PDF导出-HTML解析：支持<a>标签超链
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '8bbe7fceb667ea7b524b296f412b7e39bbf42150':
REPORT-33025 加点注解
REPORT-33025 无插件PDF导出-HTML解析：支持<a>标签超链
4 years ago
8bbe7fceb6
REPORT-33025 加点注解
4 years ago
1556abaf25
REPORT-33025 无插件PDF导出-HTML解析：支持<a>标签超链
4 years ago
Abby
d68cfa5a64
Pull request #462 : REPORT-32592 html 以<a>、<br> or <hr> 标签开头时，丢失line-height属性
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'a0304dcde3de021cf5a88b89a5732dfbd78861d0':
REPORT-32592 html 以<a>、<br> or <hr> 标签开头时，丢失line-height属性
4 years ago
a0304dcde3
REPORT-32592 html 以<a>、<br> or <hr> 标签开头时，丢失line-height属性
4 years ago
8b79473cf6
Pull request #461 : REPORT-33028 无插件PDF导出-HTML解析：块元素支持margin、padding 属性
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '4e834caf0f6c9c6a332caaae6556a2c9e5863333':
REPORT-33028 review 改进
REPORT-33028 无插件PDF导出-HTML解析：块元素支持margin、padding 属性
4 years ago
4e834caf0f
REPORT-33028 review 改进
4 years ago
836712194c
REPORT-33028 无插件PDF导出-HTML解析：块元素支持margin、padding 属性
4 years ago
dcc963a955
Pull request #459 : REPORT-33027 REPORT-33032 无插件PDF导出- HTML解析：支持<s> 、<strike>、<del>标签；font-size 支持单位 %，text-decoration 支持line-through值
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '49b931e8ca491eba6a44432c76458645b76d7194':
REPORT-33032 无插件PDF导出-HTML解析：font-size 支持单位 %，text-decoration 支持line-through值
REPORT-33027 无插件PDF导出-HTML解析：支持<s> 、<strike>、<del>标签
4 years ago
49b931e8ca
REPORT-33032 无插件PDF导出-HTML解析：font-size 支持单位 %，text-decoration 支持line-through值
4 years ago
acef7ca278
REPORT-33027 无插件PDF导出-HTML解析：支持<s> 、<strike>、<del>标签
4 years ago
zed
fa33be905a
Pull request #457 : DEC-13555 迁移到oracle定时调度执行报错
...
Merge in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit 'd1d144ace49fb90020eb5ad2981272ef8124f0ed':
DEC-13555 迁移到oracle定时调度执行报错
4 years ago
zed
d1d144ace4
DEC-13555 迁移到oracle定时调度执行报错
4 years ago
Lanlan
f9ac2fad00
Pull request #456 : 无JIRA任务 删除资源模块
...
Merge in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '4defe4be1fcf738bf8567e1d559f24f5212cac6c':
无JIRA任务 删除资源模块
4 years ago
Lanlan
4defe4be1f
无JIRA任务 删除资源模块
4 years ago
d594aa83e5
Pull request #455 : 无jira任务 发布 final>persist
...
Merge in CORE/base-third from ~ABBY/base-third:persist/10.0 to persist/10.0
* commit '3e39f111e711ea297fbc2d34ff0104c9b6f8acf9':
REPORT-31938 改进
REPORT-31938 html解析支持rgba
REPORT-29654 jgit 打包的时候少了 resources
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
111
DEC-13199 websocket序列化时区设置
REPORT-31053 PDF导出，<br>标签丢失
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third（不在打包范围内，需要自己添加junit依赖才能跑）
REPORT-30379 bouncycastle存在安全问题，fine-itext、fine-itext-old 适配高版本
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
REPORT-27284 <table>标签导出pdf,含加粗字体时，边框颜色异常
4 years ago
Abby
3e39f111e7
Pull request #3 : Final/10.0
...
Merge in ~ABBY/base-third from final/10.0 to persist/10.0
* commit 'df136b7b4ae0e0cd4ebdc89e79f148c675d29f1b':
REPORT-31938 改进
REPORT-31938 html解析支持rgba
REPORT-29654 jgit 打包的时候少了 resources
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
111
DEC-13199 websocket序列化时区设置
REPORT-31053 PDF导出，<br>标签丢失
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third（不在打包范围内，需要自己添加junit依赖才能跑）
REPORT-30379 bouncycastle存在安全问题，fine-itext、fine-itext-old 适配高版本
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
REPORT-27284 <table>标签导出pdf,含加粗字体时，边框颜色异常
4 years ago
Lanlan
d9c7e44d1c
Pull request #453 : REPORT-28764 third包新增资源模块
...
Merge in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit 'b80e686ab2f74f1800ef68d2bf92295dcde1454b':
REPORT-28764 third包新增资源模块
4 years ago
zhouping
2e6820abd1
Pull request #451 : 无JIRA任务 third pom优化
...
Merge in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'e749fcaf2f010745bf31c29f88b62bee3e01e23c':
无JIRA任务 third pom优化
4 years ago
zhouping
2b09706ebf
Pull request #452 : 无JIRA任务 third pom优化
...
Merge in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit '169df5bc7e94a740bda3d670d92793d111010aa7':
无JIRA任务 third pom优化
4 years ago
Lanlan
b80e686ab2
REPORT-28764 third包新增资源模块
4 years ago
zhouping
e749fcaf2f
无JIRA任务 third pom优化
4 years ago
zhouping
169df5bc7e
无JIRA任务 third pom优化
4 years ago
9d9ca1bbbb
Pull request #450 : 无jira任务,反向合代码引起的错误（堵塞打包）
...
Merge in CORE/base-third from ~HUGH.C/base-third:feature/10.0 to feature/10.0
* commit 'e9065db9555dc28aa65ec35998b4abf92398644d':
无jira任务,反向合代码引起的错误（堵塞打包）
4 years ago
e9065db955
无jira任务,反向合代码引起的错误（堵塞打包）
4 years ago
zed
664190d959
Pull request #448 : KERNEL-3899 集群下定时调度任务支持特定节点运行定时任务
...
Merge in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit 'd88b97f24712eed7a7aa387dbde11ca944af8d34':
fix
KERNEL-3899 集群下定时调度任务支持特定节点运行定时任务
4 years ago
a0021f11ca
Pull request #449 : 无jira任务,反向合代码引起的错误（堵塞打包）
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '4465d373639dad51dc11071cc7fb45fa314b4867':
无jira任务,反向合代码引起的错误（堵塞打包）
4 years ago
4465d37363
无jira任务,反向合代码引起的错误（堵塞打包）
4 years ago
zed
d88b97f247
Merging in latest from upstream (CORE/base-third:refs/heads/release/10.0)
...
* commit '7f721f7023465c5e432c47a75a6e67ae5e91ccd2':
Revert "无jira任务 移包"
无jira任务 移包
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
REPORT-31938 改进
REPORT-31938 html解析支持rgba
REPORT-29654 jgit 打包的时候少了 resources
REPORT-28620 10.0扫描后quartz有漏洞
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
无JIRA任务 pom优化
rt 打包
rt 尝试把jdk11的内容打到jdk8中
KERNEL-3436 base-third代码工程maven目录化
KERNEL-3436 修改打包脚本
KERNEL-3436 POM依赖
KERNEL-3436 移动包
DEC-12348 外置数据库导入数据失败
REPORT-27588 jackson-databind安全漏洞
fix
DEC-12256 【冒烟】全新工程启动报错
4 years ago
7f721f7023
Pull request #447 : KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
...
Merge in CORE/base-third from ~FENG/base-third:release/10.0 to release/10.0
* commit 'afa139d9da86558ff5124a5358f8c36ffbf5408d':
Revert "无jira任务 移包"
无jira任务 移包
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
4 years ago
afa139d9da
Revert "无jira任务 移包"
...
This reverts commit f61b97ca
4 years ago
03c20cacf3
Pull request #445 : KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
...
Merge in CORE/base-third from ~FENG/base-third:feature/10.0 to feature/10.0
* commit '803719f5876ad8528dd7f07899d49c104f10beb0':
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
4 years ago
f61b97ca48
无jira任务 移包
4 years ago
4822b82dbd
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
4 years ago
803719f587
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
4 years ago
zhouping
5f17840365
Pull request #444 : 无JIRA任务 feature到release
...
Merge in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to release/10.0
* commit 'c1a6c6b76e33612a9b334970dd5727d9169838b4':
REPORT-28620 10.0扫描后quartz有漏洞
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
无JIRA任务 pom优化
rt 打包
rt 尝试把jdk11的内容打到jdk8中
KERNEL-3436 base-third代码工程maven目录化
KERNEL-3436 修改打包脚本
KERNEL-3436 POM依赖
KERNEL-3436 移动包
DEC-12348 外置数据库导入数据失败
REPORT-27588 jackson-databind安全漏洞
fix
DEC-12256 【冒烟】全新工程启动报错
4 years ago
zhouping
c1a6c6b76e
Pull request #443 : 无JIRA任务 final到feature
...
Merge in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit 'c26da295490f5de3121dfed5064055011119ad83': (24 commits)
REPORT-31938 改进
REPORT-31938 html解析支持rgba
REPORT-29654 jgit 打包的时候少了 resources
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
111
DEC-13199 websocket序列化时区设置
REPORT-31053 PDF导出，<br>标签丢失
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third（不在打包范围内，需要自己添加junit依赖才能跑）
REPORT-30379 bouncycastle存在安全问题，fine-itext、fine-itext-old 适配高版本
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
REPORT-27284 <table>标签导出pdf,含加粗字体时，边框颜色异常
REPORT-29490 安全漏洞by zack
REPORT-29784 third删减引起定时调度失败
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
DEC-12783 【迭代】迁移db2数据库后，多语言插件添加key失败
REPORT-29126 导出pdf，字体加粗效果没有了（漏提）
REPORT-29126 导出pdf，字体加粗效果没有了（漏提）
...
4 years ago
zhouping
c26da29549
Merge branch 'final/10.0' of ssh://code.fineres.com:7999/~zhouping/base-third into feature/10.0
...
# Conflicts:
# build.third_step1-jdk11.gradle
# build.third_step1.gradle
# fine-itext-old/src/com/fr/third/com/lowagie/text/html/Markup.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/html/WebColors.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/OcspClientBouncyCastle.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfGraphics2D.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfPKCS7.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfReader.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/TSAClientBouncyCastle.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/crypto/AESCipher.java
# fine-jedis/src/com/fr/third/redis/clients/jedis/JedisCluster.java
# fine-jedis/src/com/fr/third/redis/clients/jedis/JedisPubSub.java
4 years ago
df136b7b4a
Pull request #442 : 无jira任务 发布 release-final
...
Merge in CORE/base-third from ~ABBY/base-third:final/10.0 to final/10.0
* commit 'c9864e29818e859e7c00e3656384fa342be140b2':
REPORT-31938 改进
REPORT-31938 html解析支持rgba
REPORT-29654 jgit 打包的时候少了 resources
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
111
DEC-13199 websocket序列化时区设置
REPORT-31053 PDF导出，<br>标签丢失
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third（不在打包范围内，需要自己添加junit依赖才能跑）
REPORT-30379 bouncycastle存在安全问题，fine-itext、fine-itext-old 适配高版本
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
REPORT-27284 <table>标签导出pdf,含加粗字体时，边框颜色异常
4 years ago
Abby
c9864e2981
Pull request #2 : Release/10.0
...
Merge in ~ABBY/base-third from release/10.0 to final/10.0
* commit '8c388c785ef5dc37998ff7ae211fcb19c443acc8':
REPORT-31938 改进
REPORT-31938 html解析支持rgba
REPORT-29654 jgit 打包的时候少了 resources
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
111
DEC-13199 websocket序列化时区设置
REPORT-31053 PDF导出，<br>标签丢失
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third（不在打包范围内，需要自己添加junit依赖才能跑）
REPORT-30379 bouncycastle存在安全问题，fine-itext、fine-itext-old 适配高版本
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦，脱离依赖redis
REPORT-27284 <table>标签导出pdf,含加粗字体时，边框颜色异常
4 years ago
e6d087c3c0
Pull request #441 : REPORT-31492 word导出中Html无法解析小于号（漏提）
...
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit 'ebcd76423c37ad888772b5b98dd68529cf2425a0':
REPORT-31492 word导出中Html无法解析小于号（漏提）
4 years ago
ebcd76423c
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into bugfix/10.0
4 years ago
zed
Hugh.C
Harrison
ju.ju
Abby
Lanlan
Kara
zhouping
Feng