zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,760 Commits 2 Branches 3 Tags 58 MiB
c0fb69bdb3
Commit Graph

629 Commits

Author SHA1 Message Date
brotherlu-xcq
5f87992321
[code quality] [nacos-config] [controller] add mission @Override, return first, reduce the if/for nest. (#5732) 2021-05-17 09:53:35 +08:00
brotherlu-xcq
26bbf08f2f
[code quality] [nacos-config] [controller] translate the Chinese log to English, the if condition nest optimized, return result optimized. (#5731) 2021-05-17 09:51:54 +08:00
brotherlu-xcq
b24d97c70b
[code quality] [nacos-config] [aspect] translate the Chinese log to English (#5730) 2021-05-17 09:50:11 +08:00
brotherlu-xcq
efd5af6dcb
improve the code quality of nacos-config [auth] (#5729) 2021-05-17 09:49:35 +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
brotherlu-xcq
c756da3c88
Change the invalid compare in NotifySingleService (#5587) 
* optimize the compare in NotifySingleService.java

* delete the unused method setupNotifyExecutors
 2021-05-14 09:37:03 +08:00
xiaoheng1
5386096b1d
Deal with the concurrency of ClientLongPolling and DataChangeTask about allSubs (#5561) 
* fix #5560 Deal with the concurrency of ClientLongPolling and DataChangeTask about allSubs

* add log to default log.
 2021-05-11 15:25:39 +08:00
plusmancn
7e57b90160
[ISSUE #3548] The srcUser fills with username when auth is disabled (console case) (#5566) 
* feat: srcUser fills with username (console case)

* fix: code sytle of Constants.java

* fix: code style of the remaining files

* fix: the back button of HistoryDetail.js won't work

* fix: change '源 IP' to '来源 IP'

* fix: undo changes of goList
 2021-05-10 20:41:35 +08:00
xiaoheng1
e0a9ecb976
fix #5583 Modify the Chinese log in CapacityController (#5584) 2021-05-10 11:24:16 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +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
brothelul
b148d4b503
fix the press F1 to full screen issue (#5505) 2021-04-27 14:07:12 +08:00
Cherish 蔡
e0fe828542
[ISSUE #5437]: change dump-task taskKey (#5440) 
* feat(fix-#5437): change dump-task taskKey

* feat(fix-#5437): Handle CI issues and add doc comments.
 2021-04-22 11:27:08 +08:00
赵延
b746b47100
when peer is null, set isOpenService = false directly. (#5428) 2021-04-21 09:33:30 +08:00
haoyann
394230309d
[ISSUE #4602]add new version config export feat (#5345) 
* add new version config export feat

* add new export button

* fix ci

* fix magical value

* add YamlParserConstructor
parse config reduce loop

* fix ci
 2021-04-16 10:39:55 +08:00
KomachiSion
51cc2b1b4b Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# 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/test/java/com/alibaba/nacos/client/config/common/GroupKeyTest.java
#	common/src/test/resources/META-INF/services/com.alibaba.nacos.common.spi.SpiTestInterface
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	istio/src/main/java/com/alibaba/nacos/istio/mcp/NacosMcpService.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ApiController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2021-04-13 14:28:30 +08:00
杨翊 SionYang
e689c1a3a1
Remove blocked thread for Protocol metadata (#5354) 2021-04-13 14:12:19 +08:00
Wu Zhiguo
9bcb901174
Fix some typo (#5260) 
* fix some typo

* rollback some comment format
 2021-04-03 12:57:57 +08:00
mai.jh
9cdfd9599d
[ISSUE-#5182] Remove ConfigController#removeRequestContext method. (#5201) 
* fix #5182, After some discussion, 2.0 adopted a long connection approach and decided to remove RemoveRequest Context

* fix #5182, After some discussion, 2.0 adopted a long connection approach and decided to remove RemoveRequest Context

* Removing invalid import
 2021-03-26 13:52:56 +08:00
KomachiSion
6cda5ad55a Merge remote-tracking branch 'upstream/develop' into develop-merge-to-2.0 
# Conflicts:
#	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/config/impl/YmlChangeParserTest.java
#	common/src/main/java/com/alibaba/nacos/common/http/param/Header.java
#	common/src/main/java/com/alibaba/nacos/common/utils/ConcurrentHashSet.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	console/src/main/resources/static/js/main.js
#	core/src/main/java/com/alibaba/nacos/core/cluster/ServerMemberManager.java
#	core/src/main/java/com/alibaba/nacos/core/utils/Loggers.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
#	pom.xml
 2021-03-18 12:08:45 +08:00
nov.lzf
481d25a6c7
listener bugfix (#5079) 2021-03-12 10:30:52 +08:00
nov.lzf
3afa7eac89
shutdown long connection where server rollback; use client submit client ip (#5013) 
* use  client ip from connection setup request.

* reset remote connection for rollback

* npe bugfix

* npe bugfix

* stop long connection where server rollback

* stop long connection where server rollback
 2021-03-05 09:28:01 +08:00
zhangcly
f8d8e658da
[ISSUE #4274] skip master-select task when db.num is 1 (#4790) 2021-03-04 10:37:10 +08:00
nov.lzf
2315a745d3
tag publish bugfix; ignore server port for connection reset request. (#4947) 
* grpc port modified;change notify bugfix.

* default member port fix

* modify grpc port to offset

* modify grpc port to offset
 2021-02-25 10:38:25 +08:00
nov.lzf
ed0edaa023
listen config auth bugfix (#4882) 2021-02-05 10:44:16 +08:00
nov.lzf
4f0ec0a196
optimize config file read (#4875) 2021-02-04 16:22:50 +08:00
nov.lzf
0449fbc707
move server loader controller from console to core; modify common server scheduler count to solve large cpu usage (#4872) 
* move server loader controll from  console to core

* modify common server scheduler count to solve large cpu usage
 2021-02-04 14:09:08 +08:00
nov.lzf
c272d78890
add client sign header and nacos default port；sync code with diamnd over nacos 2.0 (#4857) 
* add client sign header and nacos default port

* sync code with diamnd over nacos 2.0

* pmd and check style
 2021-02-02 17:31:01 +08:00
nov.lzf
d5af830d52
remove config resync request and add getting cluster metrics (#4846) 
* from diamond over nacos  2.0

* config notify task type bugfix

* keep consistent  with diamond over nacos 2.0

* remove config resync  request and add getting cluster metrics

* add using address server to look up interface

* add using address server to look up interface
 2021-02-01 13:33:56 +08:00
杨翊 SionYang
01ea27501e
Full support for registering custom instances (#4828) 
* Move out `cluster` from extendInfo in InstancePublishInfo

* Fix unit test error

* Rename instanceId in instanceMetadata to metadataId

* Fix unit test

* Adapt 1.X client instance Id

* Full support for registering custom instances
 2021-01-28 20:20:01 +08:00
huqingfeng
0e42a75833
log error (#4799) 2021-01-28 20:08:34 +08:00
nov.lzf
3cfa183400
convert payload type from full name to simple name;abilities both on client-server& server cluster submit (#4791) 
* convert payload type from full name  to simple name.

* abilities both on client-server& server cluster submit

* Cas of update config, beta,tag publish

* tenant support on connection.

* modify health check tps point name
 2021-01-25 14:11:35 +08:00
wjm0729
0545e851db
导入优化 (#4775) 
* import 优化

* 无法识别项目 提示优化

* revert

* revert

* 改回原来的格式
 2021-01-22 17:03:37 +08:00
nov.lzf
4e7346db1d
tps monitor key use self define submit；active detection both on client and server (#4767) 
* tps monitor key use self define submit

* pmd and check style.

* active detection of client and server

* connection manager ,active send interval increase
 2021-01-21 14:40:07 +08:00
nov.lzf
91bf227c4a
tps control submit; connection rule (#4752) 
* tps reporter submit

* tps reporter submit

* log optimize; listen concurrent bugfix; async request exception fix

* server loader bugfix;increase keep alive default time

* tps report bugfix, tps log bugfix;

* rpc server push ack notify bugfix.

* change rule store dir ;add local file change event of connection rule.

* remove client side request meta; reduce client parameters

* 简化冗余代码

* 优化异常日志

* md5 sync bugfix

* client metrics submit; tps monitor ip list support

* client metrics submit; tps monitor ip list support
 2021-01-20 09:21:40 +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
haoyann
de23466363
fix cloning configuration last desc (#4697) 2021-01-15 19:41:46 +08:00
haoyann
63513b44f2
[ISSUE #4661]configServletInner#doGetConfig code optimization (#4666) 
* configServletInner#doGetConfig code optimization

* add comment

* update comment

* update comment
 2021-01-15 19:26:47 +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
79b39db5ca
query config line break miss bugfix . (#4688) 2021-01-13 19:35:16 +08:00
KomachiSion
902f501fac Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	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
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/ClientInfo.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2021-01-13 15:53:50 +08:00
liaochuntao
2eac367970 fix: fix Jraft WriteRequest type problem. 2021-01-13 14:39:00 +08:00
杨翊 SionYang
998947315e
Add server identity to replace user-agent white list. (#4683) 2021-01-13 14:12:56 +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
nov.lzf
2d8d4c5f5a
onnectionLimitRule submit.client use same executor during different … (#4651) 
* ConnectionLimitRule submit.

* ConnectionLimitRule submit.client use same executor during different connection.
 2021-01-08 09:59:03 +08:00
KomachiSion
11210c057d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-dev 2021-01-07 17:09:30 +08:00
nov.lzf
afb1a28135
log optimize; config re sync request (#4638) 2021-01-06 21:25:14 +08:00
wjm0729
4da3c82895
优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支 (#4607) 
* 优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支
异常的代价是很大的, 非必要情况下. 应该尽量避免

* comment

* comment

* license
 2020-12-31 15:50:07 +08:00
mai.jh
2af6784f55
for #4594,#4594 Fix IO close problem. (#4606) 2020-12-31 15:48:26 +08:00
KomachiSion
7f3a17c620 Solve conflict with develop branch. 2020-12-31 14:24:41 +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
nov.lzf
0ad5bcbb17
call back bugfix. rpc executor extract... (#4592) 2020-12-29 16:23:32 +08:00
nov.lzf
6c5e52cf1b
rpc config listen notify optimize;connection_id name optimize;listeners query bugfix; (#4591) 
* rpc config listen notify optimize

* connection_id name optimize

* listeners query bugfix;
 2020-12-29 15:35:23 +08:00
haoyann
dd854e3b49
fix cluster mode query config type is null (#4579) 2020-12-28 09:48:11 +08:00
nov.lzf
6e34f2886b
encode bugfix (#4548) 
* basic spell fix.import
 fail bugfix

* encode bugfix

* remote log bugfix;  create client concurrent bugfix;optimize log

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle pmd fix

* checkstyle pmd fix

* http poll sla bugfix; rpc config listen notify optimize
 2020-12-26 15:53:10 +08:00
杨翊 SionYang
4445bad715
Add unit test for naming push (#4545) 
* Add single push task for retry push

* Add unit test for Push task

* Add unit test for Push executor

* Add unit test for Subscriber service v2

* PushService.java --> UdpPushService

* Refactor and add unit test for ClientInfo

* Solve Conflict and compile problem
 2020-12-22 17:56:34 +08:00
nov.lzf
452410825f
20201221 lzf grpc (#4535) 
* basic spell fix.

* basic spell fix.
 2020-12-21 20:46:36 +08:00
haoyann
1bc350b99a
fix derbyOps interface security problem (#4517) 2020-12-21 09:55:49 +08:00
nov.lzf
caffec2d5b
rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix. (#4473) 
* rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix.

* auth bugfix
 2020-12-14 19:31:33 +08:00
Brent
b8b57dc980
fix: 修复参数类型注释及单词拼写错误 (#4419) 2020-12-07 19:42:05 +08:00
liaochuntao
81d4a6d2fd
fix: fix bug (#4411) 2020-12-05 01:57:17 +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
KomachiSion
049b4e4e61 Sync code from upstream/develop 2020-12-03 20:06:12 +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
nov.lzf
ad98020770
负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix (#4365) 
* memory gc optimize ; string pool bugfix

* grpc executor

* grpc executor

* 负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix

* check style fix
 2020-11-30 16:17:34 +08:00
mai.jh
f78bef9665
[ISSUE-#4333]Add MapRowMapper to RowMapperManager (#4334) 
* for #4311，Fixed Derby data source related SQL LIMIT exception.

* Revert "for #4311，Fixed Derby data source related SQL LIMIT exception."

This reverts commit 49188f14

* fix #4333.

* Remove case conversion.
 2020-11-27 10:10:11 +08:00
mai.jh
3bf8844992
[ISSUE #4311] Fix Derby data source related SQL LIMIT exception (#4313) 
* for #4311，Fixed Derby data source related SQL LIMIT exception.

* fix code style.

* code format.
 2020-11-24 13:21:15 +08:00
赵延
7f2a3307d6
[ISSUE-#4256] Just inject environment in StartingSpringApplicationRunListener (#4257) 
* just inject environment in StartingSpringApplicationRunListener

* make nacosStartingListener is decoupling with springApplicationRunListener.

* add api doc

* refactor. transfer nacos listeners to SpringApplicationRunListener.

* remove unuseful import

* add doc info
 2020-11-24 11:17:13 +08:00
zhuhao
b7b7b1975f
refactor issue #4275 (#4299) 2020-11-23 13:50:14 +08:00
赵延
8500279c79
[ISSUE-#4294] Use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment (#4295) 
* use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment.

* remove unuseful import

* remove unuseful import
 2020-11-21 19:03:51 +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
赵延
ba9ed8e736
[ISSUE-#4262] Fix public namespace permission problem (#4273) 
* fix public namespace permission problem

* move NamespaceUtilTest to common module
 2020-11-20 20:00:57 +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
liaochuntao
89342da468
Optimize Bean injection and fix unsafe Map removal issues (#4276) 
* refactor: refactor code

* fix: fix generic issues
 2020-11-20 09:12:14 +08:00
nov.lzf
5c656d6f42
memory gc optimize ; string pool bugfix (#4261) 2020-11-19 10:34:40 +08:00
nov.lzf
69c84f1397
pmd ,checkstyle (#4252) 2020-11-18 13:46:27 +08:00
paderlol
501b1e73e4
Fix sql injection bug (#4245) 
* Fix sql injection bug

* Fix checkstyle issue
 2020-11-18 09:23:48 +08:00
liaochuntao
bcd62d5574
Refactor issue 4228 (#4229) 
* refactor: adjusts conformance protocol layer objects

* feat: repair problems

* refactor: reafctor consistency model
 2020-11-16 09:58:52 +08:00
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 (#4217) 
* listen context bugfix.

* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
 2020-11-12 18:03:07 +08:00
蚊子猫
3e33851d17
[ISSUE #3102] remove lang dependency. (#4202) 
* add commons-lang3 dependency into core and sys, prepare to remove lang/lang3 dependency in common/api/client.

Change-Id: I4b7a0bec09359e64ecf997b123b85c265bfe16cf

* remove lang dependency.

Change-Id: I5cbd811babc8269a54b93e278ad6e5e2663c8427
 2020-11-11 19:50:45 +08:00
杨翊 SionYang
164ed33ada
Feature support grpc core (#4204) 
* NacosNamingMetadataManager --> NamingMetadataManager

* Try to add ServiceMetadata consistency

* add catalog api support new data

* Change version to 2.0.0-SNAPSHOT
 2020-11-11 19:50:14 +08:00
杨翊 SionYang
6b7fb05601
For #3607, #4078, #4170, Datasource pool configuration can be configured. (#4178) 
* For #3607, #4078, #4170, Datasource pool configuration.

* Fix ci error.
 2020-11-09 20:18:27 +08:00
赵延
39a2f20d56
[ISSUE #3907] when publishConfig, if type is absent, set default value 'text' (#3915) 
* when publishConfig, if type is absent, set default value 'text'

* 1.add publishConfig api(add param type)
2.check type is valid in nacos server
 2020-11-09 11:36:50 +08:00
邪影oO
538509502f
IPv6 support (#3773) 
* IPv6 support

* AddressServerParamCheckUtil 合并到 IpUtil 及一些修改

* 解决魔法值

* 修改隐患

* 调整使用了类似 ip.indexOf(":") 查找是否有端口的地方的逻辑, 一些 ":" 替换为常量

* 删除无用测试

* IpUtil 改名 为 IPUtil, 涉及IP的相关方法名修改,涉及到的调用修改,检测IP的地方调用的isIPv4改为isIP. 修改涉及IP的字段长度及相关升级更新的sql

* no message

* no message

* no message

* no message

* 获取本机IP时,如果本机IP是IPv6并且包含网卡信息(V6地址中最后面的百分号和百分号后面的内容)则去除网卡信息

* 解决 AvoidComplexConditionRule(请不要在条件中使用复杂的表达式)

* 移除无用代码

* 添加注释

* 调整code style, 调整获取本机IP的逻辑
 2020-11-05 20:15:06 +08:00
KomachiSion
8829d3c6ed Upgrade to 2.0.0-ALPHA 2020-11-05 19:38:15 +08:00
KomachiSion
9cbc0bfeea Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/common/Constants.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/HttpClient.java
#	common/src/main/java/com/alibaba/nacos/common/utils/VersionUtils.java
#	core/src/main/java/com/alibaba/nacos/core/distributed/distro/DistroProtocol.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-11-05 19:33:46 +08:00
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT (#4135) 2020-11-05 09:43:33 +08:00
KomachiSion
adbcb7549d Upgrade to 1.4.0 2020-11-02 19:09:19 +08:00
杨翊 SionYang
6eeeb76473
Develop fix jraft null datum (#4048) 
* Fix old raft sync null datum problem

* Fix TimerContext NPE problem
 2020-10-22 15:40:00 +08:00
jiang
6df2b229d0
[ISSUE-#3855] Provided a feature to view version comparisons in the configDetails page (#3988) 
* add detail previous config history api

* modify the previous config history url

* modify log description

* 详情页面添加“历史对比”按钮，点击可打开对比面板

* 点击“历史对比”按钮，获取上一版本数据

* 在查看历史对比的时候 不显示revert按钮

* append doc info

* Add unit tests for ISSUE#3855

* Add the previous updates to main.js and main.css

Co-authored-by: 赵延 <1060026287@qq.com>
 2020-10-19 09:29:59 +08:00
KomachiSion
9a0e8705dd solve conflict from develop branch and for checkstyle 2020-10-16 15:39:03 +08:00
KomachiSion
47481fedfb Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/resources/nacos-log4j2.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/src/main/java/com/alibaba/nacos/core/cluster/MemberMetaDataConstants.java
 2020-10-16 15:26:33 +08:00
杨翊 SionYang
d78ebbbce1
Refactor dispatch task execute (#3995) 
* Refactor nacos task execute engine

* Refactor nacos task execute engine

* For checkstyle

* For checkstyle

* Use ThreadUtils to reduce duplicate codes

* Set custom logger for TaskExecuteWorker

* Set custom logger for TaskExecuteWorker
 2020-10-16 14:32:39 +08:00
邪影oO
13599fd83d
Fix#3973 (#3974) 
* fix #3973

* 重复代码抽取到一个方法

* 删除私有方法的注释

* 处理namespace参数的方法提出到一个工具类中

* 修改注释

* 添加licences

* 增加 TenantUtil 的测试

* TenantUtil 改名为 NamespaceUtil
 2020-10-13 15:48:46 +08:00
赵延
c0496b364e
[ISSUE #3909] add domain's judgement (#3913) 
* add domain's judgement

* modify domain's judgement, can resolve = true

* remove judgement in 'if' code block

* replace Ip to IP in InetUtils

* log warn info when domain can not be resolved

* fix vaiable name
 2020-10-12 12:19:02 +08:00
赵延
d6cc8ce5b0
fix typo error (#3954) 2020-10-12 12:18:14 +08:00
nov.lzf
336269891e
ak auth support;log optimize; client port aware on server side (#3970) 
* ak auth support on long connection

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* reconnect rate control
 2020-10-12 11:53:43 +08:00
KomachiSion
ddf2dc0247 Solve conflict 2020-09-18 16:31:09 +08:00
KomachiSion
6e5b09aee7 Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultSharePublisher.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-09-18 16:16:00 +08:00