superman
0d327f215e
Merge pull request #783 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '5dce2c38dcdb25a608b534c151f9ac6d7f727c7f':
4 years ago
superman
5dce2c38dc
Merge pull request #780 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '969c102ecd9207c0778087f7651c8949b14ee438':
无jira任务,合代码出错
REPORT-34112 review 改进
REPORT-34112 改进
REPORT-34112 去除无用字段
REPORT-34112 改进
REPORT-34112 HTML解析:table标签支持table-layout 中的fixed 布局
REPORT-33031 review 改进
REPORT-33031 无插件PDF导出-HTML解析:块元素(如:div、p)支持 border 属性“全家桶”
REPORT-33569 review 改进
REPORT-33569 无插件PDF导出-HTML解析:块元素(如:div、p)支持background-image、background-size 属性
无JIRA任务 third pom优化
无jira任务,反向合代码引起的错误(堵塞打包)
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
4 years ago
superman
969c102ecd
Merge pull request #779 in CORE/base-third from feature/10.0 to bugfix/10.0
...
* commit 'a252275a489eccd612aebf229843e0344a940baf':
无jira任务,合代码出错
REPORT-34112 review 改进
REPORT-34112 改进
REPORT-34112 去除无用字段
REPORT-34112 改进
REPORT-34112 HTML解析:table标签支持table-layout 中的fixed 布局
REPORT-33031 review 改进
REPORT-33031 无插件PDF导出-HTML解析:块元素(如:div、p)支持 border 属性“全家桶”
REPORT-33569 review 改进
REPORT-33569 无插件PDF导出-HTML解析:块元素(如:div、p)支持background-image、background-size 属性
无JIRA任务 third pom优化
无jira任务,反向合代码引起的错误(堵塞打包)
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
4 years ago
superman
a252275a48
Merge pull request #754 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'debbdb277edfea78a9b7157a63de3a49294ada8e':
4 years ago
superman
debbdb277e
Merge pull request #753 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'e6534164d3db60afb6c25ac67a2e79d119712bfd':
4 years ago
superman
e6534164d3
Merge pull request #752 in CORE/base-third from final/10.0 to release/10.0
...
* commit '96646bb23e02923e947ff7d6137a00c6e389ffd7':
4 years ago
superman
96646bb23e
Merge pull request #751 in CORE/base-third from persist/10.0 to final/10.0
...
* commit 'd88eb8f0e2ab747e7df5be1231d640065b229e00':
4 years ago
superman
d88eb8f0e2
Merge pull request #750 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '0b0509e6d2ce295cf52eec297ae2894e793f128a':
DEC-14765 根据2.11.2的变动patch其static块至third库中
4 years ago
superman
8fc84f54c2
Merge pull request #745 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '318ff81e132f0f9638c0901d480c8a7175de292d':
DEC-14765 根据2.11.2的变动patch其static块至third库中
4 years ago
superman
318ff81e13
Merge pull request #744 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'f35e736330e2988392cadc90f434d251345bd9ce':
DEC-14765 根据2.11.2的变动patch其static块至third库中
4 years ago
superman
f35e736330
Merge pull request #743 in CORE/base-third from final/10.0 to release/10.0
...
* commit '0b0509e6d2ce295cf52eec297ae2894e793f128a':
DEC-14765 根据2.11.2的变动patch其static块至third库中
4 years ago
Kara
0b0509e6d2
Pull request #741 : DEC-14765 根据2.11.2的变动patch其static块至third库中
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to final/10.0
* commit 'cee804bd82f4018ab7200b63eb452e52f2120823':
DEC-14765 根据2.11.2的变动patch其static块至third库中
4 years ago
charile_Lu
cee804bd82
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
charile_Lu
35baf8b7fe
DEC-14765 根据2.11.2的变动patch其static块至third库中
4 years ago
superman
4acc2af078
Merge pull request #711 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '4ecfe35bc6677fe8ec752c62180b8d6a22d0f816':
4 years ago
superman
4ecfe35bc6
Merge pull request #710 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '6499e9a5f7e738d884a1e3788c9879d84116ee3a':
4 years ago
superman
6499e9a5f7
Merge pull request #709 in CORE/base-third from final/10.0 to release/10.0
...
* commit '2ade9b41084add6154bc8ce7188faf7e6fce9912':
4 years ago
superman
2ade9b4108
Merge pull request #708 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '7ee299897f8c5d77a5c5820eaf9606a042f36661':
4 years ago
superman
7ee299897f
Merge pull request #707 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'b09cb4f392e2c85295ba46a7304de102a817e75f':
DEC-14434 修改pom
DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
REPORT-34875 跨域CORS漏洞
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
superman
bcc19dc71f
Merge pull request #706 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '65955a49a35ece403ae75a754b1c154e74fdb522':
DEC-14434 修改pom
DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
4 years ago
superman
65955a49a3
Merge pull request #705 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '8dcb5d76ae87bd1a3d785e97a66aa1d9a9f00d64':
DEC-14434 修改pom
DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
4 years ago
superman
8dcb5d76ae
Merge pull request #704 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'b09cb4f392e2c85295ba46a7304de102a817e75f':
DEC-14434 修改pom
DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
4 years ago
Kara
b09cb4f392
Pull request #702 : DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to final/10.0
* commit '84ce62fe9757a61a01d2d898f7145e61a112d82e':
DEC-14434 修改pom
DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
4 years ago
charile_Lu
84ce62fe97
DEC-14434 修改pom
4 years ago
charile_Lu
5717264b7b
DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
4 years ago
superman
e6177da46b
Merge pull request #696 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'bd3f49d62855afd3d2d83cc8f42b92cbe3b10917':
DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
4 years ago
superman
bd3f49d628
Merge pull request #695 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'b51dc088b6104f4a88af0c6c670244d72b4ac429':
DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
4 years ago
superman
cefb064031
Merge pull request #692 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'b1379b9e6c0240898b09d0e5615bd9d481e653d8':
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
4 years ago
Niko
b51dc088b6
Pull request #688 : DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '4e1ba85033a66f359618b6fa6317455b31633bcc':
DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
4 years ago
superman
b1379b9e6c
Merge pull request #691 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '8ef2f5133d9c87dff8735ac4ea8c720eb77239c6':
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
4 years ago
superman
8ef2f5133d
Merge pull request #690 in CORE/base-third from final/10.0 to release/10.0
...
* commit '41873108117f55bde71480e2e00a015f69b6cd9f':
4 years ago
Kara
4187310811
Pull request #687 : 无JIRA任务 release到final
...
Merge in CORE/base-third from release/10.0 to final/10.0
* commit '8dc3de0e4277e1060d3d7cc678edd6c01a7de211':
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
REPORT-34875 跨域CORS漏洞
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
charile_Lu
4e1ba85033
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
charile_Lu
131bd1bf32
DEC-14434 pref:添加quartz将触发器状态置为ERROR时的日志输出
4 years ago
Niko
8dc3de0e42
Pull request #674 : DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '1f5a857bec5762d0bb42c947f7d9e9256871ca04':
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
4 years ago
charile_Lu
1f5a857bec
DEC-14382 修改方法名
4 years ago
charile_Lu
2ec46c0d2a
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
4 years ago
superman
40ca716c0d
Merge pull request #672 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '5e53287f9ac4a922325753c895db80dec8d8bedc':
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
superman
5e53287f9a
Merge pull request #671 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '54ca67557eada8e7782b21ae118cfd6da54b0d80':
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
Cloud.Liu
54ca67557e
Pull request #668 : KERNEL-5056 WebSocket支持将用户名和token放在Header里
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '13fdb6f2ae5464d04c4b0014619fbd9164eb1f2c':
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
Cloud.Liu
13fdb6f2ae
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
4 years ago
Cloud.Liu
63007db3d5
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
superman
71a47915f9
Merge pull request #635 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'd6dc991aa6d495d59cb4c331286fc1b8e4490f5f':
REPORT-34875 跨域CORS漏洞
4 years ago
superman
d6dc991aa6
Merge pull request #634 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '206a78c0f62d13f9c394a2bf5029f6cd806018c3':
REPORT-34875 跨域CORS漏洞
4 years ago
superman
206a78c0f6
Merge pull request #631 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'f6795d1cf5bbf149a8cb731a4f9839882232c04c':
4 years ago
zhouping
b178f8905e
Pull request #626 : REPORT-34875 跨域CORS漏洞
...
Merge in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'ebad86bac8395eaee80c9d1e15ae9e26c69d562b':
REPORT-34875 跨域CORS漏洞
4 years ago
zhouping
ebad86bac8
REPORT-34875 跨域CORS漏洞
4 years ago
superman
d9befd8c6b
Merge pull request #605 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'f6795d1cf5bbf149a8cb731a4f9839882232c04c':
4 years ago
superman
f6795d1cf5
Merge pull request #604 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '7444cd74f90580ed4a00e33a52e7624a4fcc87b9':
4 years ago
superman
7444cd74f9
Merge pull request #603 in CORE/base-third from final/10.0 to release/10.0
...
* commit '11eb85bfce5a8d34c6608ceba2e6d318169a580b':
4 years ago