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
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
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
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
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
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
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
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
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
0d8b18c2c2
Merge pull request #504 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':
4 years ago
superman
4aa3a9082c
Merge pull request #503 in CORE/base-third from final/10.0 to release/10.0
...
* commit '9446dd28ebbde671fb5fdcbd91ef30aecc6c8f8b':
4 years ago
Kara
9446dd28eb
Pull request #499 : 无jira任务, release/10.0 合 final/10.0
...
Merge in CORE/base-third from release/10.0 to final/10.0
* commit '3230c231fdcfe002e38aca8eb5543b9febedc69a':
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
REPORT-32986 html大写标签不生效
4 years ago
ju.ju
581000116f
Pull request #489 : 无jira任务, release/10.0 合 bugfix/10.0
...
Merge in CORE/base-third from release/10.0 to bugfix/10.0
* commit '3230c231fdcfe002e38aca8eb5543b9febedc69a':
无jira任务,persist合final
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
build.third_step0.gradle edited online with Bitbucket
build.third_step0.gradle edited online with Bitbucket
更新apache工具类
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
fix
fix
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
无jira任务,打包失败
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
build
build
build
4 years ago
ju.ju
3230c231fd
Pull request #488 : 无jira任务, final/10.0 合 release/10.0
...
Merge in CORE/base-third from final/10.0 to release/10.0
* commit '9a9390fc5c7c7eb2a8bdc92d4a969f1cf26f308a':
无jira任务,persist合final
build.third_step0.gradle edited online with Bitbucket
build.third_step0.gradle edited online with Bitbucket
更新apache工具类
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
fix
fix
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
无jira任务,打包失败
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
build
build
build
4 years ago
Kara
9a9390fc5c
Pull request #487 : 无jira任务,persist合final
...
Merge in CORE/base-third from ~LUCIAN.CHEN/base-third:final/10.0 to final/10.0
* commit 'c2391b8bf1cb9d87b5cb8b8b6e213b7c240da453':
无jira任务,persist合final
build.third_step0.gradle edited online with Bitbucket
build.third_step0.gradle edited online with Bitbucket
更新apache工具类
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
fix
fix
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
无jira任务,打包失败
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
build
build
build
4 years ago
lucian
c2391b8bf1
无jira任务,persist合final
4 years ago
Hugh.C
fc9f34d537
Pull request #484 : REPORT-34320 块标签前紧跟着的块标签含文本且文本尾部不是空格时会多出空白行
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '8ad896e4e95e63af5aaec171424b809a7a939f78':
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
4 years ago
Hugh.C
8ad896e4e9
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
4 years ago
Hugh.C
fb9a7ffede
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
4 years ago
Lucian.Chen
671e2d43ed
Pull request #483 : 无jira任务,bugfix 合并 release
...
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit '5addbc58596742d3b3c9ef8fbbf1b322b40dee78':
REPORT-32986 html大写标签不生效
4 years ago
Hugh.C
f81bae5a39
Pull request #482 : REPORT-33863 html图片宽度大于实际盒子宽度时,图片后的文字丢失
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '9fbe5da1501b4972fc667dbdef7a74ec69675fce':
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
4 years ago
Hugh.C
9fbe5da150
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
4 years ago