lidongy
98ae82a817
Pull request #871 : KERNEL-5345 refactor: hibernate特殊处理，使其可以扩展建表时的主键设置语句
...
Merge in CORE/base-third from ~LIDONGY/base-third:release/10.0 to release/10.0
* commit '9039b3a65492087c79cd0cd2f8d9619146234046':
KERNEL-5345 refactor: 对mysql5数据库特殊处理 改在third
KERNEL-5345 refactor: hibernate特殊处理，使其可以扩展建表时的主键设置语句
4 years ago
lidongy
9039b3a654
KERNEL-5345 refactor: 对mysql5数据库特殊处理 改在third
4 years ago
lidongy
e90c1be915
KERNEL-5345 refactor: hibernate特殊处理，使其可以扩展建表时的主键设置语句
4 years ago
90b26afb02
Merge pull request #865 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '3955b03b53749106c8a4cbdf641c4f688a9224b9':
4 years ago
3955b03b53
Merge pull request #864 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'a34b1e0eee8a666cbcce1592f5b10f71924fca4a':
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
修改源码地址
无jira任务，补交readme文件
无jira任务，补交readme文件
KERNEL-5313 refactor : guava升级到26
4 years ago
a34b1e0eee
Merge pull request #863 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '155ae1825d12b20c0a8ea088e377d48d1b0d1bac':
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
修改源码地址
无jira任务，补交readme文件
无jira任务，补交readme文件
KERNEL-5313 refactor : guava升级到26
4 years ago
Cloud.Liu
1a6c1de260
Pull request #860 : DEC-15059 feat: fine-third适配基础类库改动
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '03059b3b2ec31c35b1bf47dfdcad0c5c042fb9e3':
DEC-15059 feat: fine-third适配基础类库改动
4 years ago
Elijah
034d79908a
Pull request #5 : DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
...
Merge in QFX/base-third from ~ELIJAH/qfx-base-third:qufenxi to qufenxi
* commit '0dc7ada0462a8f8aa94e39c5fa7f8e1b78e83c91':
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
4 years ago
Cloud.Liu
03059b3b2e
DEC-15059 feat: fine-third适配基础类库改动
4 years ago
Elijah
0dc7ada046
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
4 years ago
Cloud.Liu
70e9d53807
Pull request #859 : Release/10.0
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to research/10.0
* commit '155ae1825d12b20c0a8ea088e377d48d1b0d1bac':
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
修改源码地址
无jira任务，补交readme文件
无jira任务，补交readme文件
KERNEL-5313 refactor : guava升级到26
4 years ago
Niko
155ae1825d
Pull request #858 : KERNEL-5313 refactor: 修改gradle文件中版本为1.8
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit 'ab9cbd9ab73b0ae789ee0d8cf7f2403e49dd530a':
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
4 years ago
ab9cbd9ab7
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~niko/base-third into release/10.0
...
merge
4 years ago
f46a62d74c
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
4 years ago
Niko
e731bc2ff1
Pull request #856 : 无jira任务，补交guava库readme文件
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '19b6d807902697e5e9f95b7f6daa93a66d5b9a61':
修改源码地址
无jira任务，补交readme文件
无jira任务，补交readme文件
4 years ago
19b6d80790
修改源码地址
4 years ago
910fa83341
无jira任务，补交readme文件
4 years ago
bee8b44567
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~niko/base-third into release/10.0
...
merge
4 years ago
d61797b49a
无jira任务，补交readme文件
4 years ago
zhouping
e9cadeffb7
Pull request #855 : KERNEL-5313 refactor : guava升级到26
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '33109f877781283fea4bd1a369c93d3f95a27e39':
KERNEL-5313 refactor : guava升级到26
4 years ago
33109f8777
KERNEL-5313 refactor : guava升级到26
4 years ago
Elijah
f1566a140e
Pull request #3 : 无jira任务 persist/10.0 -> qufenxi
...
Merge in QFX/base-third from persist/10.0 to qufenxi
* commit 'a5039b98cd291bfbcace2339ebfc78e98d6a10d7':
QFX-1737 fix:数据上传之后报错
DEC-14765 根据2.11.2的变动patch其static块至third库中
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
a5039b98cd
Pull request #2 : QFX-1737 fix:数据上传之后报错
...
Merge in QFX/base-third from ~ECHEN/base-third:persist/10.0 to persist/10.0
* commit '327309208a946e2881f9ef8c5123044f963a6617':
QFX-1737 fix:数据上传之后报错
4 years ago
327309208a
QFX-1737 fix:数据上传之后报错
4 years ago
57c997038b
Merge pull request #834 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '60664494eb0a1caf2c256c48eb3ad75765a131e0':
KERNEL-5056 fix: 使用自定义分隔符
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
4 years ago
60664494eb
Merge pull request #833 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'fb2c61df264f9a5727fa6a19a03b4b97353f5d6c':
KERNEL-5056 fix: 使用自定义分隔符
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
4 years ago
fb2c61df26
Merge pull request #832 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'f99f3d5df334682b8878ed2bc8de84d4a35fadb1':
KERNEL-5056 fix: 使用自定义分隔符
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
4 years ago
Cloud.Liu
f99f3d5df3
Pull request #824 : KERNEL-5056 feat: Websocket支持将token放入header而不是url中
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '3c679ebd887037eb265898abc31d3eded0b791e0':
KERNEL-5056 fix: 使用自定义分隔符
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
4 years ago
Cloud.Liu
3c679ebd88
KERNEL-5056 fix: 使用自定义分隔符
4 years ago
Cloud.Liu
3fa10301ea
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
4 years ago
d61aed7b2b
Merge pull request #818 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '06b04e4b39f4c0f6ef7954e4c1d0cda26c3e566e':
无jira任务，合代码错误（多余代码残留）
4 years ago
06b04e4b39
Merge pull request #817 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'be8e0969eef7631a6f4e0b2f9b31b478605b369b':
无jira任务，合代码错误（多余代码残留）
4 years ago
be8e0969ee
Merge pull request #816 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'c46902ac9d85dc19bb55d336363a91136228b9b2':
无jira任务，合代码错误（多余代码残留）
4 years ago
c46902ac9d
Pull request #811 : 无jira任务，合代码错误（多余代码残留），导致单元测试失败
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '7219427199d1ba1ed7fe0d96f7818df856370789':
无jira任务，合代码错误（多余代码残留）
4 years ago
e584f16655
Merge pull request #813 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'fbaaf7a8e40df06569815053ee053a1950e2abc5':
4 years ago
fbaaf7a8e4
Merge pull request #812 in CORE/base-third from feature/10.0 to bugfix/10.0
...
* commit 'a6872b676dbdda3679a00f92203e316d8d891272':
4 years ago
7219427199
无jira任务，合代码错误（多余代码残留）
4 years ago
0feedf13cf
Merge pull request #800 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a6872b676dbdda3679a00f92203e316d8d891272':
fix
DEC-14765 根据2.11.2的变动patch其static块至third库中
DEC-14434 修改pom
DEC-14434 添加依賴，改变日志实现，解决not found问题,修改报错的JavaDoc
无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
a6872b676d
Merge pull request #798 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '7892338e7057231dc312e6e89d2e1b813118e4bb':
fix
4 years ago
7892338e70
Merge pull request #797 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'a034a630e7c2ae1bd8960e4d676d9e406903482d':
fix
4 years ago
a034a630e7
Pull request #786 : BI-72094 【515final】上传附件excel报错
...
Merge in CORE/base-third from ~HARDER/base-third:release/10.0 to release/10.0
* commit 'b3bc412c4a46267b13891216b1a68c59954f4443':
fix
4 years ago
b3bc412c4a
fix
4 years ago
Elijah
1ce966913b
Pull request #785 : DEC-14578 feat: 引入com.alibaba:transmittable-thread-local
...
Merge in CORE/base-third from ~ELIJAH/base-third:qufenxi to qufenxi
* commit '8cad028623d000a2f393fe03995c903d2947f74d':
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
496b1e156f
Merge pull request #784 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0d327f215e8ff6211a1f22ea86b0602fcf68e5b6':
4 years ago
0d327f215e
Merge pull request #783 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '5dce2c38dcdb25a608b534c151f9ac6d7f727c7f':
4 years ago
Elijah
8cad028623
DEC-14578 打包脚本
4 years ago
Elijah
41fa48ec77
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
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
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
a252275a48
Merge pull request #754 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'debbdb277edfea78a9b7157a63de3a49294ada8e':
4 years ago
lidongy
lidongy
superman
Cloud.Liu
Elijah
Niko
charile_Lu
zhouping
Echen
Hugh.C
Harder
Harder