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
superman
11eb85bfce
Merge pull request #602 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '2a6623f48ee186e8bb2300a209cbfde46ee44971':
4 years ago
superman
2a6623f48e
Merge pull request #601 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'cca6337af74188fdebac84651e46817ed088ed57':
4 years ago
superman
e192b7332e
Merge pull request #559 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '43c53d5affda4f7bb1c31fa2c75e73bcaf69c898':
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
superman
43c53d5aff
Merge pull request #558 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '2e87429bbb051f563952757831b644b6f8c266b3':
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
Niko
2e87429bbb
Pull request #555 : DEC-14305 删除1.60中剩余的但是在1.64中不存在的类
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '979f8a1daa4eb91c414a3492c1f2965621f5d4be':
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
charile_Lu
979f8a1daa
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
charile_Lu
572fe243de
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
Niko
c9ebe22f20
Pull request #541 : DEC-14305 把bouncycastle1.64修改包名后升级原来的1.60
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '4874fad61fdc6927a43aaacf09813ced1712b928':
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
superman
2dc1fdaa95
Merge pull request #554 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '595ec0ab032de1347d4d89d9cfe4a6d596e617b3':
4 years ago
superman
595ec0ab03
Merge pull request #553 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '0426b3a71078166f67fca6c2ae8a9dca3cd33bf2':
4 years ago
superman
0426b3a710
Merge pull request #552 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'cca6337af74188fdebac84651e46817ed088ed57':
4 years ago
superman
cca6337af7
Merge pull request #551 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '2a3f2705a02c58fa3e9dbf21ed8bdbcc61e70797':
4 years ago
superman
2a3f2705a0
Merge pull request #550 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '9446dd28ebbde671fb5fdcbd91ef30aecc6c8f8b':
无jira任务,persist合final
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
REPORT-32986 html大写标签不生效
4 years ago
superman
209e81a796
Merge pull request #545 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '7186c8a71fad9d9d410b6bcbbcbba5955db9df6d':
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
superman
7186c8a71f
Merge pull request #544 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '8250554bd15dcba32e4393d06bb5a6683184fd0c':
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
charile_Lu
4874fad61f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
charile_Lu
ae757f2bdc
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
Niko
8250554bd1
Pull request #535 : DEC-14302 删除没有改名的fine-bcprov-old库
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '0087ad7cb2e6400d313a2cf77c4aec8a8bdfe586':
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
charile_Lu
0087ad7cb2
删除gradle文件中和fine-bcprov-old相关的信息
4 years ago
charile_Lu
b1c23ed198
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
charile_Lu
8017172d5c
删除没有改名的fine-bcprov-old库
4 years ago
superman
f2fec63937
Merge pull request #530 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0d8b18c2c2013beb1d398af65507b8fde3cac854':
4 years ago
superman
b053065bdc
Merge pull request #505 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':
5 years ago
superman
0d8b18c2c2
Merge pull request #504 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':
5 years ago
superman
4aa3a9082c
Merge pull request #503 in CORE/base-third from final/10.0 to release/10.0
...
* commit '9446dd28ebbde671fb5fdcbd91ef30aecc6c8f8b':
5 years ago