Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

同步alibaba develop到自己的develop #1

Merged
merged 289 commits into from
Dec 7, 2019
Merged
Changes from 1 commit
Commits
Show all changes
289 commits
Select commit Hold shift + click to select a range
ba1e6a2
fix: closes #1569
loadchange Jul 20, 2019
2f1d88c
fix bug
zhaoyuguang Jul 22, 2019
b29c119
Merge commit 'd1127041cf4678b8306101f108d3d463b993a9ca' into fix-1535-1
zhaoyuguang Jul 22, 2019
3503fe2
build main
zhaoyuguang Jul 22, 2019
e259dc3
#1529
rushsky518 Jul 22, 2019
8d453e6
Fix #1591
nkorange Jul 23, 2019
425f4c0
Add unit tests for common.GroupKey and utils.MD5
EricHetti Jul 23, 2019
e5d0d66
Fix #1591
nkorange Jul 26, 2019
486ef1e
feat: support change password
wfnuser Jul 28, 2019
e45546b
upgrade the fastjson version
pbting Jul 29, 2019
0bd1f12
Merge pull request #1592 from nkorange/hotfix_data_listener_lost
nkorange Jul 29, 2019
207e546
Fix namespace vulnerability
nkorange Jul 29, 2019
74694ed
修复#1583
KeRan213539 Jul 30, 2019
364fa7e
Merge pull request #1501 from chuntaojun/fix_issue_1500
nkorange Jul 30, 2019
ad5c249
Merge pull request #1499 from chuntaojun/fix_issue_1492
nkorange Jul 30, 2019
224f223
Merge commit 'ad5c249e7c852daf4e2f7b09b9c12c432d5b3cf7' into z_wcek_1479
zhaoyuguang Jul 30, 2019
61ae002
no message
zhaoyuguang Jul 30, 2019
dea95fa
Merge pull request #1525 from ly641921791/develop
nkorange Jul 30, 2019
de49db7
Merge commit 'dea95fa11af55f3da8bc6d4cfe3e1ee8842cb9ee' into zen5
zhaoyuguang Jul 30, 2019
f69b054
编译 main.*
zhaoyuguang Jul 30, 2019
1c68568
Merge pull request #1587 from rushsky518/develop
nkorange Jul 30, 2019
e5df89f
Merge pull request #1623 from nkorange/feature_forbid_invalid_namespace
nkorange Jul 30, 2019
302de9c
Merge pull request #1578 from loadchange/issues/1569
nkorange Jul 30, 2019
b0dd759
Merge pull request #1511 from KeRan213539/multipleSelectionDeletion
nkorange Jul 30, 2019
b3e75b3
Merge branch 'develop' into #1583_bug_fix
KeRan213539 Jul 30, 2019
32c2914
Merge pull request #1544 from zhaoyuguang/z_wcek_1479
nkorange Jul 31, 2019
3d1cf6e
Merge branch 'upstream_develop' into feature_enhance_interface
pbting Jul 31, 2019
814a4b9
no message
zhaoyuguang Jul 31, 2019
0a54af1
Merge commit '32c29149590022c335d8f64c6903a82619fd1bc9' into fix-1535-1
zhaoyuguang Jul 31, 2019
ce222f1
fix build
zhaoyuguang Jul 31, 2019
b10402a
fix FE
zhaoyuguang Jul 31, 2019
ee0c469
后端支持
zhaoyuguang Jul 31, 2019
289ef2a
npm build
zhaoyuguang Jul 31, 2019
22b0ed7
fix CI
zhaoyuguang Jul 31, 2019
cc27d67
没有过滤条件直接返回原始Service列表
zhaoyuguang Aug 1, 2019
ebca677
Merge pull request #1547 from wfnuser/develop
yanlinly Aug 1, 2019
0a08be2
Merge pull request #1630 from alibaba/feature_enhance_interface
nkorange Aug 1, 2019
9b2367e
Merge pull request #1552 from nkorange/hotfix_log_optimization
nkorange Aug 1, 2019
838ef83
Merge pull request #1534 from zhaoyuguang/zen3
nkorange Aug 1, 2019
f600766
add refresh memory
zhaoyuguang Aug 1, 2019
20c73a1
remove unness const
zhaoyuguang Aug 1, 2019
a5b6749
Merge commit '838ef83f9f19d25a9f29c808d77d7ea4a6854ee2' into fix-1535-1
zhaoyuguang Aug 1, 2019
50fb50e
no message
zhaoyuguang Aug 1, 2019
2be8483
Merge pull request #1633 from zhaoyuguang/fix-ci
nkorange Aug 1, 2019
9745e87
clear code
zhaoyuguang Aug 1, 2019
bf3e822
Merge pull request #1576 from zhaoyuguang/fix-1535-1
nkorange Aug 1, 2019
df82ed3
build console
nkorange Aug 1, 2019
87850d4
Merge commit 'df82ed3c296b12c3731badc40b1f881e5f1c183b' into zen5
zhaoyuguang Aug 1, 2019
8d2711a
revert error code
zhaoyuguang Aug 1, 2019
d9d79dd
Remove unnecessary code
zhaoyuguang Aug 1, 2019
408b363
Delete the code that caused the list multi-element
zhaoyuguang Aug 1, 2019
6a9b414
fix bug
zhaoyuguang Aug 1, 2019
3085bcf
Unified constant use
zhaoyuguang Aug 1, 2019
6ecabd7
reverse `Service Name` and `Group Name`
zhaoyuguang Aug 1, 2019
d6c5a76
Fix bug
nkorange Aug 2, 2019
11bd0cc
Update version to 1.1.2-SNAPSHOT
nkorange Aug 2, 2019
fdcd2f3
fix: font privatization
loadchange Aug 5, 2019
25a87a8
Subject to the actual startup context path
pbting Aug 6, 2019
da8e09f
if not set the context path with the WebServerInitializedEvent then r…
pbting Aug 6, 2019
e08e6b2
Merge pull request #1648 from loadchange/font-privatization
nkorange Aug 6, 2019
19a5ac6
RunningConfig support get from spring.properties configuration file
pbting Aug 6, 2019
15c913e
Update version to 1.1.2
nkorange Aug 6, 2019
6ca2ee0
Update version to 1.1.3
nkorange Aug 6, 2019
934c423
Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
ThomasPerkins1123 Aug 6, 2019
6920baf
Merge pull request #1655 from alibaba/develop
nkorange Aug 7, 2019
48ff738
Use dynamic server version
nkorange Aug 8, 2019
f09909c
1. Optimize log printing
pbting Aug 9, 2019
6496ae5
support datum is null case
pbting Aug 9, 2019
68f170c
repair httpGetLarge#httpGetLarge will call entity.getContentType().ge…
pbting Aug 9, 2019
7c5b002
Normalize http response entity with ResponseEntity by spring
pbting Aug 9, 2019
e2bd586
Merge pull request #1 from alibaba/master
stackisok Aug 13, 2019
e981f3f
feat:
chuntaojun Aug 13, 2019
2802247
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
chuntaojun Aug 13, 2019
be7237e
merge upstream develop the latest code
pbting Aug 15, 2019
5222b9c
cluster conf support multi instance inline seperator with ','
pbting Aug 16, 2019
3bd5dcb
add comma division with some case to use
pbting Aug 16, 2019
a6deeb1
add comma division with some case to use
pbting Aug 16, 2019
caf0130
add comma division with some case to use
pbting Aug 16, 2019
ce66b46
resolve conflict
pbting Aug 16, 2019
210f77e
fix: fix #1733
EZLippi Aug 21, 2019
571389e
Merge branch 'develop' into zen5
zhaoyuguang Aug 21, 2019
d3fd616
页面修复
zhaoyuguang Aug 21, 2019
5b3690b
use API to create param
zhaoyuguang Aug 22, 2019
ea924e8
use API to create param
zhaoyuguang Aug 22, 2019
756095d
Merge pull request #1543 from zhaoyuguang/zen5
nkorange Aug 22, 2019
3b47673
[ISSUE] #1671 Unified request header "Client-Version"
ly641921791 Aug 22, 2019
11b1d51
Merge remote-tracking branch 'upstream/develop' into issue_1671
ly641921791 Aug 22, 2019
5d428a2
[ISSUE] #1671 Unified request header "Client-Version"
ly641921791 Aug 22, 2019
a1da8c1
:bug: remove server.contextPath
xkcoding Aug 23, 2019
4625daa
Merge pull request #2 from alibaba/develop
stackisok Aug 23, 2019
2d4667a
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
chuntaojun Aug 23, 2019
3c91045
Update service description error in Open API Guide
finalcola Aug 23, 2019
f6da60e
fix: fix #1665
EZLippi Aug 24, 2019
bbad9d6
fix #1764.
beldon Aug 25, 2019
721c5a4
Compatible with older versions
ly641921791 Aug 27, 2019
17ab94d
Merge branch 'develop' into feature_enhance_interface
pbting Aug 28, 2019
1fd5ee3
[Issue] #1769 Solve the bug of the clone configuration function
ly641921791 Aug 28, 2019
4459dc7
Fix #1764
nkorange Aug 30, 2019
548354e
Merge branch 'develop' into develop
nkorange Aug 30, 2019
5f99072
Merge pull request #1765 from beldon/develop
nkorange Aug 30, 2019
0808d0c
Merge pull request #1754 from xkcoding/develop
nkorange Aug 30, 2019
59a36f9
[Issue] #1769 Solve the bug of the clone configuration function
ly641921791 Aug 30, 2019
815a339
Merge remote-tracking branch 'upstream/develop' into issue_1769
ly641921791 Aug 31, 2019
40be568
[Issue] #1769 Solve the bug of the clone configuration function
ly641921791 Aug 31, 2019
519c2c0
fix: closes #1759
loadchange Sep 2, 2019
9651284
Merge pull request #3 from alibaba/develop
stackisok Sep 4, 2019
473381b
fixed(cluster): fixed raft cluster state
universefeeler Sep 4, 2019
663296f
chore(cluster): delete no used note
universefeeler Sep 4, 2019
d1cc240
Merge pull request #1776 from ly641921791/issue_1769
nkorange Sep 6, 2019
b2504fd
#1507 close server from current dir
rushsky518 Sep 6, 2019
46bcece
repair speel error and add debug log
pbting Sep 6, 2019
5e7be63
Merge branch 'feature_enhance_interface' of https://github.com/alibab…
pbting Sep 6, 2019
95b92b0
Fix #1621
nkorange Sep 6, 2019
2431eda
Merge branch 'develop' into feature_enhance_interface
pbting Sep 6, 2019
1f1392b
fix #1609
pbting Sep 6, 2019
d2383e6
Merge branch 'feature_enhance_interface' of https://github.com/alibab…
pbting Sep 6, 2019
56c439e
fix #1609
pbting Sep 6, 2019
04af15e
Merge pull request #1736 from EZLippi/develop
nkorange Sep 6, 2019
3196bde
Merge pull request #1813 from rushsky518/single_shutdown
nkorange Sep 6, 2019
ad54059
Merge pull request #1760 from finalcola/fix1652
nkorange Sep 6, 2019
29a0138
Merge pull request #1752 from ly641921791/issue_1671
nkorange Sep 6, 2019
8162533
Make error information more specifically
stackisok Sep 6, 2019
1ecd5f3
Merge branch 'develop' into feature_enhance_interface
pbting Sep 6, 2019
e5f6cab
Merge pull request #1699 from alibaba/feature_enhance_interface
nkorange Sep 9, 2019
7f0bcaa
feature(triggerFlag): add triggerFlag for service
universefeeler Sep 9, 2019
5681ca3
feture(triggerFlag): add frontend show triggerFlag
universefeeler Sep 9, 2019
d3b586b
Merge pull request #4 from alibaba/develop
stackisok Sep 9, 2019
13e5096
style: Modifiers should be declared in the correct order;Map init 设置大…
xianlaioy Sep 9, 2019
7b5c6e9
style: Modifiers should be declared in the correct order;Map init 设置大…
xianlaioy Sep 9, 2019
08e69a0
refactor: 局部变量是线程安全的;
xianlaioy Sep 9, 2019
935918e
improve(triggerFlag): add pre check for triggerFlag
universefeeler Sep 9, 2019
4e6d8b6
refactor: IO改成try resource。instanceList循环直接改成addAll
xianlaioy Sep 9, 2019
f95215f
chore(triggerFlag): adjust some details
universefeeler Sep 9, 2019
06530aa
Merge pull request #1832 from xianlaioy/develop
nkorange Sep 10, 2019
54ae846
improve(instanceHealth): add update logic
universefeeler Sep 10, 2019
1a2a02a
Merge pull request #1831 from stackisok/master
nkorange Sep 10, 2019
8c47619
feat:
chuntaojun Sep 11, 2019
5074d06
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
chuntaojun Sep 11, 2019
1e9fefc
Merge pull request #1828 from universefeeler/fixed_cluster_page_bug
nkorange Sep 17, 2019
117eb66
Merge pull request #1792 from loadchange/issues/1759
nkorange Sep 17, 2019
e24a75c
Merge pull request #1822 from EZLippi/hotfix/fix1665
nkorange Sep 17, 2019
4ed7aa3
Avoiding conflicted for creating directory.
stackisok Sep 17, 2019
0f3c9f3
improve(triggerFlag): adjust triggerFlag calculation chance
universefeeler Sep 17, 2019
83aa8e2
clean controllers code
beldon Sep 17, 2019
c0a6adc
chore(reiggerFlag): delete unused function
universefeeler Sep 18, 2019
977e2f7
Merge remote-tracking branch 'upstream/develop' into develop
beldon Sep 18, 2019
514ae80
merge
beldon Sep 18, 2019
caba884
Merge pull request #1624 from KeRan213539/#1583_bug_fix
nkorange Sep 19, 2019
5bc80b9
Merge branch 'master' into add-diffblue-tests-2
nkorange Sep 19, 2019
4b1a65c
Merge pull request #1659 from Diffblue-benchmarks/add-GroupKey-tests
nkorange Sep 19, 2019
0f82e0d
Merge pull request #1594 from Diffblue-benchmarks/add-diffblue-tests-2
nkorange Sep 19, 2019
5413402
improve(triggerFlag): improve instance health flag
universefeeler Sep 19, 2019
43d44d0
Merge pull request #1836 from universefeeler/improve_instance_health_…
nkorange Sep 20, 2019
9cf3f57
Add synchronized when add/remove instance
nkorange Sep 21, 2019
0b66b0c
Update jackson version, see https://nvd.nist.gov/vuln/detail/CVE-2019…
nkorange Sep 24, 2019
6b7b894
Fix #1874
nkorange Sep 25, 2019
f0c1985
#1873, set default server expire timeout to 10 seconds and configurable.
nkorange Sep 25, 2019
71ce4da
fix bug #1775
freekry Aug 30, 2019
4f85dc0
build fe
loadchange Sep 25, 2019
221d81d
Clean up redundant StringUtils
ly641921791 Sep 25, 2019
63d044c
bug fix 1841
brucelwl Sep 27, 2019
db8015f
Merge pull request #1888 from brucelwl/develop
xuechaos Sep 30, 2019
299c533
fix #1916
satjd Oct 11, 2019
395b20c
Bump netty-all from 4.0.42.Final to 4.1.42.Final
dependabot[bot] Oct 12, 2019
2c350ac
Merge pull request #1927 from alibaba/dependabot/maven/io.netty-netty…
nkorange Oct 12, 2019
d33b5a0
#1409 Introduce MCP server
nkorange Oct 14, 2019
584d73b
#1409 gRPC server tuned OK.
nkorange Oct 15, 2019
13d8258
#1409 Update from Nacos
nkorange Oct 15, 2019
21e7bcd
#1409 Fix PMD
nkorange Oct 15, 2019
45ca16f
Merge pull request #1919 from satjd/bugfix-#1916
nkorange Oct 15, 2019
f2021a5
Fix #1906
nkorange Oct 15, 2019
5939cec
fix the getting subscribers error
Nicholas2015 Oct 17, 2019
8ae4890
Merge pull request #1944 from Nicholas2015/hotfix_get_subscribers_1878
nkorange Oct 18, 2019
d248bc9
Support unique instance index for each registered server
vettalwu Oct 18, 2019
4a30210
Merge pull request #1879 from ly641921791/clean_code
nkorange Oct 21, 2019
fcf62bb
Merge branch 'develop' into feature_mcp
nkorange Oct 21, 2019
86e2f4a
创建字符串不需要带入双引号,否则调用时会报Error:Unable access jarfile
Veryfirefly Oct 21, 2019
07d08b3
Support snowflake instance id generator
vettalwu Oct 21, 2019
124bf07
Fix test case error.
nkorange Oct 21, 2019
927e8d6
Merge remote-tracking branch 'upstream/develop' into develop
beldon Oct 21, 2019
92fcfce
clean code
beldon Oct 21, 2019
3e03462
fix the CI errors
beldon Oct 21, 2019
85a9545
remove the useless code that make ci errors
beldon Oct 21, 2019
6807545
Merge pull request #1946 from vettal-wu/feature/support-unique-instan…
nkorange Oct 22, 2019
f54785c
Merge branch 'develop' into develop
nkorange Oct 22, 2019
36a555d
Merge pull request #1859 from beldon/develop
nkorange Oct 22, 2019
225f0ca
Fix findbugs
nkorange Oct 22, 2019
4c5d424
Add switch to turn on/off MCP server
nkorange Oct 22, 2019
3f68ce0
Merge pull request #1953 from nkorange/feature_mcp
nkorange Oct 22, 2019
2587fa1
Merge pull request #1955 from Veryfirefly/develop
nkorange Oct 24, 2019
4d68565
Update version to 1.1.4
nkorange Oct 24, 2019
c52b6e3
Merge pull request #1964 from alibaba/develop
nkorange Oct 24, 2019
c8b88e6
issues:调用修改实例接口,未传的参数值会被清空
Oct 25, 2019
be99def
Change MCP service port to 8848
nkorange Oct 26, 2019
f4f90a0
Fix add metadata method NPE.
nkorange Oct 29, 2019
5caa573
Fix PMD
nkorange Oct 30, 2019
4424af2
Merge branch 'develop' into master
nkorange Oct 30, 2019
1054a99
Merge pull request #1844 from stackisok/master
nkorange Oct 30, 2019
92bbf9e
fix #1947
nkorange Oct 31, 2019
f57a3d8
#1947 add test cases.
nkorange Nov 4, 2019
96f81e0
issues:调用修改实例接口,未传的参数值会被清空
Nov 4, 2019
e8691ac
issues:调用修改实例接口,未传的参数值会被清空
Nov 4, 2019
7956acb
[#2006] change to throw NacosException to make client handle the righ…
Albert-Hugo Nov 4, 2019
7968dbb
make RequestVote RPC handler thread-safe
satjd Nov 5, 2019
7582de9
Modify the string splicing method of getgroupedname()
ZhZGod Nov 6, 2019
c4fb9e7
Remove debug option in startup script
nkorange Nov 6, 2019
595f436
Merge pull request #2008 from nkorange/hotfix_inet_addr_null
nkorange Nov 6, 2019
0212de8
fix #2000
nkorange Nov 6, 2019
8ef3fd9
Merge remote-tracking branch 'upstream/develop' into develop
nkorange Nov 6, 2019
c431a85
#2018 Close inpuststream instead of connection.
nkorange Nov 7, 2019
43a30d3
Merge pull request #2027 from nkorange/hotfix_connection_reuse
nkorange Nov 7, 2019
8c104bc
Merge pull request #2009 from Albert-Hugo/hotfix_2006
nkorange Nov 7, 2019
6176360
Merge pull request #1971 from sheiy/develop
nkorange Nov 7, 2019
5cd905c
Merge pull request #2012 from satjd/issue1994
nkorange Nov 7, 2019
d019045
Merge pull request #2013 from ZhZGod/feature-string-append
nkorange Nov 7, 2019
b9c3b54
fix #1842
nkorange Nov 10, 2019
d034412
fix #1858
nkorange Nov 11, 2019
b3781ad
Merge pull request #2044 from nkorange/feature_stop_update_task_after…
nkorange Nov 11, 2019
3a4de81
Fix client beat task executing when health check is disabled.
nkorange Nov 11, 2019
23ddb69
refactor(client/config): increase the client's read timeout
Nov 12, 2019
89b2d00
refactor(client/config): update timeout compute
chuntaojun Nov 12, 2019
bf2eb6c
fix startup for java 11
zhfish Nov 13, 2019
8fbe018
remvoe classpath
zhfish Nov 13, 2019
a026820
Bump jackson-databind from 2.9.10 to 2.9.10.1
dependabot[bot] Nov 13, 2019
fcf1a20
Merge pull request #7 from alibaba/master
KeRan213539 Nov 14, 2019
1f7e4f6
Merge pull request #2058 from alibaba/dependabot/maven/com.fasterxml.…
nkorange Nov 14, 2019
3f1150f
Merge branch 'develop' into fix-startup-for-java-11
nkorange Nov 14, 2019
57c5291
Merge pull request #2057 from zhfish/fix-startup-for-java-11
nkorange Nov 14, 2019
bad3501
Merge pull request #2049 from chuntaojun/fix_config_longPoll_readTimeout
nkorange Nov 14, 2019
36a5259
add toUpperCase
MistRay Nov 14, 2019
ec6e52e
optimize: the Boolean.parseBoolean(String s) method should be used wh…
EZKAYOTWJPRKXWCUYEEB Nov 21, 2019
31a59e8
fix 2025
huangdx0726 Nov 21, 2019
5ac8a56
fix default value of database field
huangdx0726 Nov 21, 2019
6bee81f
Merge pull request #2086 from huangdx0726/develop
nkorange Nov 22, 2019
3b19a30
Merge pull request #2085 from lzf971107/a_1
nkorange Nov 25, 2019
6bb0e4b
add client context path config
Nov 25, 2019
880644e
Merge pull request #2087 from huangdx0726/fix1627
nkorange Nov 25, 2019
00cb9d0
Merge pull request #2102 from lcosmos/develop
nkorange Nov 25, 2019
dd9b687
修复 #2098
KeRan213539 Nov 25, 2019
a70950c
Merge pull request #2105 from KeRan213539/#2098_bug_fix
nkorange Nov 25, 2019
a219dbe
Merge pull request #2061 from MistRay/develop
nkorange Nov 25, 2019
c75b952
add nacos console cors
xilipilige Nov 27, 2019
20c75f3
format code
xilipilige Nov 27, 2019
b7f2c62
Merge pull request #2116 from xilipilige/feature_console_cors
nkorange Nov 28, 2019
2781c6c
Update version to 1.2.0-SNAPSHOT
nkorange Dec 2, 2019
d150d97
Fix close connection exception.
nkorange Dec 4, 2019
38590d0
Fix #2123
nkorange Dec 6, 2019
38644f5
Fix #2020
nkorange Dec 6, 2019
a32a4f7
Fix #2123
nkorange Dec 6, 2019
7fab1e1
Merge pull request #2153 from nkorange/client_beat_optimize
JianweiWang Dec 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style: Modifiers should be declared in the correct order;Map init 设置大…
…小 避免扩容;
xianlaioy committed Sep 9, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 13e509679db051f3bfd1d662b4d0dbcc8e67cd95
Original file line number Diff line number Diff line change
@@ -24,16 +24,17 @@
*/
@SuppressWarnings("PMD.AbstractClassShouldStartWithAbstractNamingRule")
public abstract class AbstractSharedListener implements Listener {

private volatile String dataId;
private volatile String group;

final public void fillContext(String dataId, String group) {
public final void fillContext(String dataId, String group) {
this.dataId = dataId;
this.group = group;
}

@Override
final public void receiveConfigInfo(String configInfo) {
public final void receiveConfigInfo(String configInfo) {
innerReceive(dataId, group, configInfo);
}

Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@
*/
public class ApplicationInfo {

private static final long LOCK_EXPIRE_DURATION = 30 * 1000;
private static final long RECENTLY_DURATION = 24 * 60 * 60 * 1000;
private static final long LOCK_EXPIRE_DURATION = 30 * 1000L;
private static final long RECENTLY_DURATION = 24 * 60 * 60 * 1000L;

private String appName;

Original file line number Diff line number Diff line change
@@ -37,10 +37,12 @@
@Service
public class AggrWhitelist {

public static final String AGGRIDS_METADATA = "com.alibaba.nacos.metadata.aggrIDs";

/**
* 判断指定的dataId是否在聚合dataId白名单。
*/
static public boolean isAggrDataId(String dataId) {
public static boolean isAggrDataId(String dataId) {
if (null == dataId) {
throw new IllegalArgumentException();
}
@@ -56,7 +58,7 @@ static public boolean isAggrDataId(String dataId) {
/**
* 传入内容,重新加载聚合白名单
*/
static public void load(String content) {
public static void load(String content) {
if (StringUtils.isBlank(content)) {
fatalLog.error("aggr dataId whitelist is blank.");
return;
@@ -83,14 +85,12 @@ static void compile(List<String> whitelist) {
AGGR_DATAID_WHITELIST.set(list);
}

static public List<Pattern> getWhiteList() {
public static List<Pattern> getWhiteList() {
return AGGR_DATAID_WHITELIST.get();
}

// =======================

static public final String AGGRIDS_METADATA = "com.alibaba.nacos.metadata.aggrIDs";

static final AtomicReference<List<Pattern>> AGGR_DATAID_WHITELIST = new AtomicReference<List<Pattern>>(
new ArrayList<Pattern>());
}
Original file line number Diff line number Diff line change
@@ -16,10 +16,9 @@
package com.alibaba.nacos.config.server.utils;

import com.alibaba.nacos.config.server.constant.Constants;

import com.google.common.collect.Maps;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;

@@ -31,10 +30,10 @@
@SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
public class MD5 {
private static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
private final static int DIGITS_COUNT = 16;
private final static int DIGITS_CHAR_SIZE = 32;
private static final int DIGITS_COUNT = 16;
private static final int DIGITS_CHAR_SIZE = 32;

private static Map<Character, Integer> rDigits = new HashMap<Character, Integer>(16);
private static Map<Character, Integer> rDigits = Maps.newHashMapWithExpectedSize(16)

static {
for (int i = 0; i < digits.length; ++i) {