Lanlan
4defe4be1f
无JIRA任务 删除资源模块
5 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包新增资源模块
5 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优化
5 years ago
Lanlan
b80e686ab2
REPORT-28764 third包新增资源模块
5 years ago
zhouping
e749fcaf2f
无JIRA任务 third pom优化
5 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 集群下定时调度任务支持特定节点运行定时任务
5 years ago
Hugh.C
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任务,反向合代码引起的错误(堵塞打包)
5 years ago
Hugh.C
4465d37363
无jira任务,反向合代码引起的错误(堵塞打包)
5 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 【冒烟】全新工程启动报错
5 years ago
Feng
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
5 years ago
Feng
afa139d9da
Revert "无jira任务 移包"
...
This reverts commit f61b97ca
5 years ago
Feng
f61b97ca48
无jira任务 移包
5 years ago
Feng
4822b82dbd
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 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 【冒烟】全新工程启动报错
5 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,字体加粗效果没有了(漏提)
...
5 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
5 years ago
Kara
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,含加粗字体时,边框颜色异常
5 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,含加粗字体时,边框颜色异常
5 years ago
Hugh.C
8c388c785e
Pull request #440 : REPORT-31938 html解析支持rgba
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'afd604622c3db12c34b365254ea6686b9b04b261':
REPORT-31938 改进
REPORT-31938 html解析支持rgba
5 years ago
Hugh.C
afd604622c
REPORT-31938 改进
5 years ago
Hugh.C
5fdcff93b5
REPORT-31938 html解析支持rgba
5 years ago
Hugh.C
bdea8bb5d1
Pull request #439 : REPORT-29654 jgit 打包的时候少了 resources
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'be04f46cfc4f23dd5e001b6ada4c6f69a976885e':
REPORT-29654 jgit 打包的时候少了 resources
5 years ago
Hugh.C
be04f46cfc
REPORT-29654 jgit 打包的时候少了 resources
5 years ago
zhouping
238c1728f1
Pull request #437 : REPORT-28620 10.0扫描后quartz有漏洞
...
Merge in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit '1737949fc3763fe6463629006677fbecdc80f6fa':
REPORT-28620 10.0扫描后quartz有漏洞
5 years ago
zhouping
1737949fc3
REPORT-28620 10.0扫描后quartz有漏洞
5 years ago
Harrison
2cf1cca8d9
Pull request #436 : 无 jira 任务, bugfix 合并 release
...
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit '3ae4f48f6bf1eca94c9239f9b7b7694d2fe25cba':
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
5 years ago
Hugh.C
3ae4f48f6b
Pull request #435 : REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
...
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '7eb5d71ff4183f16d5ba897cdbabc8edd9ee2955':
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
5 years ago
Hugh.C
7eb5d71ff4
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
5 years ago
zed
a93d434c36
fix
5 years ago
Feng
6858c665d9
Pull request #434 : KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
...
Merge in CORE/base-third from ~FENG/base-third:feature/10.0 to feature/10.0
* commit '1e356bf449dfe9ec00441ffac467a8bc165796d0':
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
Feng
1e356bf449
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
zed
5df00b7c92
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
zed
17e4170f97
KERNEL-3899 集群下定时调度任务支持特定节点运行定时任务
5 years ago
lidongy
26d393b73d
Pull request #432 : DEC-13199 socket序列化时区设置
...
Merge in CORE/base-third from ~LIDONGY/base-third:release/10.0 to release/10.0
* commit '89c2c8e7ed4ce21e25e9fab7eeebd833b9c82910':
111
DEC-13199 websocket序列化时区设置
5 years ago
lidongy
89c2c8e7ed
111
5 years ago
lidongy
77fd915ee1
DEC-13199 websocket序列化时区设置
5 years ago
Harrison
1785fc363e
Pull request #431 : 无 jira 任务, bugfix 合并 release
...
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit 'f4d66414ae53802ea80752d2a940de0f68bcedb0':
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
5 years ago
Hugh.C
8fb526df35
Pull request #430 : REPORT-31053 PDF导出,<br>标签丢失
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'f8adc802e3e9b1f755d09b913744571296173205':
REPORT-31053 PDF导出,<br>标签丢失
5 years ago
Hugh.C
f8adc802e3
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
5 years ago
Hugh.C
17c98f54ce
REPORT-31053 PDF导出,<br>标签丢失
5 years ago
Hugh.C
cd683cb405
Merge pull request #428 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
...
* commit '6554afe92b2a73ea215074b4f8d6c04920492ee0':
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third(不在打包范围内,需要自己添加junit依赖才能跑)
REPORT-30379 bouncycastle存在安全问题,fine-itext、fine-itext-old 适配高版本
5 years ago
Hugh.C
6554afe92b
REPORT-30379 test补充注释
5 years ago
Hugh.C
6cd8151373
REPORT-30379 在third中加一个 third(不在打包范围内,需要自己添加junit依赖才能跑)
5 years ago
Hugh.C
72d6364e04
REPORT-30379 bouncycastle存在安全问题,fine-itext、fine-itext-old 适配高版本
5 years ago
Bruce.Deng
f4d66414ae
Merge pull request #426 in CORE/base-third from ~BRUCE.DENG/base-third:bugfix/10.0 to bugfix/10.0
...
* commit '470ca7784dc80df5a2d23769ca8c0922ab1f001a':
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
5 years ago
Bruce.Deng
470ca7784d
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
5 years ago
Hugh.C
1919a818d6
Merge pull request #423 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
...
* commit '9679c6d97b6823ac9caa4ba11914a430e4b71c7b':
REPORT-27284 <table>标签导出pdf,含加粗字体时,边框颜色异常
5 years ago
Feng
4ccebbbfa9
Merge pull request #425 in CORE/base-third from ~FENG/base-third:release/10.0 to release/10.0
...
* commit 'a28e8da37d086d70aa98183a97f0e2c008b0d2d9':
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
Feng
a28e8da37d
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
Feng
4548a81355
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago