superman
f309566526
Merge pull request #1101 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '8c5ea49b81814fe285efe63a105c4a51e3252bf3':
无jira任务,fix: 打包失败
4 years ago
zed
073885cb21
Pull request #1098 : 无jira任务,fix: 打包失败
...
Merge in CORE/base-third from ~ZED/fine-base-third:release/10.0 to feature/10.0
* commit '8c5ea49b81814fe285efe63a105c4a51e3252bf3':
无jira任务,fix: 打包失败
4 years ago
zed
8c5ea49b81
Pull request #1097 : 无jira任务,fix: 打包失败
...
Merge in CORE/base-third from ~ZED/fine-base-third:release/10.0 to release/10.0
* commit 'c21d6f29e6ebcee8cff3316f46f7c678e734753a':
无jira任务,fix: 打包失败
4 years ago
zed
c21d6f29e6
无jira任务,fix: 打包失败
4 years ago
superman
1bbc7af5db
Merge pull request #1091 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '84a5d135b0aeb64b348157057da67c22acad556f':
DEC-15495 redis命令支持替换
4 years ago
superman
84a5d135b0
Merge pull request #1090 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'e13c7899c20054cd336912ea33c195fab6a4a815':
DEC-15495 redis命令支持替换
4 years ago
superman
e13c7899c2
Merge pull request #1089 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'f12e991e5fa6f87fdc5f0adc5e7fb8fd185cd300':
DEC-15495 redis命令支持替换
4 years ago
zed
f12e991e5f
Pull request #1082 : DEC-15495 feat:redis命令支持替换
...
Merge in CORE/base-third from ~ZED/fine-base-third:release/10.0 to release/10.0
* commit 'd5a13aafe82320773fb77305265a6613a50a0202':
DEC-15495 redis命令支持替换
4 years ago
zed
d5a13aafe8
DEC-15495 redis命令支持替换
4 years ago
ju.ju
28012e43fc
Pull request #1081 : 无jira任务,feature合research,解决冲突
...
Merge in CORE/base-third from ~LUCIAN.CHEN/base-third:research/10.0 to research/10.0
* commit '43009e559b00bd9cc6b3774d44444bab51b2212d':
KERNEL-5583 feat: 升级spring到4.3.29RELEASE
4 years ago
lucian
43009e559b
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~lucian.chen/base-third into research/10.0
...
Conflicts:
fine-spring/pom.xml
4 years ago
superman
019b4c7a56
Merge pull request #1079 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6b42c0f01ebc84435f4e205a80464acac790002b':
4 years ago
Cloud.Liu
1925c448d9
Pull request #1075 : KERNEL-5583 feat: 升级spring到4.3.29RELEASE
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:feature/10.0 to feature/10.0
* commit '79cff8db0db917d1374899588ac672c635a86cb4':
KERNEL-5583 feat: 升级spring到4.3.29RELEASE
4 years ago
superman
6b42c0f01e
Merge pull request #1078 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '797b71ff7a4db60cd64c41eda16521136f7c32fe':
4 years ago
superman
797b71ff7a
Merge pull request #1077 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'c3d888f5ee6cd9676b8a822e92c78ec07c605ec5':
4 years ago
superman
c3d888f5ee
Merge pull request #1076 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '1d50cdfbebd6590d012271a774b7811061ac1aa0':
4 years ago
Cloud.Liu
79cff8db0d
KERNEL-5583 feat: 升级spring到4.3.29RELEASE
4 years ago
superman
1d50cdfbeb
Merge pull request #1073 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '61ae1a4f582e633257666dc021078353efee780c': (29 commits)
DEC-15199 fix: 再catch一个throwable,捕获未知异常
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
DEC-15106 test: 补充单元测试
DEC-15106 fix: 改成统一在方言中实现,方便维护一点
DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
KERNEL-5345 refactor: 对mysql5数据库特殊处理 改在third
KERNEL-5345 refactor: hibernate特殊处理,使其可以扩展建表时的主键设置语句
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
修改源码地址
无jira任务,补交readme文件
无jira任务,补交readme文件
KERNEL-5313 refactor : guava升级到26
KERNEL-5056 fix: 使用自定义分隔符
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
无jira任务,合代码错误(多余代码残留)
fix
无jira任务,合代码出错
REPORT-34112 review 改进
REPORT-34112 改进
REPORT-34112 去除无用字段
...
4 years ago
superman
d71b1daf3a
Merge pull request #1048 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '5ba1e145f43ac6895ae30f06ca29665ee23dcec6':
4 years ago
superman
5ba1e145f4
Merge pull request #1044 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '604d33023eb91dc9cf06d229229b9019e8e22f0b':
4 years ago
superman
604d33023e
Merge pull request #1043 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '0e91bd9742387fa095dab0b1dd632eccee553deb':
4 years ago
superman
0e91bd9742
Merge pull request #1042 in CORE/base-third from final/10.0 to release/10.0
...
* commit '61ae1a4f582e633257666dc021078353efee780c':
4 years ago
superman
61ae1a4f58
Merge pull request #1039 in CORE/base-third from release/10.0 to final/10.0
...
* commit '9977546bf607bf316b1cd84ffa606bec515771f4': (29 commits)
DEC-15199 fix: 再catch一个throwable,捕获未知异常
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
DEC-15106 test: 补充单元测试
DEC-15106 fix: 改成统一在方言中实现,方便维护一点
DEC-15106 fix: mysql有些小版本(如5.5.46)不支持创建key的同时自动创建前缀索引,此处手动指定
KERNEL-5345 refactor: 对mysql5数据库特殊处理 改在third
KERNEL-5345 refactor: hibernate特殊处理,使其可以扩展建表时的主键设置语句
KERNEL-5313 refactor: 修改gradle文件中版本为1.8
修改源码地址
无jira任务,补交readme文件
无jira任务,补交readme文件
KERNEL-5313 refactor : guava升级到26
KERNEL-5056 fix: 使用自定义分隔符
KERNEL-5056 feat: Websocket支持将token放入header而不是url中
无jira任务,合代码错误(多余代码残留)
fix
无jira任务,合代码出错
REPORT-34112 review 改进
REPORT-34112 改进
REPORT-34112 去除无用字段
...
4 years ago
superman
88f14bfb34
Merge pull request #964 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '517c40b93d592a8bc38f6f042fe0cb17c43143ff':
4 years ago
superman
517c40b93d
Merge pull request #963 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '3ed47807741cb6f4daf1531008391cd390ea1b84':
4 years ago
superman
3ed4780774
Merge pull request #962 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '9977546bf607bf316b1cd84ffa606bec515771f4':
4 years ago
superman
9977546bf6
Merge pull request #959 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'a19914721dcb4f3acbbf8e07fec07db7eac1f0ca':
4 years ago
superman
8e4ee79cdd
Merge pull request #948 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '60505c2dbe2aba06b6f76df3b1430c09b4651ac9':
DEC-15199 fix: 再catch一个throwable,捕获未知异常
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
4 years ago
superman
60505c2dbe
Merge pull request #947 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'a19914721dcb4f3acbbf8e07fec07db7eac1f0ca':
DEC-15199 fix: 再catch一个throwable,捕获未知异常
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
4 years ago
superman
a19914721d
Merge pull request #946 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '102e0b534dd2de0cc7ad7eb38181a3532924a13d':
DEC-15199 fix: 再catch一个throwable,捕获未知异常
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
4 years ago
lidongy
102e0b534d
Pull request #932 : DEC-15199 fix: 同样数据创建的datasource,首次init报错后,第二次init不会报错
...
Merge in CORE/base-third from ~LIDONGY/base-third:release/10.0 to release/10.0
* commit 'd294e9afd7ed00043dc142feec8c4496caaa576b':
DEC-15199 fix: 再catch一个throwable,捕获未知异常
DEC-15199 同样数据创建的datasource,首次init报错后,第二次init不会报错
4 years ago
superman
f45b6d5ad3
Merge pull request #943 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '74f65a6c1a34c48da94c8e13ce1c0c160306f506':
4 years ago
superman
74f65a6c1a
Merge pull request #942 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '31d25a31a61c3ea0664df4cbe31680463c05788e':
4 years ago
superman
31d25a31a6
Merge pull request #941 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '2dda110b5e10a62d561a79f74a2b0c661637208d':
4 years ago
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
Cloud.Liu
673d917df0
Pull request #889 : DEC-15093 fix: 任务名称错误 打包失败
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '24570d4552d8b66a346617cb27a1d9f561523a40':
DEC-15093 fix: 任务名称错误 打包失败
4 years ago
Cloud.Liu
24570d4552
DEC-15093 fix: 任务名称错误 打包失败
4 years ago
Cloud.Liu
5c774493e1
Pull request #878 : DEC-15093 feat: fine-third打包定时器cbb
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit 'a0cd5f15c9a32ce62cea4738091b6db3b09cff2e':
DEC-15093 feat: fine-third打包定时器cbb
4 years ago
Cloud.Liu
a0cd5f15c9
DEC-15093 feat: fine-third打包定时器cbb
4 years ago
superman
1425ecdb39
Merge pull request #877 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '511b657a776466d7f50fcd64b9b45b290c416475':
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
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