Bryant-赵东升
42548e9f0d
Pull request #10772 : REPORT-120996 合并third
...
Merge in CORE/base-third from ~BRYANT/base-third:research/11.0 to research/11.0
* commit 'b76d16056e9cb418e16ec3295a65c85e14dff28d':
REPORT-120996 合并third
REPORT-113277 Hibernate组件修复CVE漏洞
REPORT-108658 预览与导出pdf字体颜色不一致 【问题原因】字体填充颜色其实是一样的,但导出pdf后,字体存在黑色描边。 导出pdf时,若字体为粗体,会对字体进行描边。描边的颜色会使用到realPaint的颜色。在创建Graphics的时候,没有对realPaint进行初始化,正常情况下,是使用setPaint对其进行赋值。若此后再进行绘制,且没有调用setPaint方法,realPaint则为null,当字体为粗体时,会使用之前的颜色对其进行描边,字体颜色看起来会显示异常。 【改动思路】创建时,使用当前的realPaint进行初始化。
REPORT-109844 v8 linux arm 从11.4退回10.9
REPORT-109123 fine-third-11.0.jar中含有.bak文件待清理
REPORT-108344 用户密码被记录进日志,手机号邮箱被明文记录
6 months ago
bryantzzz
b76d16056e
REPORT-120996 合并third
6 months ago
bryantzzz
d806f27e5c
Merge branch 'persist/11.0' of https://code.fineres.com/scm/~bryant/base-third into research/11.0
...
# Conflicts:
# fine-hibernate/README.md
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/dialect/Dialect.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/event/internal/AbstractFlushingEventListener.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/jpa/criteria/expression/LiteralExpression.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/loader/plan/exec/query/internal/SelectStatementBuilder.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/Delete.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/Insert.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/InsertSelect.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/QuerySelect.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/Select.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/SimpleSelect.java
# fine-hibernate/src/main/java/com/fr/third/org/hibernate/sql/Update.java
6 months ago
superman
1050b8ef0a
Merge pull request #10757 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '2c5ba61a5962908847e340ec74d6e73b12849a2a':
REPORT-113277 Hibernate组件修复CVE漏洞
8 months ago
superman
2c5ba61a59
Merge pull request #10688 in CORE/base-third from release/11.0 to final/11.0
...
* commit '437feaf8d84849c0aaddae6d304af8775692e4e1':
REPORT-113277 Hibernate组件修复CVE漏洞
8 months ago
superman
437feaf8d8
Merge pull request #10577 in CORE/base-third from bugfix/11.0 to release/11.0
...
* commit '76d63f9d8be72189ff87ec5eae47e3faa412068f':
8 months ago
superman
76d63f9d8b
Merge pull request #10576 in CORE/base-third from feature/x to bugfix/11.0
...
* commit 'f8fc5573ec6f27dc491f5e5c485f0eab42152e7f':
8 months ago
superman
f8fc5573ec
Merge pull request #10474 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '573bc55d605024b6f31aeea3132621f1b34bdadd':
9 months ago
superman
573bc55d60
Merge pull request #10473 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit '03de7cf43ed2cd4ef318d79bacdcacee2ca6db8c':
9 months ago
superman
03de7cf43e
Merge pull request #10472 in CORE/base-third from final/11.0 to release/11.0
...
* commit '90b75c56019a22c4d9aa26b8b50c66bda2e6f1c6':
9 months ago
superman
90b75c5601
Merge pull request #10471 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '48366ae4af15029448f1d2aa999a08a0d9878038':
9 months ago
superman
48366ae4af
Merge pull request #10464 in CORE/base-third from final/11.0 to persist/11.0
...
* commit 'c9bd13d87bd167dde3dff4b60d575f50d00efefb':
9 months ago
superman
475d270306
Merge pull request #10451 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '00e98f84d034429c89e6b503c173f69332a488eb':
9 months ago
superman
00e98f84d0
Merge pull request #10450 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit 'c5f3c60d7051c321520648389594b6a195f37079':
9 months ago
superman
c5f3c60d70
Merge pull request #10449 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'c9bd13d87bd167dde3dff4b60d575f50d00efefb':
9 months ago
superman
c9bd13d87b
Merge pull request #10448 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '15a8848c8140a1d94501df43eef06ed785903694':
9 months ago
superman
9308272b31
Merge pull request #10441 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '81e2c84143090fd48a7adb1753a104b5c04c6f65':
9 months ago
superman
81e2c84143
Merge pull request #10440 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit 'a1355f8fae8ebadbf589a3bd0847737fb31dea5e':
9 months ago
superman
a1355f8fae
Merge pull request #10438 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'b605960719e20ede2fd2e398a078a29641ee6ceb':
9 months ago
superman
15a8848c81
Merge pull request #10439 in CORE/base-third from final/11.0 to persist/11.0
...
* commit 'b605960719e20ede2fd2e398a078a29641ee6ceb':
9 months ago
superman
b605960719
Merge pull request #10437 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'ba7d125b21bcf58de2c99be856b9ba1ae717f137':
9 months ago
superman
31e39070e6
Merge pull request #10430 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '1265af8054e3fb2dc13dc6d567b3055274d09e3c':
REPORT-113277 Hibernate组件修复CVE漏洞
9 months ago
superman
1265af8054
Merge pull request #10429 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit 'faca6e0eb05465901aa767fbcd622faefa7bc7dc':
REPORT-113277 Hibernate组件修复CVE漏洞
9 months ago
superman
ba7d125b21
Merge pull request #10428 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '2f3500a47e9a41c881b15da9af8d50a487e82370':
9 months ago
lidongy-李东原
faca6e0eb0
Pull request #10426 : REPORT-113277 Hibernate组件修复CVE漏洞
...
Merge in CORE/base-third from ~LIDONGY/base-third:release/11.0 to release/11.0
* commit 'c7ba861e7fe9eccb00bbf45f0e9119190dbfb9e7':
REPORT-113277 Hibernate组件修复CVE漏洞
9 months ago
lidongy
c7ba861e7f
REPORT-113277 Hibernate组件修复CVE漏洞
9 months ago
superman
420c61b507
Merge pull request #10376 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '3263e16ea9daf59a00fc34b51cfca63f15bfc25b':
9 months ago
superman
3263e16ea9
Merge pull request #10375 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit '027fb83913754619f2cf1c85cd61ffac260dc53d':
9 months ago
superman
027fb83913
Merge pull request #10374 in CORE/base-third from final/11.0 to release/11.0
...
* commit '2f3500a47e9a41c881b15da9af8d50a487e82370':
9 months ago
superman
2f3500a47e
Merge pull request #10365 in CORE/base-third from release/11.0 to final/11.0
...
* commit '601ce2716aa8c7a8b5a1f30e0a0102d91df4f8d9':
9 months ago
superman
7ebd617f1d
Merge pull request #10355 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '0ea8be9c05f02fcb9956c40e34c859a2f10e0c50':
9 months ago
superman
0ea8be9c05
Merge pull request #10354 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit '601ce2716aa8c7a8b5a1f30e0a0102d91df4f8d9':
9 months ago
superman
601ce2716a
Merge pull request #10353 in CORE/base-third from final/11.0 to release/11.0
...
* commit '5755bcc610a5486d2496ddce01fa1713c0a7b4ba':
9 months ago
superman
5755bcc610
Merge pull request #10344 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '9e677e6809ba74b84496b451156958ae2313fbb8':
9 months ago
superman
ee7eb45c9b
Merge pull request #10332 in CORE/base-third from bugfix/11.0 to release/11.0
...
* commit 'b8f12a90faa7269d09acd5d2f884c1d18d4cca54':
10 months ago
superman
b8f12a90fa
Merge pull request #10331 in CORE/base-third from feature/x to bugfix/11.0
...
* commit '17b1af3b18eb1e4260fb239a1057ff808944565b':
10 months ago
superman
9e677e6809
Merge pull request #10330 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '1756e8b466783a2ec6baf89a1520a5efc3f1fe98':
10 months ago
superman
17b1af3b18
Merge pull request #10302 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit 'd2f5934ed562c0a36550b3ffb47f4d2c89badcce':
11 months ago
superman
d2f5934ed5
Merge pull request #10301 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit '1e0d48f962e207d6947ac3e000d3fae70271554b':
11 months ago
superman
1e0d48f962
Merge pull request #10300 in CORE/base-third from final/11.0 to release/11.0
...
* commit '1756e8b466783a2ec6baf89a1520a5efc3f1fe98':
11 months ago
superman
1756e8b466
Merge pull request #10299 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '0761475eb63115f47a79d2187cc7dfa077ccd524':
11 months ago
superman
0761475eb6
Merge pull request #10292 in CORE/base-third from final/11.0 to persist/11.0
...
* commit 'abc5e798260f1c116026fcf398f393f5cd602b21':
11 months ago
superman
bc20077d77
Merge pull request #10230 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '41ff01b07a4958bb248878b1d4f48bc745179c02':
11 months ago
superman
41ff01b07a
Merge pull request #10229 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit '51fdaa9490ba4fbdd5212da5b00ebd054491983e':
11 months ago
superman
51fdaa9490
Merge pull request #10218 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'abc5e798260f1c116026fcf398f393f5cd602b21':
11 months ago
superman
abc5e79826
Merge pull request #10210 in CORE/base-third from release/11.0 to final/11.0
...
* commit 'd2e8cd65ba2e2148b4cc5aaa7db0f6a692c64436':
11 months ago
superman
cd672c296f
Merge pull request #10159 in CORE/base-third from bugfix/11.0 to feature/x
...
* commit '126844b75064a6d071a6f732070da4da14ef777a':
11 months ago
superman
126844b750
Merge pull request #10158 in CORE/base-third from release/11.0 to bugfix/11.0
...
* commit 'd2e8cd65ba2e2148b4cc5aaa7db0f6a692c64436':
11 months ago
superman
d2e8cd65ba
Merge pull request #10157 in CORE/base-third from bugfix/11.0 to release/11.0
...
* commit '351590b529768cfdd32ba6bfecdd89793a962604':
11 months ago
superman
351590b529
Merge pull request #10156 in CORE/base-third from feature/x to bugfix/11.0
...
* commit '50cf9eef0871050ce9b28114d67876af5c286042':
11 months ago