superman
42eaab467c
Merge pull request #8405 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd9be5ccd258401236f74e608dbc4f0d1274c1d48':
REPORT-90265 apache commons fileupload升级到1.5
2 years ago
superman
d9be5ccd25
Merge pull request #8404 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '826f8ebf465128cfd2eaeacdfb40bb7e003fe5a5':
REPORT-90265 apache commons fileupload升级到1.5
2 years ago
superman
90d3faf8d9
Merge pull request #8332 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd9c131d630dbdf0943145d899b5a6ea00097616b':
2 years ago
superman
d9c131d630
Merge pull request #8331 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'd73c9e1ee627f4ba5f9d88da158e6cd360e331d8':
2 years ago
superman
8c30b3d960
Merge pull request #8286 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '0359afb326083a0e17b3c114824141f4eac6834a':
2 years ago
superman
0359afb326
Merge pull request #8285 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '2989b25517e7e8b109dcfd9bcf96558cf3fb8164':
2 years ago
superman
7d733c54fe
Merge pull request #8094 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '0a9502664c974d63b488318c74dca33b745e7188':
2 years ago
superman
0a9502664c
Merge pull request #8093 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'f0bde25fa8370a70c6982056196c774433a87c96':
2 years ago
superman
f6e684d373
Merge pull request #8060 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'df29bc9e263b867865045ae15567a40708723483':
2 years ago
superman
df29bc9e26
Merge pull request #8059 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '4610dfca23db90ab2943e6ed3fba47535365bdb6':
2 years ago
superman
4ef0af8891
Merge pull request #8024 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '495e43758f774ae1cc823c894e0798cf0202ac1d':
无jira任务 加上fine-sql release分支
无jira任务 加上fine-sql
2 years ago
superman
495e43758f
Merge pull request #8023 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '1236e8aa1aac2026881ef92668956a4dfa09ef70':
无jira任务 加上fine-sql release分支
无jira任务 加上fine-sql
2 years ago
superman
d27c4d1b20
Merge pull request #7963 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '37aa2c0c01174bde98ea227153e4bdbc1ea6bb6a':
2 years ago
superman
37aa2c0c01
Merge pull request #7962 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '149a65f6f325eee75294ec687d9b2e04d2886aac':
2 years ago
superman
dc1f19e6cd
Merge pull request #7930 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '15ed286fed36dd5b7c415999aa314d3cff9d3928':
BI-119652【来源PT项目】BI-5.1.18.29上starRocks和Excel联合分析报错 --合final
2 years ago
superman
15ed286fed
Merge pull request #7929 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '5e9332ba283cb2163ced930ec2fb2460cdd79aa4':
BI-119652【来源PT项目】BI-5.1.18.29上starRocks和Excel联合分析报错 --合final
2 years ago
superman
e8f72807a8
Merge pull request #7849 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '33e58657a031a867f95b928fc3eacc6ed1fc9807':
2 years ago
superman
33e58657a0
Merge pull request #7848 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '46275daa5035ad8f476a0b07976879176259aef9':
2 years ago
superman
7983753499
Merge pull request #7792 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'de9fc6d1be9006bd1e3e5a93c45f3f7b1a31b66e':
2 years ago
superman
de9fc6d1be
Merge pull request #7785 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'c2b896c4725e903ff5319f44ecd78c6334f2b403':
2 years ago
superman
014901b35a
Merge pull request #7541 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '3edd26ee37fbda6bd02a1fbe0aa7b548e40ec939':
2 years ago
superman
3edd26ee37
Merge pull request #7540 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '888eb7b8b167660927ff9f8b73c23a3faca4ecac':
2 years ago
superman
0aa6e23660
Merge pull request #7518 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'fcb838956e66640d097f9fd03d47eb4bbf7344a1':
2 years ago
superman
fcb838956e
Merge pull request #7517 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '056a7f4386e9e6a66be0727fe66063f87cfe73db':
2 years ago
superman
f1fe8168e0
Merge pull request #7352 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '3dad1472bebcdbe9fa231fca8e5dede5a9306063':
2 years ago
superman
3dad1472be
Merge pull request #7351 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '1c720fdfa10f25159c7cb2e4a1d61ffdd379abf5':
2 years ago
superman
4a9b04fe17
Merge pull request #7295 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '4fb63cc98c177b4dace8d40dfc87f4dbab541f7a':
2 years ago
superman
4fb63cc98c
Merge pull request #7294 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '14af1dcdc170d27ea4aff91e01e7c203131ae100':
2 years ago
superman
03c7b52610
Merge pull request #7130 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '973a6f6da4f73b42a9477fd47b8446d0cfe98f44':
2 years ago
superman
973a6f6da4
Merge pull request #7129 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '825a2f75ac4c99a3e618ed7d583cade16d1323c8':
2 years ago
superman
9d7938213a
Merge pull request #7096 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f0f50924502afa22df05bcd51564238d6359c4f8':
2 years ago
superman
f0f5092450
Merge pull request #7095 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'a38c92b892831b321e69b10d58725f343a3b0551':
2 years ago
superman
edcbd35e14
Merge pull request #7037 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8732d461a4e8c84ac61757c1d65659499ff300c9':
2 years ago
superman
8732d461a4
Merge pull request #7036 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '8742daa9649c62c82212d2748eb2845d4ce6c01d':
2 years ago
superman
28004f0f38
Merge pull request #6935 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '47e17a095ef1def9c5d5441d2966ed8a3987d4b4':
2 years ago
superman
47e17a095e
Merge pull request #6934 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'ca3e658fad0757cdc512d78d7f341ad426721499':
2 years ago
superman
a425dfa885
Merge pull request #6888 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '44d08c88507870bc9876118e704e16b0469fdc27':
2 years ago
superman
44d08c8850
Merge pull request #6887 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'e1cb7944cbace5942c6d2e15a72f6b91c1990189':
2 years ago
superman
7229762ef2
Merge pull request #6721 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '7bee526419e5c84342078b3afcc1f5dc6e048446':
2 years ago
superman
7bee526419
Merge pull request #6720 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '9c482e48de1ea5070b628b9e7ef4c5d2a830a763':
2 years ago
superman
d60c4b7734
Merge pull request #6700 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '63ee272ff833541ef4ac930d8568510b2d0e2b4a':
2 years ago
superman
63ee272ff8
Merge pull request #6699 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '02db3b19260b4a8e371d615649728c8e2b7fe6c8':
2 years ago
superman
a16e675d5a
Merge pull request #6639 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'cef7839f4edbeeab9a7cfd743c42dc948da360d9':
2 years ago
superman
cef7839f4e
Merge pull request #6638 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'c7cf01f9741fb624d272f66454b172b1d84d0442':
2 years ago
superman
5b642b3831
Merge pull request #6622 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd3e5ba118a5c4e58bf22d5ef67db2d503e8fc2c1':
2 years ago
superman
d3e5ba118a
Merge pull request #6621 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '894130855c65ae5db4affee75df72a21a10baaea':
2 years ago
superman
2576a7e4fb
Merge pull request #6588 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '7856b6e5b00f22e5b6cc3e5520d5fcfb23570a9a':
2 years ago
superman
7856b6e5b0
Merge pull request #6587 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'bac6ea22c280fb74bd3a1a1b6d07f658d1f6283b':
2 years ago
superman
ee80fbbe9d
Merge pull request #6450 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ba39af75e4a7ad46d26f18c073f1c324fb8021e0':
2 years ago
superman
ba39af75e4
Merge pull request #6449 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '007105a4869f05b5373be2f956173d80481ada78':
2 years ago
superman
a73f14d044
Merge pull request #6393 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '2292480ae7a46fc54db83eb730faefeb5bdd0339':
2 years ago
superman
2292480ae7
Merge pull request #6392 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '7a704c786ab1c5afa87390ca4d384bcff8b35097':
2 years ago
superman
7591fb4d20
Merge pull request #6378 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '4a463e60e2a8769fb7e2e56f3047672b5355e1ca':
2 years ago
superman
4a463e60e2
Merge pull request #6377 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'c91c84276c375ada60270059dda2cca49318f970':
2 years ago
superman
d183779356
Merge pull request #6336 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '2e594945fa45630fc8dccc73693fc1fe75e56acb':
2 years ago
superman
2e594945fa
Merge pull request #6335 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'c88f8c090e3578e9ef45ff96ef7f38e386c4eccc':
2 years ago
superman
93b9219a1b
Merge pull request #6320 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ae7334bc1e9332f90268b4623cdaaf694b783415':
slf4j升级到1.7.36
2 years ago
superman
ae7334bc1e
Merge pull request #6319 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '14fb774178f7124b78329d13ebcb9fc6ac95b2e4':
slf4j升级到1.7.36
2 years ago
superman
17efae5cf4
Merge pull request #6285 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '27a80afa09ec515c95c52b7e1e47cbf15e8e2ae4':
2 years ago
superman
27a80afa09
Merge pull request #6284 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '503c43938e837dc0b49bf6897f4c02f2707e07b3':
2 years ago
superman
9bafb035b6
Merge pull request #6270 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '9afeb8c3e3dbae114e97380d4dd28dc1079f2d5e':
Revert "REPORT-73902 update: jedis升级"
2 years ago
superman
9afeb8c3e3
Merge pull request #6269 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '470376b0399b00e865b8ae297788497d67fad789':
Revert "REPORT-73902 update: jedis升级"
2 years ago
superman
9a816c263f
Merge pull request #6247 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'abfbd573713252c55573457212375a51c7ceef23':
REPORT-73902 update: jedis升级
2 years ago
superman
abfbd57371
Merge pull request #6246 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '33085ecdf7b36728fdfe3d9d41639334367fa4ad':
REPORT-73902 update: jedis升级
2 years ago
superman
ec50d7dfd1
Merge pull request #6219 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'eda021b6d0acf1f8b1e55a370e047d092a4bbcdd':
2 years ago
superman
eda021b6d0
Merge pull request #6218 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'aa88534369e0ff56fbe4dbcd870d0b877c526a0b':
2 years ago
superman
b220b4e270
Merge pull request #6158 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '55c508b28bb3857daffc979c4791e0d7f6840979':
2 years ago
superman
55c508b28b
Merge pull request #6157 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'a49ec753c18369b39bb175dd4eca0e595373b754':
2 years ago
superman
283e2ba567
Merge pull request #6027 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '2f6141ec0ae3a6adc5eaa519ad1a13dedbb040c5':
2 years ago
superman
2f6141ec0a
Merge pull request #6026 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'a3037743d443cdc732fde2a1b1e9e667ecf00074':
2 years ago
superman
158c34805b
Merge pull request #5987 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6ff7733e7e58f2d1e61344d1ee06af9700fa037e':
2 years ago
superman
6ff7733e7e
Merge pull request #5986 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '70dd1c299191068373002c2f6c5b1558f5cca3c4':
2 years ago
superman
8d6d27d5a7
Merge pull request #5925 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'e5af3ed4cdabdeda1d08babc3a925d01c6817547':
REPORT-71512 fix: 修改内置BouncyCastle的providerName
3 years ago
superman
e5af3ed4cd
Merge pull request #5924 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0b3fe4d4209bda15bea509f1db5ea03e4f463026':
REPORT-71512 fix: 修改内置BouncyCastle的providerName
3 years ago
superman
96e37941b7
Merge pull request #5879 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '09ad91b1a5a1a5d5b25cff66c8ca72f561ff6eb6':
3 years ago
superman
09ad91b1a5
Merge pull request #5878 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '324ee81618e29e4a2036ad3806ca5b2a821e0dfa':
3 years ago
superman
c7f4d7403c
Merge pull request #5835 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '0390598b171abdd084a83fe32acf5be5ba57fd63':
3 years ago
superman
0390598b17
Merge pull request #5829 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'd32c3d7bd78864f8f2344e8f4a0659d574cd47b8':
3 years ago
superman
adf204de01
Merge pull request #5817 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ec47262ddf3ae0ccad52498761fba3003f0e1693':
3 years ago
superman
ec47262ddf
Merge pull request #5816 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'f2df2e36d710a5c89a891b1fa8840e6fbfd6bb1c':
3 years ago
superman
d65fa34423
Merge pull request #5746 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '29cc00c0f0e3bc27a8b2b10cfbe6f3e594244a0c':
3 years ago
superman
29cc00c0f0
Merge pull request #5745 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '1342cbca324b1355765ada2a190b9a334238b097':
3 years ago
superman
0eeda666e4
Merge pull request #5649 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6daa954bd31bb0846016b443a70237a8ccd2e776':
3 years ago
superman
6daa954bd3
Merge pull request #5648 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'e488cb607d410665f87658ba6362f2f22e57a433':
3 years ago
superman
59a330c28b
Merge pull request #5608 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '5e0427437bf26baeb4bad79a0bfa334b28f80cf5':
3 years ago
superman
5e0427437b
Merge pull request #5607 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'b8bd6f3e129f378e2afb1e86069443d104dd9f77':
3 years ago
superman
28082155b9
Merge pull request #5547 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'b3b586bc65637cecc3d21c860982c0a26bb21642':
3 years ago
superman
b3b586bc65
Merge pull request #5546 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '933e8ed3bba704cfe589f3350e67519481efb0d2':
3 years ago
superman
14016e8495
Merge pull request #5509 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8089f1111c79d4c22bc4b706c1f54d974ab3772c':
3 years ago
superman
8089f1111c
Merge pull request #5508 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '2f43f3ec6a71d0acf73e00a8f4ef4c940d20c61b':
3 years ago
superman
9347d25b05
Merge pull request #5392 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a14591b457c82a60096e57701f2c0fa4565b3661':
3 years ago
superman
a14591b457
Merge pull request #5391 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'e118a321bb4c94a3b90812066605cb3688310b60':
3 years ago
superman
fd8fa854d9
Merge pull request #5314 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '67ccaf452e1b66836ce95899be966bdbb36e2519':
3 years ago
superman
67ccaf452e
Merge pull request #5313 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '06df4bced51fe804cb1ab30bba5b0b0d63f94aeb':
3 years ago
superman
e6e8a73004
Merge pull request #5265 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'c717c7d178275f4b409abb26a21866b79e52f474':
3 years ago
superman
c717c7d178
Merge pull request #5264 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'b69444b4a6b6f6dea665e6841d7b4aeaf6d07a78':
3 years ago
superman
c12e18ab29
Merge pull request #5142 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '110d72e5578e922471064995936c56d5100dcfcc':
3 years ago
superman
110d72e557
Merge pull request #5141 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6e2121d93636ce6dbfda3ecea1daf7d0fbfbfb07':
3 years ago
superman
aa420b413b
Merge pull request #5026 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8fe121827076cf8b8a9a851b00f6963f0ebded21':
3 years ago
superman
8fe1218270
Merge pull request #5025 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6b2c6d703c2d975a25d210000c5afe454ea2e633':
3 years ago
superman
3a28480e14
Merge pull request #5014 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6e462e944912ae0f2245e002645ce502889145ef':
3 years ago
superman
6e462e9449
Merge pull request #5013 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '5cc89157cc9f08060a2c1ead4f9f81ee5d85e0a1':
3 years ago
superman
24105a2553
Merge pull request #4994 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '23e7dbc9a888078f12232ae477a0f29886a9eb5c':
3 years ago
superman
23e7dbc9a8
Merge pull request #4993 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6e39dd97eb6fd02145b3a2e0dfcddc5d517f06f6':
3 years ago
superman
1b6d496e50
Merge pull request #4946 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '80c723012b5963a6114b9ea1f367f1c617715f83':
3 years ago
superman
80c723012b
Merge pull request #4945 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '1ada87a617f92e8585243b6d0e12b52ba732baac':
3 years ago
superman
271ff38409
Merge pull request #4752 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '0d1eed08d9a8f6273ee44b669af8223d0b9a1e7f':
3 years ago
superman
0d1eed08d9
Merge pull request #4751 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '4a7609b104ef18573939af93e8fd3f4dfec27142':
3 years ago
superman
bc777442db
Merge pull request #4705 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '26dea6b20870d12d9f55058882e242ba01a061af':
DEC-22165 fix: 移除pom.xml
3 years ago
superman
26dea6b208
Merge pull request #4704 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6440ffd62858d23871c5bc829bb064413dc1fdb4':
DEC-22165 fix: 移除pom.xml
3 years ago
superman
8e0e36f386
Merge pull request #4646 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6762db97ee811ab1c698cd9adb34f006b0d05a01':
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
6762db97ee
Merge pull request #4645 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'b88eaa57f94b90467481b56888bef848c218ec4a':
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
0e33cbfb2a
Merge pull request #4555 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '1354e75a5214759c7967bd56d73065f2a593d650':
3 years ago
superman
1354e75a52
Merge pull request #4554 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'c23a7b6d52c0031f178138bc74cd7c7838c304c4':
3 years ago
superman
96e96cdb8f
Merge pull request #4534 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6aa32b26feb016cd731891dd230914954d10559b':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
6aa32b26fe
Merge pull request #4533 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'ceea54625752f566c910a97ccaf500036be7373e':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
a0c7ea2f81
Merge pull request #4513 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a0715a33f5a417f602dbe997511cd5ef965783ff':
3 years ago
superman
a0715a33f5
Merge pull request #4512 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'b1e18cb9b39c9065bd3671866ede88c6517ab7d1':
3 years ago
superman
0f4363831a
Merge pull request #4404 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '42fbb817c5b9b2d2b2f0743d655ed475363fe058':
3 years ago
superman
42fbb817c5
Merge pull request #4403 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '36d8beadcc4f90078e6a03f01fb33ba267921a1b':
3 years ago
superman
a6deda4b6f
Merge pull request #4348 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f9d85e4a70bf531355e250ef70696980b6d0c61f':
3 years ago
superman
f9d85e4a70
Merge pull request #4347 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'feb87ba60150e665329a14dd6726c64254c02715':
3 years ago
superman
d17540da84
Merge pull request #4289 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '49b408fc81bea365478950e8c73f4176c9a0f0ed':
3 years ago
superman
49b408fc81
Merge pull request #4288 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '4525a480b12e083e180d76d9e47d933181faac5a':
3 years ago
superman
f7b8efccfd
Merge pull request #4257 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f4c6cabac730ed2aeb78635d52e939dacba2b40a':
3 years ago
superman
f4c6cabac7
Merge pull request #4256 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0c86aa30f85860aa892109aecac410394ed9c0da':
3 years ago
superman
24cfe9b464
Merge pull request #4241 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '7ee7ca5e951e6abfe85287b1e94d16a12ed798c1':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
7ee7ca5e95
Merge pull request #4240 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6869107b77798f0d9a188f336e9a728b54764f1c':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
23df2cbd23
Merge pull request #4197 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'bed893a89aff637b21b299a4479a561502c754ec':
DEC-21348 fix: java security适配
3 years ago
superman
7ba3bc5de7
Merge pull request #4187 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a5999fc26303135d8756bd2e676d2f9b7e8a108c':
3 years ago
superman
71d9eda446
Merge pull request #4146 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '2c7bfb0246b0a6d51241f1f9adb4d8d4723601d7':
3 years ago
superman
509c0862fa
Merge pull request #4112 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '4e5b5eb58871aaf9cc94d8f1dec90a212ad81300':
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
cd3bce0576
Merge pull request #4078 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '909a1c36f19967b2e02e44a1751579c8033a276a':
DEC-21348 fix: java security适配
3 years ago
superman
16aa9fcb46
Merge pull request #3992 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '4b4ec20530c18ffbf1b8440bfb220197a3c32e36':
3 years ago
superman
617a65b2ef
Merge pull request #3905 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6b39a3737d7f7ca45f2564e57e99f62161aea030':
3 years ago
superman
52a4c03bd5
Merge pull request #3872 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'fe456b8e912abd46db94d06a83b37c757f541569':
3 years ago
superman
7e928c353a
Merge pull request #3851 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '427b0b3e92173117f4130bb3a0067e1f3eda36c0':
3 years ago
superman
d3d11c5910
Merge pull request #3823 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'fcf1a91fec665b8f4e6de9e0c996ec09b98bb1be':
3 years ago
superman
c00108e959
Merge pull request #3790 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ab479b47ba8d76ad91f58f647d9ad647c14bec57':
3 years ago
superman
3454c8c6a3
Merge pull request #3779 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '9e4493eac0af94aa9d4b786df6e716025e7ba305':
REPORT-60245 fix: TongWeb启动失败
3 years ago
superman
7733166e32
Merge pull request #3695 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8226367f3f3dc871a19620c2253dd69dd7101c89':
3 years ago
zhouping
72e4494125
Pull request #3682 : 无jira任务, feature/10.0 合 research/10.0
...
Merge in CORE/base-third from feature/10.0 to research/10.0
* commit '79427a2a84eb35c88ba86348a18ec4f210b92227':
3 years ago
superman
4db7fc2f99
Merge pull request #3641 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a8a8fdd1c729f1bd8feb318759c747424714e3ab':
3 years ago
superman
ddcd360c63
Merge pull request #3547 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'aa83a6d1f42d9da70cd543a0eba029d90a591c84':
KERNEL-9224 refactor: 升级Jodd到5.0.4以上版本
3 years ago
superman
4bbdb07811
Merge pull request #3511 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'b6717cc4f874a8dd191a7b5a9af60aa71ea336f6':
3 years ago
superman
5e59b57cb8
Merge pull request #3494 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f5c3c192b64d0f24578aff5e66ca883baeb9c5d5':
3 years ago
superman
149e02950c
Merge pull request #3466 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f34a92ea3dd6416ae044a27303954a79d9363344':
3 years ago
superman
1f409abb8b
Merge pull request #3392 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a254bc26f06d7c8a2989ceba35fb38205fb8329b':
3 years ago
superman
8754e0e6a3
Merge pull request #3351 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '18376e82eb134f258af67316e24dfe66945bb508':
3 years ago
superman
df72bb4298
Merge pull request #3326 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '58aba7979bcd4ca32b7b6d75b44a35af102d6e10':
3 years ago
superman
cf948079ea
Merge pull request #3266 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6531e12d8971d586c67b0d3fa95fcbad970ae830':
3 years ago
superman
32aff73d1e
Merge pull request #3225 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8cd01e86179c7f482e289f626a8790f29408c2b4':
3 years ago
superman
590023b48e
Merge pull request #3207 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8e72b1897c29267295ea818c11f79b61e2168aa2':
3 years ago
superman
9da62f8e38
Merge pull request #3189 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '4a7c30ff07b589a9176a703bf0f73e6d2ffe255f':
3 years ago
superman
d0d765a453
Merge pull request #3026 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'cf10d245e4ad95ec4805bf1c2c891aed0c390493':
3 years ago
superman
93d302136e
Merge pull request #2993 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '111acdb2649318678d7b939744e97039b9d8a558':
3 years ago
superman
1b324f4860
Merge pull request #2979 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '77530b312564f37fc9a36453922d5706b2530064':
DEC-19773 refactor: itext适配新bouncycastle
3 years ago
superman
22848e51fb
Merge pull request #2956 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'a1ad3bb2ed99f57f6df2bd21c92650be03429932':
DEC-19773 refactor: 升级bouncycastle库
3 years ago
superman
25ac0bdac9
Merge pull request #2915 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '694c94f9bc7d8ebc19d27c664a42654dd31e7c89':
3 years ago
superman
9d744cf498
Merge pull request #2866 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '2a499938bfcafb7bd430255ac49cb2c475ea9f75':
REPORT-55330 修复Bitmap实现bug
3 years ago
superman
bc6e89a191
Merge pull request #2855 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '008f5cc4bd1e671e4ca31c2c929119dd66850843':
CHART-19735 && CHART-19736 版本升级
修改信息
修复bug
KERNEL-8448 提供RoaringBitmap兼容实现
DEC-19253 feat: netty-socketio支持配置加密套件
DEC-19577 fix: 另一个实现类也改一下
无jira任务 fix: 修改注释
DEC-19577 fix: hibernate建表时,调整为只有建表成功才进行添加索引、主键等操作
3 years ago
superman
0e2d428d18
Merge pull request #2820 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f888d7bf8befd88fca3a7ba3e840ef1bb1ca2fed':
3 years ago
superman
04da534d84
Merge pull request #2792 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'c022dcbbe845c9250660d214345f2b32f7896d86':
DEC-17950 fix: 删除fine-roaringbitmap
3 years ago
superman
68b319b568
Merge pull request #2744 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '64c6eef4493781df97415a41608e1b9b5ec4e224':
3 years ago
superman
9a8ceb2a0a
Merge pull request #2736 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'bcee40656e5a05205e91554e39bcf476a1fdd817':
BI-88269 fix: 集群环境下FineBoundedBlockingQueue的相关问题, 订阅多线程下线程安全问题, 这儿针对这个bug改下, 后续可考虑升级jedis版本
3 years ago
superman
b2e99df246
Merge pull request #2694 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'bc8c98edb16ce0e53d8bb91a840900770310820a':
3 years ago
superman
ab0a9aa0f3
Merge pull request #2686 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f502899d5049be1e7ec1ce534f475745333e7fd5':
DEC-19255 fix 对之前主键丢失的客户表做npe处理
DEC-19255 fix 对之前主键丢失的客户表做npe处理
3 years ago
superman
1645f02af3
Merge pull request #2656 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f5a0b7e9bbcf220af56116bd61f8c8cfacbc815c':
DEC-19137 修复第三方库中命令注入风险
DEC-19137 修复第三方库中命令注入风险
3 years ago
superman
40c8dbcb47
Merge pull request #2639 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '4c903b491a8b046e888ed7345a07a9a2c1d10cdc':
3 years ago
superman
f426fea814
Merge pull request #2617 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'c037ada93eb76f48d29540a8d81dae5714c003d3':
3 years ago
superman
604d2625bd
Merge pull request #2554 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '421d1de0095b0b88d7edfdfa0a7f11acb510142b':
3 years ago
superman
f72022a734
Merge pull request #2547 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f39842c723c3d6b4be38d06f1b24cc2e12654cef':
3 years ago
superman
c711f3c7c6
Merge pull request #2527 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '870a065dd4fbfbd3756acb8047192f58a2b92cf0':
3 years ago
superman
32eed1f0c4
Merge pull request #2461 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '7da14c00a89a37adf86e70bef640a25660b3dcb2':
KERNEL-7926 删下设计器用的第三方库中的日志输出
4 years ago
superman
803e988dd3
Merge pull request #2442 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'bc2cf3bb84c9172a6d09a9a7594a149d8cf8bace':
4 years ago
superman
0ba36ea736
Merge pull request #2428 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '04bf2f0bf2d53fa3c74a0662145a58b79a5c5f7d':
4 years ago
superman
8532d4b56b
Merge pull request #2397 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '56e7bd3f8c3f51b77720c1422cb220b1592f55c4':
4 years ago
superman
7054234e87
Merge pull request #2354 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ebe10eee0f7f008d5391db0a918263f155cddde0':
4 years ago
superman
f90a59e58a
Merge pull request #2331 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '1cc5bfb64edf20d8362b295849c8de83eae6bd39':
REPORT-51412 fix: third删除包漏改pom
REPORT-51412 fix: 移除fine-third的TTL和javaassist
REPORT-51412 fix: third删除包漏改pom
4 years ago
superman
0777aabe4b
Merge pull request #2323 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '330b38b89df63c394df6fa9144487a45bca058c7':
REPORT-51412 fix: 移除fine-third的TTL和javaassist
无JIRA任务 fix: 更新third打包脚本
无JIRA任务 fix: 更新third打包脚本
4 years ago
superman
ce2474c408
Merge pull request #2314 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'b3732a119d3ae3521309936ebb750f05603d6cf3':
4 years ago
superman
76b9c944db
Merge pull request #2308 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'b7feab875479f0c46c64b8923f9af26bef7aad31':
4 years ago
superman
e28a0bb823
Merge pull request #2300 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '04f518520021ae2336a4e7f6d5181a023ebc02d8':
4 years ago
superman
9855b42851
Merge pull request #2288 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '67baa0e2108076c74a0fd72af11563adeed07c09':
KERNEL-7725 feat: websocket提供全局拦截器
4 years ago
superman
5cd1451948
Merge pull request #2281 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'eb835f7321a8951710e8ff73b2288d567a4a90e6':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
ed1bb0b9fa
Merge pull request #2262 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '5b40cdca25d3fd9aea1d1f9aa8f32bea89767dde':
4 years ago
superman
c7d2fa7e8f
Merge pull request #2237 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8ab7742594e48561a5581835382ac4ba60811794':
DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
4 years ago
superman
f4fe15e826
Merge pull request #2206 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8dec64dba2c64323e302e253af74a8228f3d2f5c':
4 years ago
superman
52c61a5663
Merge pull request #2187 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f001f36874bbd9bd0a621f2829ef1d7dad6b001e':
4 years ago
superman
4c3000c53b
Merge pull request #2180 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6ee8bb03f04ed9207cc8cbea31ad9260d928a4ae':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
afad163daf
Merge pull request #2149 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '0dbb5e97f6cd82c8f50e874667e42326a61ed520':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
406ed2ca64
Merge pull request #2142 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'bc5cd505196db4b139c0c7977c1f5371e49b0a5c':
4 years ago
superman
9ddf66bb89
Merge pull request #2087 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'e2f77156996671e3bf1fe8e51603d9d9fd248391':
4 years ago
superman
7e74dd471e
Merge pull request #2070 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '22c46929e09deb8f12de0bccea40ad407ccb6275':
REPORT-50649 导出-生僻字导出问题 Excel导出
4 years ago
superman
899f024c1d
Merge pull request #2058 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '3333248afd58f34163c8afb477782e3ee4db3265':
4 years ago
Cloud.Liu
45a731511b
Pull request #2051 : 无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '1db2fd489450dbafae7f9007a353d46a806cf48f':
无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0
4 years ago
Cloud.Liu
1db2fd4894
无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0
4 years ago
superman
3393b5e1db
Merge pull request #2037 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '55f472d00e09b1ab8581db6e52ca934c0d7414d5':
无jira任务 docs: 补充readme
DEC-14578 feat: hibernate二级缓存卡顿
DEC-14578 feat: hibernate自动删除旧唯一键
DEC-14578 feat: 使hibernate支持主键的自动更新
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
QFX-1737 fix:数据上传之后报错
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
superman
335ecf993a
Merge pull request #2029 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '65d03d6933d84292e216175de88f9f4116771daf':
DEC-17895 fix: import fileupload相关类包名错误
4 years ago
superman
bbdaad7226
Merge pull request #1979 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'bcae5d54f8b72be50e5bf2ed0d7af47fbb328dda':
4 years ago
superman
c79ea985a4
Merge pull request #1936 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '5ca461646bdd64b5c74ba81df6fccbfdc82df6c8':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
DEC-17331 fix: 裁掉spring对jackson的部分支持
4 years ago
superman
68426ef00f
Merge pull request #1922 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd7f108a7f12afe060e85d16de9176fe8bfbb42ce':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
无JIRA任务 fix: 修改third打包脚本
4 years ago
superman
ac43c35c5e
Merge pull request #1916 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '994ebb652788f0bfd8895ddf7778e586e9df9c64':
无jira任务 chore: 解决bugfix合并到feature的冲突
DEC-17254 feat: 升级Spring至4.3.29
4 years ago
superman
337b97d4de
Merge pull request #1905 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6df48738045be1e2dacbba2917c305287685f755':
无JIRA任务 feat: CBB增加分支
4 years ago
superman
bdab3081ee
Merge pull request #1880 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8e2ed2e1d56fabd3eb44b55113a75d06e499f761':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
f24f8b7dd8
Merge pull request #1867 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ca8da13bf19a81babe902047b5c3f6caa4ab6170':
4 years ago
superman
c45622b94b
Merge pull request #1837 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '39914965a268196669829df684b80a67bfa52e0a':
4 years ago
superman
2af54fcfa6
Merge pull request #1823 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'aa5df921dc14b6db6a2e32cd3943f242521cc26f':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
4 years ago
superman
65e72e71bc
Merge pull request #1815 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '41556ee6f916d4a6bedb7beb38aae99b7835dd7a':
REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
4 years ago
superman
40453a4721
Merge pull request #1796 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f18915e59af5853858fddf7e8e748218ff4b2fce':
DEC-17219 revert: 先不把fine-sql打入fine-third
4 years ago
superman
193a3632d1
Merge pull request #1789 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'df1a815455fcdad6daadf9891d9f7bda0c54ebfc':
DEC-17219 feat: 转SQL合并到release third
4 years ago
superman
7ec2672bba
Merge pull request #1743 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '028c27c1ec1891c27f8e5123750483d91332a305':
4 years ago
superman
490af821a0
Merge pull request #1696 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '1bd72fefbc9195e7c77411ffef879cfe1bf8fc6a':
4 years ago
superman
4af28abc61
Merge pull request #1669 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '25322027b8893ca9df1c7d790caeb234480d8d5d':
4 years ago
superman
7c9232de9c
Merge pull request #1589 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '50b8d3d9311867ad8d413ae55ba0b03b55de5cce':
REPORT-46819 release→final
release→final
REPORT-46819 死循环风险
代码质量
代码质量
REPORT-46819 win7下加载j2v8dll之后程序无法退出
4 years ago
superman
85b4b1e152
Merge pull request #1567 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '5844c5318e43a5e9fe557aea7af456248cc33d99':
4 years ago
superman
5f7b4067bf
Merge pull request #1528 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6b896bc0617c240a2f33b414130cff594d67b3fa':
4 years ago
superman
0f03378b3a
Merge pull request #1512 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'eb11c55fd33f950b40fa99580473477ffcc89976':
KERNEL-6189 feat: 公式组件加入release打包
KERNEL-6189 feat: 基础类库、定时器合并到主体代码
KERNEL-6189 fix: 修复third打包脚本
KERNEL-6189 chore: feature分支fine-third打包加入CBB
KERNEL-6151 fix: fine-third打包脚本修改
KERNEL-6151 feat: fine-third适配fine-essential并加入打包
4 years ago
superman
0a48c35ee2
Merge pull request #1475 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd35a1762977215686c1b54003dc0cdfcbe0d7665':
CHART-17354 修改JNI,增加内存即将溢出的回调,中止JS执行
4 years ago
superman
ee4b17d32a
Merge pull request #1467 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'c2a702f86ee1a05f51270e7d3b2f93c2b5bcbe5d':
4 years ago
superman
dc33cd46fd
Merge pull request #1436 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '22352d7fe1df01c9cd2b7f176d4ad02c91793f32':
4 years ago
superman
88345f8e74
Merge pull request #1430 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '76c70c10cb2bcaaa70ec3ba3792d82edeee97a26':
DEC-16125 fix: 少了一个GMT+12,third包单元测试跑不到,移到decision
DEC-16125 fix: resin和weblogic下存在joda时区加载不到的问题
4 years ago
superman
3bddbafdfa
Merge pull request #1417 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'f5d19f57b140d5c0372251288c5f56b7786e5bb9':
4 years ago
superman
59957312e0
Merge pull request #1406 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ff3cfa431bc36cdbff18ec4ec33d91e4cdf1ba1f':
4 years ago
superman
ec2323319c
Merge pull request #1355 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '352e9ea5fad2036841420334e6cbb76cff26a33b':
KERNEL-6186 升级J2V8 & V8
4 years ago
superman
34712cf944
Merge pull request #1349 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ea6bf42fffda2c78f79847d7dd505ef4265b3e3b':
4 years ago
superman
a353f39f3d
Merge pull request #1317 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'b379fd59a2df422b6bdcc77a9fdcf2a0fd78706a':
KERNEL-6189 fix: 修复third打包脚本
KERNEL-6189 chore: feature分支fine-third打包加入CBB
4 years ago
superman
b99a6608e6
Merge pull request #1305 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '350c9c3605779f34db07d3b20a534c583af5dcbb':
4 years ago
Cloud.Liu
9aca87bfdc
Pull request #1289 : KERNEL-6151 chore: 解决feature合并research冲突
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '985d4fb2e5ec9dad295561258295a6257baa7e61':
KERNEL-6151 fix: fine-third打包脚本修改
KERNEL-6151 feat: fine-third适配fine-essential并加入打包
4 years ago
Cloud.Liu
985d4fb2e5
KERNEL-6189 chore: 处理research打包问题
4 years ago
Cloud.Liu
7eb5f358a4
Pull request #1260 : 无JIRA任务 merge: 合并feature/10.0到research/10.0
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '92b00ac8a39556019c5587742966f2130ea5b8cc':
REPORT-42043 fanruan.log无法分割-代码质量
REPORT-42043 fanruan.log无法分割-代码质量
REPORT-42043 fanruan.log无法分割-代码质量
REPORT-42043 fanruan.log无法分割-加个volatile
REPORT-42043 fanruan.log无法分割-多线程问题
REPORT-42043 fanruan.log无法分割-代码质量
REPORT-42043 fanruan.log无法分割
4 years ago
Cloud.Liu
92b00ac8a3
无JIRA任务 fix: 还原被删除的文件
4 years ago
superman
47e4951393
Merge pull request #1253 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '393c2b3413cca882e8811ff6997c4131aa79bd1b':
4 years ago
superman
8c44ed6957
Merge pull request #1226 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '98e1ca68d9b7b01a261edd330ddcc94acd4418ef':
4 years ago
superman
3f02cee560
Merge pull request #1165 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '2db1062ef8d53c8b010fe6671bbcb99b139507ca':
4 years ago
superman
0e9699ea87
Merge pull request #1139 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '00fac18b1daddde7ae375da3676a6200b29eb7ed':
4 years ago
superman
88509f8e03
Merge pull request #1134 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '18a52394e816278af98323bf99c52c1fcdbe2a07':
BI-74885 fix: clickhouse数据连接出错时一直尝试连接
BI-74885 fix: clickhouse数据连接出错时一直尝试连接
BI-74885 fix: clickhouse数据连接出错时一直尝试连接
4 years ago
superman
16637c99e5
Merge pull request #1123 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '7b88b184e4650586565cc007d5d2e7c68ca5cfa4':
4 years ago
superman
3f158eb4ab
Merge pull request #1116 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd386ef5f3665ee47dfc8ec360e75cf313f0b7431':
4 years ago
superman
77af04e2d9
Merge pull request #1103 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '79ee124e4197d5459577affca90e213642f5f27a':
无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
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
d71b1daf3a
Merge pull request #1048 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '5ba1e145f43ac6895ae30f06ca29665ee23dcec6':
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
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
f45b6d5ad3
Merge pull request #943 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '74f65a6c1a34c48da94c8e13ce1c0c160306f506':
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
90b26afb02
Merge pull request #865 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '3955b03b53749106c8a4cbdf641c4f688a9224b9':
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
Cloud.Liu
03059b3b2e
DEC-15059 feat: fine-third适配基础类库改动
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
superman
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
superman
d61aed7b2b
Merge pull request #818 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '06b04e4b39f4c0f6ef7954e4c1d0cda26c3e566e':
无jira任务,合代码错误(多余代码残留)
4 years ago
superman
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
Cloud.Liu
90c0dcb8db
Pull request #697 : KERNEL-4983 release/10.0合并到research/10.0
...
Merge in CORE/base-third from release/10.0 to research/10.0
* commit 'b51dc088b6104f4a88af0c6c670244d72b4ac429': (121 commits)
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库
无jira任务,persist合final
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
REPORT-32986 html大写标签不生效
REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
...
4 years ago