superman
2dda110b5e
Merge pull request #940 in CORE/base-third from final/10.0 to release/10.0
...
* commit '6ba098696e9aa9e61fd08e9f2f3318fc6eb60b36':
4 years ago
superman
6ba098696e
Merge pull request #939 in CORE/base-third from persist/10.0 to final/10.0
...
* commit 'acc2893aca810c15704c3b6f65cc7847ced009c5':
4 years ago
superman
acc2893aca
Merge pull request #938 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '96646bb23e02923e947ff7d6137a00c6e389ffd7':
4 years ago
lidongy
d294e9afd7
DEC-15199 fix: 再catch一个throwable,捕获未知异常
4 years ago
lidongy
58b20c1fb2
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lidongy/base-third into release/10.0
4 years ago
lidongy
448c3a8171
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
4 years ago
superman
511b657a77
Merge pull request #876 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'd356a7e7092838557a9eaeed60b4fb6a297618d5':
DEC-15106 test: 补充单元测试
DEC-15106 fix: 改成统一在方言中实现,方便维护一点
DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
KERNEL-5345 refactor: 对mysql5数据库特殊处理 改在third
KERNEL-5345 refactor: hibernate特殊处理,使其可以扩展建表时的主键设置语句
4 years ago
superman
d356a7e709
Merge pull request #875 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'ab3816fa87262d3c0d56c543f292536f16f1377d':
DEC-15106 test: 补充单元测试
DEC-15106 fix: 改成统一在方言中实现,方便维护一点
DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
KERNEL-5345 refactor: 对mysql5数据库特殊处理 改在third
KERNEL-5345 refactor: hibernate特殊处理,使其可以扩展建表时的主键设置语句
4 years ago
lidongy
ab3816fa87
Pull request #872 : DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
...
Merge in CORE/base-third from ~LIDONGY/base-third:release/10.0 to release/10.0
* commit 'cfef014fdfdac568da43738a51ce1d3a721de5bb':
DEC-15106 test: 补充单元测试
DEC-15106 fix: 改成统一在方言中实现,方便维护一点
DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
4 years ago
lidongy
cfef014fdf
DEC-15106 test: 补充单元测试
4 years ago
lidongy
3fbdf933fd
DEC-15106 fix: 改成统一在方言中实现,方便维护一点
4 years ago
lidongy
773b248570
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lidongy/base-third into release/10.0
4 years ago
lidongy
986e749924
DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
4 years ago
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
superman
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
superman
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
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
Elijah
0dc7ada046
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
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
charile_Lu
ab9cbd9ab7
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~niko/base-third into release/10.0
...
merge
4 years ago
charile_Lu
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
charile_Lu
19b6d80790
修改源码地址
4 years ago
charile_Lu
910fa83341
无jira任务,补交readme文件
4 years ago
charile_Lu
bee8b44567
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~niko/base-third into release/10.0
...
merge
4 years ago
charile_Lu
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
charile_Lu
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
Echen
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
Echen
327309208a
QFX-1737 fix:数据上传之后报错
4 years ago
superman
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
superman
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
superman
06b04e4b39
Merge pull request #817 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'be8e0969eef7631a6f4e0b2f9b31b478605b369b':
无jira任务,合代码错误(多余代码残留)
4 years ago
superman
be8e0969ee
Merge pull request #816 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'c46902ac9d85dc19bb55d336363a91136228b9b2':
无jira任务,合代码错误(多余代码残留)
4 years ago
Hugh.C
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
superman
e584f16655
Merge pull request #813 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'fbaaf7a8e40df06569815053ee053a1950e2abc5':
4 years ago
superman
fbaaf7a8e4
Merge pull request #812 in CORE/base-third from feature/10.0 to bugfix/10.0
...
* commit 'a6872b676dbdda3679a00f92203e316d8d891272':
4 years ago
Hugh.C
7219427199
无jira任务,合代码错误(多余代码残留)
4 years ago
superman
a6872b676d
Merge pull request #798 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '7892338e7057231dc312e6e89d2e1b813118e4bb':
fix
4 years ago
superman
7892338e70
Merge pull request #797 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'a034a630e7c2ae1bd8960e4d676d9e406903482d':
fix
4 years ago
Harder
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
Harder
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
superman
496b1e156f
Merge pull request #784 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0d327f215e8ff6211a1f22ea86b0602fcf68e5b6':
4 years ago