Commit Graph

57 Commits

Author SHA1 Message Date
杨翊 SionYang
e26dc2fb23
Merge pull request #10277 from alibaba/develop#10153
Develop#10153
2023-04-06 17:25:18 +08:00
varyuan
2dde125a51
clean code (#10180)
* clean code

* clean code

* clean code

* clean code
2023-03-29 14:25:22 +08:00
杨翊 SionYang
5fffde5bde
[ISSUE#10153] Add auth state into /state api and add announcement api. (#10203)
* Add ModuleState and use ModuleState replace ServerStateController.

* Add AuthModuleStateBuilder

* state接口使用ModuleState.

* Add announcement api.

* skip rat scan for announcement.conf

* default plugin open login page when auth.enabled=true.
2023-03-27 19:00:22 +08:00
云野
68b8e61c1d
[ISSUE #10093]add unit tests for DiskUtils. (#10094)
* add unit tests for DiskUtils.
add unit tests for InetUtils.
add unit tests for MethodUtil.

* add unit tests for DiskUtils.
add unit tests for InetUtils.
add unit tests for MethodUtil.
2023-03-21 14:08:30 +08:00
githubcheng2978
214e0c9077
nacos grpc connection supports TLS Encryption (#9980)
support tls encryption on grpc transport on client and server side

---------

Co-authored-by: githubcheng2978 <yeliang.cheng@freemud.com>
2023-03-15 09:41:25 +08:00
WangLiang/王良
a397c10a54
Optimize the nacos-client/pom.xml for exclude google/**/*.proto (#9982)
* Optimize the pom.xml of the nacos-client

* optimize pom

* exclude `google/**/*.proto`

* tab

* Remove dependency `io.grpc:protoc-gen-grpc-java:${version}:pom`

* revert indent

* revert native-image
2023-03-01 09:42:15 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
Karson
44e723b027
[ISSUE #9603] Catch ClosedWatchServiceException after exit normally. (#9604)
* fix issue #9603

* judge interrupted
2022-11-22 09:44:26 +08:00
hth
898cbb18d4
move custom db pwd plugin to nacos-group and specification plugin name (#9480) 2022-11-07 17:09:13 +08:00
hth
5ea747b863
[ISSUE #8619] add CustomEnvironmentPlugin (#8619) (#9296)
* [ISSUE #8619] add CustomEnvironmentPlugin (#8619)

* feature issue #8619 .

* custom properties.

* reformat codes and author fix

* remove customEnvironment to nacos-core and Complete test

* add license

* pmd fix

* code optimization

* conflict fix
2022-11-04 15:24:25 +08:00
Weizhan Yun
506bc26f4d
[ISSUE #9393] 设置线程为守护线程,保证在main线程推出时应用程序能过正常关闭。 (#9396)
* 设置线程为守护线程,保证在main线程退出时应用程序能过正常关闭。

* graceful shutdown naming executetask engine.
2022-11-03 13:44:00 +08:00
杨翊 SionYang
7a23c56822
[ISSUE#7930] 2.2.0 remove some deprecated codes (#9368)
* Remove double write switch and upgrade from 1.X switch.

* Remove IFilterConfig.java

* Remove some deprecated constants and methods

* Remove some deprecated classes in nacos-core

* Remove some deprecated config

* Remove some deprecated codes in naming module

* Remove some deprecated codes in sys module

* Fix unit test

* Try to make UdpConnectorTest pass more easier.
2022-10-21 17:44:26 +08:00
onewe
cbda95d014
[ISSUE #8515] Optimize some code in InetUtils (#8522)
* [ISSUE #8515] auto refresh ip address

Close #8515

* [ISSUE #8515] add the unit test

Close #8515

* [ISSUE #8515] clean system variable after unit test done

Close #8515

* [ISSUE #8515] add tearDown method for the unit test

- reformat by nacos-style

* [ISSUE #8515] fix ci error

* [ISSUE #8515] fix ci error

* [ISSUE #8515] fix ci error
2022-06-20 10:23:59 +08:00
david6969xin
3a37290a01
[ISSUE#8358] make this anonymous inner class a lambda (sys module) (#8385) 2022-05-18 10:51:14 +08:00
yanhom
d89076b3e6
Support for ibm J9 (#8325)
* support for ibm J9

* format code, add newline at end of file

* format code

* use nacos code style format codes
2022-05-13 11:03:01 +08:00
liqipeng
f0104c0ea0
[ISSUE #8144] add volatile modifier to ServerListManager.serversFromEndpoint(2.x) (#8146)
* add volatile modifier to `ServerListManager.serversFromEndpoint`

* optimize `onReceiveChecksums` in race condition

* judge responsible server in same localAddress; add `volatile` modifier for `EnvUtil.localAddress`
2022-04-18 11:33:08 +08:00
杨翊 SionYang
26ef77378c
For #7930. Default close support upgrade from 1.X feature. (#8016)
* For #7930. Default close support upgrade from 1.X feature(double write and old raft).

* Fix use still use old raft when close upgrade feature.

* UpgradeJudgement subscribe member change event only open upgrade feature.
2022-03-28 14:15:18 +08:00
KomachiSion
9020bb9d6e Move plugin config to nacos-auth-plugin-impl module. 2022-01-26 11:54:52 +08:00
ZZQ的
12a9bfb3c8
[ISSUE #6314] Remove common-lang3 from pom.xml (#6334) 2021-07-13 09:32:15 +08:00
ZZQ的
721061a4db
[ISSUE #6302] replace common-lang3 (#6313) 2021-07-12 09:27:03 +08:00
孙继峰
f36556657f
[ISSUE #6197] Use java.util.Objects instead of com.alibaba.nacos.common.utils.Objects (#6218) 2021-07-01 11:32:34 +08:00
brotherlu-xcq
9ab1d62a06
[code quality] [nacos-sys] [env/file] the constants export, redundant symbol remove (#5907) 2021-06-01 11:07:05 +08:00
孙继峰
15c71831e7
[ISSUE #5765] fix localhost not match ip (#5852)
* rename IPUitl to InternetAddressUtil

* move isDomain to InternetAddressUtil

* [ISSUE #5765] fix localhost not match ip

* fix typo

* delete the verification IP, follow the single responsibility principle
2021-05-27 19:01:39 +08:00
孙继峰
ea47adc124
[issue #5765] fix localhost not match ip (#5787) 2021-05-21 11:02:04 +08:00
KomachiSion
cf5a171ac5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	NOTICE
#	api/pom.xml
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
#	naming/src/test/java/com/alibaba/nacos/naming/consistency/persistent/impl/NamingSnapshotOperationTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskTest.java
#	pom.xml
#	test/src/test/java/com/alibaba/nacos/test/core/JacksonUtils.java
2021-05-14 11:04:52 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +08:00
wql
a713203c66
IPv6 and IPv4 check rules are optimized. splitIPPortStr method adds IPv4 check, and the optimized method does not affect the startup of container environment (#5514)
* The IPv6 judgment logic in this method will obtain IP address according to the host. In the container environment, K8S has not allocated IP to this pod, and then the judgment will report an error. After finding this problem, I gave feedback to remove the IPv4 judgment, but this problem still exists in IPv6. Suggested to remove the verification logic can be in other ways to optimize.

* Revert "The IPv6 judgment logic in this method will obtain IP address according to the host. In the container environment, K8S has not allocated IP to this pod, and then the judgment will report an error. After finding this problem, I gave feedback to remove the IPv4 judgment, but this problem still exists in IPv6. Suggested to remove the verification logic can be in other ways to optimize."

This reverts commit a112e52

* Both IPv4 and IPv6 validation rules adopt regular validation. In order to prevent the container from adding domain name rule validation in the case of domain name resolution deployment, the logic of removing Chinese slogan should be added before the rule validation in IPv6.

* Optimize and add licenses according to Ali's protocol

* The isDomain method is changed to validate only rules

* Format to optimize
2021-04-30 09:14:08 +08:00
KomachiSion
92da848375 Merge remote-tracking branch 'upstream/develop' into merge-1.X-to-2.0
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/PushReceiver.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/SubscribeManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/BaseTest.java
2021-04-27 15:57:24 +08:00
杨翊 SionYang
5fa05aef52
Upgrade dependency version to fix security alert (#5506) 2021-04-27 15:16:54 +08:00
杨翊 SionYang
73eea9c0bb
Use ThreadUtil and EnvUtil replace Runtime.availableProcessor (#5388) 2021-04-16 17:32:14 +08:00
KomachiSion
fd06b5a7b6 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	address/pom.xml
#	api/pom.xml
#	auth/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	consistency/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	istio/pom.xml
#	naming/pom.xml
#	pom.xml
#	sys/pom.xml
#	test/pom.xml
2021-01-18 10:32:57 +08:00
杨翊 SionYang
1bd67269cd
Use revision to set version and upgrade to 1.4.2-SNAPSHOT (#4711)
* Use revision set version

* Use revision set version

* Add flatten plugin
2021-01-15 14:37:47 +08:00
杨翊 SionYang
67eb36976e
Upgrade to 1.4.1 (#4695) 2021-01-14 11:36:57 +08:00
nov.lzf
6027d36222
client use same executor during different connection;metrics count bugfix.;recommend server check (#4659)
* client use same executor during different connection.

* metrics count bugfix.

* recommend server check

* remove rsocket ;add client metrics

* add client metrics to get cache value

* rpc tps control basic api submit.

* check style ,pmd fix.
2021-01-11 14:11:32 +08:00
KomachiSion
bdacd0958d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-develop
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
2020-12-31 11:48:52 +08:00
paderlol
903ff0f546
Fix the configuration file loading issue #4556 #4541 (#4590) 2020-12-29 09:52:07 +08:00
haoyann
b25b23e5f5 fix NOW_WATCH_JOB_CNT record WatchDirJob count 2020-12-13 19:51:33 +08:00
杨翊 SionYang
93a3ac7816
Upgrade to 2.0.0-ALPHA.1 (#4410)
* Add some new server config parameters

* Upgrade to 2.0.0-ALPHA.1
2020-12-04 18:46:24 +08:00
赵延
1e39f39a91
when deleteFile, just check the file is exists. (#4402) 2020-12-04 09:12:54 +08:00
KomachiSion
d6fcac85c5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/result/ResultBuilder.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
#	sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
2020-12-03 18:41:41 +08:00
杨翊 SionYang
8f009b30bd
Add metadata dump and load jraft snapshot (#4367)
* Metadata support dump and load raft snapshot

* Fix metadata serialize error for hessian

* For checkstyle
2020-11-30 19:14:12 +08:00
赵延
dc266b03bc
[ISSUE-#4258] Fix wrong path when -Dspring.config.location not set (#4259)
* fix spring.config.location is nullapplication.properties when -Dspring.config.location is not set in env

* fix wrong path when -Dspring.config.location not set

* modify default file resource method name

* fix "/" magic value

* change the way of get file

* not judge pathSplit by self, use Paths.get(a, b);

* when spring.config.location is not set, use {nacos.home}/conf/application.properties to cover it.

* refactor code

* code quality enhance

* just use two level to load conf. {spring.config.location}/application.properties -> classpath:/application.properties

* code clean
2020-11-25 17:02:21 +08:00
赵延
a3597de1bc
remove env operation code in ApplicationUtils (#4298) 2020-11-23 13:44:28 +08:00
赵延
886715b2d7
[ISSUE-#4232] Use EnvUtil to replace ApplicationUtils about env operation (#4281)
* use EnvUtil to replace ApplicationUtils about env operation

* remove unuse import

* remove unuse import

* remove profile usage
2020-11-21 06:54:05 +08:00
KomachiSion
e56eb3680c Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	api/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	client/src/test/java/com/alibaba/nacos/client/naming/core/HostReactorTest.java
#	common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
#	pom.xml
2020-11-20 17:13:49 +08:00
赵延
44641d9431
fix twice invoke and the value is not same. (#4271) 2020-11-20 09:16:19 +08:00
赵延
7c30c4ea96 fix always load property when the contextPath is '/' 2020-11-19 12:27:59 +08:00
liaochuntao
c183b77db4
[ISSUE #4090] Configuration file changes do not take effect (#4188)
* fix: fix issue #4090

* fix: fixed an issue where profile updates did not take effect
2020-11-14 14:14:14 +08:00
nov.lzf
70d976db18
更新版本;集群整体重新负载均衡功能;变更推送内容;推送SLA日志;常量池改造;启动时长链接优化;删除rpc digest 日志 (#4217)
* listen context bugfix.

* 更新版本;集群整体重新负载均衡功能;变更推送内容;推送SLA日志;常量池改造;启动时长链接优化;删除rpc digest 日志
2020-11-12 18:03:07 +08:00
Gagharv
7baa696983
[ISSUE-#4181] fix url replace logic error,adjust the getContextPath logic (#4203) 2020-11-11 21:25:12 +08:00