Commit Graph

909 Commits

Author SHA1 Message Date
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
liaochuntao
7fd4d9a5d1
feature issue #3804 (#3805)
* improvement: merge upstream/develop

* feat: merge upstream develop

* feat: manage the loading of configuration files uniformly

* fix: fix copyright style

* style: fix code style

* fix: fix code style
2020-09-18 16:05:36 +08:00
nov.lzf
d83a4b12b3
ak auth support on long connection (#3821) 2020-09-14 16:47:59 +08:00
nov.lzf
fac4879e92
optimize dumpService warning on starting up ; async request suppport in cluster rpc client proxy. (#3808)
* optimize  dumpService warning on starting up .

* async request suppport in cluster rpc client proxy.

* async request suppport in cluster rpc client proxy.
2020-09-11 18:02:28 +08:00
nov.lzf
721791a41e
optmize rpc client lifecycle ;request timeout to rpc client; some bugfix (#3797)
* optmize rpc client lifecycle and some bugfix

* get server load optimize; add request timeout to rpc client
2020-09-10 10:56:36 +08:00
nov.lzf
167dba13d2
check stype and pmd fix; future request optimize. (#3782) 2020-09-08 15:30:11 +08:00
nov.lzf
723dedebfe
request callback timeout support both at client and server; split sdk (#3776)
and cluster grpc server port.
2020-09-07 18:49:17 +08:00
KomachiSion
334e401f11 Fix merged error 2020-09-04 17:23:52 +08:00
KomachiSion
ee406d5e5e Merge branch 'upsteam-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/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/test/java/com/alibaba/nacos/client/ConfigTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
2020-09-04 17:03:26 +08:00
邪影oO
043a504a33
fix: #3617 (#3678)
* fix #3617

* 调整代码格式

* 修改抛出的Exception类型

* 调整逻辑

* 移除没用到的方法

* 修改注释
2020-09-03 21:14:23 +08:00
nov.lzf
cf550b9f43
optimize request /header /meta info model, uniform request resolver pattern. (#3749)
* body string compress and opitimize request and meta info

* optimize request /header /meta info model, uniform request  resolver pattern.

* delete useless code
2020-09-03 15:00:08 +08:00
nov.lzf
d279aad940
gzip support; using object list instead of string concat for batch listen config (#3742)
* gzip support; using object list  instead of string concat for batch listen config

* gzip support; using object list  instead of string concat for batch listen config
2020-09-02 14:25:33 +08:00
nov.lzf
3a5c3cb19f
refactor request/response registry ; server side request push refactor (#3739)
* limiter support in rpc transport

* get next server optimize; server side notify concurrent bugfix; multi rpc client support in config module.

* toast alibaba repo refer. add client name

* rpc config change beta ips filter

* payload registry submit

* refactor request/response registry ; build response aware of server side in connection level.

* refactor request/response registry ; build response aware of server side in connection level.

* bi stream submit.

* bi stream submit.
2020-09-02 09:12:53 +08:00
nov.lzf
3d222268af
as-sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware (#3693)
* optimize rpc listen notify

* remove cache bugfix

* code optimize

* code optimize

* config client abstract optimize, remove if/else code

* config client abstract optimize, remove if/else code

* as sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware
2020-08-26 15:52:25 +08:00
Gagharv
3428d8830e
[ISSUE #3671] move some tools class into common package (#3672) 2020-08-24 13:24:56 +08:00
杨翊 SionYang
a0c8353b70
[ISSUE#3658] refactor TaskManager and move to nacos-common module (#3663)
* Add TaskManagerTest

* Move Abstract Task and Task processor to nacos-common

* Add Nacos execute engine interface and nacos task interface

* Refactor Task Manager to NacosDelayTaskExecuteEngine

* for code style
2020-08-23 16:39:58 +08:00
nov.lzf
03e58df04f
listen context query support on console ; basic api for lader balance ;server side push retry submit (#3630)
* listen context query with groupy and ip support long connect

* remove connection on cleint side, server will generate instead.

* connect reset request support appointing ip address.

* server push retry

* basic api for loader balance

* basic api for loader balance
2020-08-18 20:20:21 +08:00
nov.lzf
33df55d40a
remote support on servers and optimize connection and client model (#3609)
* Add gprc support-> optimize rpc listen execute task  notify

* Add gprc support->  add listener optimize.

* Add gprc support-> cluster rpc client support

* cluster rpc client support

* config change notify bettween server long connect support

* server push future refactor.

* server rpc sync compatibility support

* connection labels  support

* code fail fix
2020-08-14 17:40:00 +08:00
mai.jh
526e2bc130
[ISSUE #3566] move the permission code of nacos-core module to nacos-auth module (#3593)
* move the permission code of nacos-core module to nacos-auth module.

* Fix some code style issues

* address server module auth package name change.

* test change

* Incorrect package name correction
2020-08-14 09:50:05 +08:00
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT (#3549) 2020-08-12 09:32:06 +08:00
nov.lzf
a0a1486fa2
rsocket support and optimize client abstract (#3559)
* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> upgrade api client common jdk compiler to 1.8 for test Rsocket only

* Add gprc support-> rsocket client test code  submit

* Add gprc support-> rpc client factory optimize

* Add gprc support-> config client factory  rename

* Add gprc support-> rsocket submit

* Add gprc support-> rsocket client switch  submit

* Add gprc support-> rsocket support and optimize rpc client
2020-08-10 09:11:53 +08:00
lidaoyang
fae37481e5
Fix #3269 When nacos.core.auth.enabled = true, user information is saved to the request in login (#3543)
* Fix #3269 NacosAuthManager request.setAttribute(user) and ConfigController getSrcUserName(req)

* Fix #3269 format code

* Fix #3269 format code
2020-08-07 12:43:44 +08:00
ZZQ的
7a471c5100
When binding roles, the user list is changed to the drop-down selection mode (在绑定角色的时候用户列表改成下拉选中的模式) #3518 (#3522)
* 配置pageSize列表 #3439

* Service List Page Increase the number of pages switching function is the same as the configuration management page #3500

* issues#3500 编译之后的代码

* 在绑定角色的时候用户列表改成下拉选中的模式 #3518

* change code style

* delete unused import

* delete changed indent please.

* Javadoc add an ending period

* fix bad sql and change return type

* change js get value

* delete whitespace

* check code style

* add permissions, associated role, change to fuzzy matching drop-down(java code)

* add permissions, associated role, change to fuzzy matching drop-down(js code)

* delete "/"
2020-08-06 13:23:53 +08:00
mai.jh
a64a356e45
[ISSUE #3192] replace nacos-config module http client (#3523)
* nacos-config module replace http client

* replace http client

* Remove redundant package import

* add license

* Delete JOSNUtils and use JacksonUtils instead; modify NacosAsyncRestTemplate exception handling.
2020-08-06 11:53:27 +08:00
nov.lzf
05bd51062d
Add gprc support-> server push ack (#3521)
* Add gprc support->  server push ack

* Add gprc support-> add lost code

* Add gprc support-> disconnect status change bugfix

* Add gprc support-> optimize rpc port
2020-08-05 10:21:33 +08:00
杨翊 SionYang
df4b006b36
Upgrade version to 1.3.2 (#3512) 2020-08-04 12:58:45 +08:00
nov.lzf
3a777455e7
move rpc client from client to common and move request response to api ; solve conflict. (#3481)
* Add gprc support->  move rpc client from client to common and move request response to api

* Add gprc support->  conflict solved
2020-07-30 17:21:44 +08:00
nov.lzf
b1a587dc72
Add gprc support-> add server push ack (#3478) 2020-07-30 16:00:22 +08:00
wangwei
e4a478a1f9 [#1839]add ContentType return while getConfig 2020-07-29 14:58:28 +08:00
ljhrot
c3818ff064
Fix bad SQL grammar (#3445) 2020-07-25 23:07:13 +08:00
nov.lzf
b28636c6de
notify connect listeners on start up (#3405)
* Add gprc support-> try to connect the server synchronous on start up , start a thread to connect to server until successfully connected when fail.

* Add gprc support-> notify connect listeners.

* Add gprc support-> update client reconnect  strategy.

* Add gprc support-> optimize push config request param model and meta request.

* Add gprc support-> notify on new connected
2020-07-21 20:08:38 +08:00
yangy
2eaed4bcdc
Use PrepareStatement to replace string concatenation (#3393) 2020-07-21 14:50:19 +08:00
nov.lzf
85a0398978
1.server side client connection listener optimize 2. listen context and notifier updated . (#3385)
* Add gprc support-> client reconnection optimize

* Add gprc support-> 1.client connection listener optimize  2.listen context an notifier updated .

* Add gprc support->merge problem fix

* Add gprc support->check style fixed.

* Add gprc support->check style fixed and remove  gRpc classes in source package.
2020-07-20 16:27:58 +08:00
KomachiSion
79c8521bde Merge 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/http/HttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
2020-07-18 16:28:00 +08:00
nov.lzf
3f06a7a0f8
response model optimize (#3357)
* Add gprc support-> add grpc log to distribution logback

* Add gprc support-> response model optimize
2020-07-17 12:03:30 +08:00
nov.lzf
b10a24885e
add server side connection listener ,and add client version (#3350)
* Add gprc support-> 1.add server side client connection event listener ,base on heart beat expire time check  2.add client version  info after grpc connection build

* Add gprc support-> add publish config and remove config in rpc channel ;and rename server push response handler
2020-07-16 19:21:38 +08:00
杨翊 SionYang
6c8dfd6ed3
Add naming support gRPC for query instance list and service info (#3352)
* Add naming support gRPC for query instance list and service info

* Update version to 1.4.0-SNAPSHOT
2020-07-16 18:08:25 +08:00
nov.lzf
0aad8f55eb
support config query in rpc channel ,add switch http/rpc at client side (#3344)
* Add gprc support-> 1.support config query  in rpc channel ,add switch in client side

* Add gprc support-> 1.log optimize,split grpc core and digest

* Add gprc support-> 1.optimize log and client proxy.

* Add gprc support-> remove  proto buff plugin
2020-07-15 20:54:16 +08:00
杨翊 SionYang
d00c133c3e
Add naming support gRPC for register and deregister instance (#3343) 2020-07-15 20:22:07 +08:00
nov.lzf
139b211e21
Nacos config support gRPC (#3334)
* Add gprc support-> client side code submit ,and create server side naming module abstract handler template.

* Add gprc support-> config data change  notify code submit....

* Add gprc support-> serve side healthy check code submit and solve some checkstyle problems.

* Add gprc support-> 1.config client worker ,cancel long polling task  2. test add listener,remove listener in config module  3.add response resolve
2020-07-15 13:56:29 +08:00
Hu Zongtang
52d9cf9cf9
[ISSUE##2859]Remove original EventDispatcher in the config module. (#3319) 2020-07-14 19:38:08 +08:00
nov.lzf
bbbeabe1e8
nacos support grpc ,base functions submit. (#3328)
* gprc

* Add gprc support
2020-07-14 19:15:22 +08:00
Hu Zongtang
fee6cf4dc9
Replace original EventDispatcher with NotifyCenter in the config module. (#3313)
* [ISSUE##2859]Replace some usage of EventDispatcher for ConfigCacheService and LongPollingService.

* [ISSUE##2859]Replace some usage of EventDispatcher for AsyncNotifyService and ConfigChangePublisher.

* [ISSUE#3179]fix typo.

* [ISSUE#3179]fix typo.

* [ISSUE#3179]fix typo.
2020-07-14 15:10:25 +08:00
Gagharv
891c1f3ba5
[ISSUE #2856]Adjust the use of thread pools (config module) (#3206)
* [ISSUE #2856]Adjust the use of thread pools (config、cmdb module)

* add CmdbExecutor class
2020-07-13 17:33:25 +08:00
zongtanghu
34fd36b115 [ISSUE#3179]fix import formate issue. 2020-07-12 13:52:29 +08:00
zongtanghu
d8e1d2aebc [ISSUE#3179]Replace the NotifyCenter with new refactor in the config and test module. 2020-07-12 11:28:54 +08:00
CsyDesign
84b733a31f
[ISSUE#3300] Optimize the default "minIdle"" of HikariPool set by naocs (#3304) 2020-07-12 00:32:11 +08:00
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
95f3bfb587
[ISSUE #2992]Recheck all checkstyle and open checkstyle during building (#3293)
* Re-check code style for nacos-config module.

* Re-check code style for other module.

* Open checkstyle plugin check during build
2020-07-10 17:18:53 +08:00
zhangjidi2016
5d65653740
Resolve the issues of codestyle of nacos-config module for phase7 (#3288)
* Resolve the issues of codestyle of nacos-config module for phase7

* fix typo of code style.
2020-07-10 14:26:39 +08:00
杨翊 SionYang
886fbe463c
Use new code style for nacos-config module/test. (#3290) 2020-07-10 13:24:43 +08:00
Hu Zongtang
753a736815
[ISSUE#3249]Resolve the issues of codestyle of nacos-config module for phase8. (#3286)
* [ISSUE#3249]Resolve the issues of codestyle of nacos-config module for phase8.

* [ISSUE#3249]fix typo.
2020-07-09 20:12:05 +08:00
Gagharv
9e9b95b9a0
[#3249]Resolve the issues of codestyle of nacos-config module for phase6 (#3277)
Change-Id: I731548ea51b8ccf2a7f2635bd0e864573ccc7fc9
2020-07-08 15:11:58 +08:00
Hu Zongtang
0086dfe787
Resolve the issues of codestyle of nacos-config module for phase5. (#3272)
* [#3249]Fix chinese unit method name in config test module.

* [#3249]resolve the code style issue in service package.

* [ISSUE#3249]fix typo.
2020-07-08 09:21:13 +08:00
Gagharv
a4fe234a26
Resolve the issues of codestyle of nacos-config module for phase4 (#3262)
* [ISSUE#3249]Resolve the part issues of codestyle for nacos-config module(package:service/repository)

Change-Id: I394a7639c70b6d30c2b800d5608ba62b6b64c76c

* 1.adjust ignore exception
2.adjust sql

Change-Id: I1e190872dc85d1d81a6afc2a204331bd779c04b0

* adjust sql

Change-Id: Ie4a085487b3642d0da150162b9a750bd803bf07e
2020-07-07 20:13:32 +08:00
Hu Zongtang
9966ec38d9
[ISSUE#3249]Resolve the issues of codestyle of nacos-config module(parameters/enums/exception/filter/manager/model/service). (#3259) 2020-07-06 15:35:10 +08:00
Gagharv
4278b483ca
Resolve the issues of codestyle of nacos-config module for phase2 (#3253)
* [ISSUE#3249]Resolve the part issues of codestyle for nacos-config module(package:service/dump)

Change-Id: I273493054e3d7f5f26d73d65fa8360266a93cbfc

* [ISSUE#3249]Resolve the part issues of codestyle for nacos-config module(package:service/merge)

Change-Id: I8cdf601c2cb5f177a920c0f690cfbace8108c4cc
2020-07-06 10:08:32 +08:00
Hu Zongtang
c40de72f34
Resolve the issues of codestyle of nacos-config module for phase1 (#3250)
* [ISSUE#3249]Resolve the part issues of codestyle for nacos-config module(package:aspect/auth/configuration).

* [ISSUE#3249]Resolve the part issues of codestyle for nacos-config module(package:constant/controller).

* [ISSUE#3249]translate Chinese comments into English.

* [ISSUE#3249]fix typo.
2020-07-06 09:56:34 +08:00
Joe
2f5fb235b2
optimize isExistTable function (#3236)
* Update EmbeddedStoragePersistServiceImpl.java

If the table data volume is large, count (*) will be particularly slow

* Update ExternalStoragePersistServiceImpl.java

If the table data volume is large, count (*) will be particularly slow

* Update ExternalStoragePersistServiceImpl.java

* Update EmbeddedStoragePersistServiceImpl.java
2020-07-04 09:27:18 +08:00
Hu Zongtang
31670f124c
[#3241]Reformat the nacos-config module by new code style. (#3243) 2020-07-03 16:51:08 +08:00
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
liaochuntao
2c733d57ff
[#2979] Inline storage support importing data from external data sources (#3138)
* feat: data import Derby, Derby export complete

* feat: external data source import is complete

* feat: import data to derby and derby backup finished

* fix: fixed bug where external storage mode could not find beans

* style: fix code style

* style: remove unuse code

* refactor: fixed configuration file information

* improvement: merge upstream/develop

* style: fix code style

* fix: a way to fix the missing

* fix: fix derby data import in standalone mode

* style: fix code style

* refactor: merge upstream develop and fix code style

* test: modify ut

* style: fix code style
2020-06-28 10:25:06 +08:00
Hu Zongtang
38a2aa111a
[#3185]Fix chinese unit method name in config test module. (#3186) 2020-06-28 09:49:53 +08:00
杨翊 SionYang
532aad685e
upgrade version of Jackson and Guava (#3116) 2020-06-19 10:55:14 +08:00
杨翊 SionYang
f864880136
[ISSUE #2992] use new code style for nacos-common (#3106)
* use new code style for nacos-common

* Fix code style file can't set java import problem.
2020-06-18 17:05:15 +08:00
zhanglong
855a637ac5 Fix word spelling errors 2020-06-14 19:11:54 +08:00
zhanglong
477e0ad1f3 Add license for ExternalDataSourceProperties 2020-06-14 17:57:33 +08:00
zhanglong
8295a3ef96 Add ut for ExternalDataSourceProperties 2020-06-14 17:55:25 +08:00
zhanglong
768713ec05 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2020-06-14 17:18:17 +08:00
liaochuntao
34fda6a0bb
Merge pull request #3057 from showkawa/#3056_performance_issue
#3056 performance issue
2020-06-14 12:56:11 +08:00
zhanglong
cf6b4c4f0e Tool method extract 2020-06-13 22:06:04 +08:00
zhanglong
1b55e68fd4 Upgrade the database driver version of Mysql to 8 # 3036 #2993 #1868 2020-06-13 19:05:22 +08:00
Brian Huang
8c0f52f987 replace "+=" to StringBuilder append method 2020-06-12 22:00:08 +08:00
KomachiSion
d4bdb69831 For #2873, unified copyrights. 2020-06-12 16:24:00 +08:00
KomachiSion
8aaa833605 For #2873, unified copyrights for nacos-config. 2020-06-12 15:45:35 +08:00
yanlinly
65c6c8cb27
Merge pull request #2781 from wangweizZZ/issue_2749
[ISSUE #2749]dumpAllTaskMgr did not add the correct processor
2020-06-11 13:49:50 +08:00
杨翊 SionYang
e6c578f4e2
Merge pull request #3008 from zhouhailin/develop
FIX ISSUE #3007 : MaxHistory字段名称和Nacos默认的命名风格不统一
2020-06-10 14:01:40 +08:00
zhouhailin
2efe317597 FIX ISSUE #3007 : MaxHistory字段名称和Nacos默认的命名风格不统一 2020-06-09 23:02:18 +08:00
chuntaojun
902d609f1e perf: optimize configuration change event publishing 2020-06-08 23:38:53 +08:00
yanlinly
5203ee348b
Merge pull request #2990 from alibaba/hotfix_standalone_notify
[ISSUE 2989] where config publish could not trigger horizontal notification i…
2020-06-08 13:57:27 +08:00
chuntaojun
795005be2b fix: where config publish could not trigger horizontal notification in standalone + derby 2020-06-08 11:01:34 +08:00
chuntaojun
71217154bb fix: fix task executable judgment logic problems 2020-06-07 20:34:11 +08:00
杨翊 SionYang
c2e3530ee2
Merge pull request #2981 from alibaba/hotfix_jraft
[HOTFIX] Raft RPC being submitted to the Leader, error could not be…
2020-06-07 19:53:32 +08:00
chuntaojun
5191838d77 fix: fixed Raft RPC being submitted to the Leader, error could not be returned 2020-06-07 18:16:46 +08:00
lengleng
56eeb35ffc ♻️ Refactoring pom. com.alibaba.nacos to ${project.groupId} Uniform variable 2020-06-06 17:24:37 +08:00
chuntaojun
364745e000 refactor: add config publish log 2020-06-05 10:50:29 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +08:00
yanlinly
f71c5d85c9
Merge pull request #2949 from alibaba/hotfix_config_clone
Hotfix config clone
2020-06-03 20:07:31 +08:00
chuntaojun
6271022648 refactor: roll-back AsyncNotifyService.java 2020-06-03 20:00:15 +08:00
chuntaojun
95eba16669 test: add ut 2020-06-03 19:50:25 +08:00
chuntaojun
0fbcb99ebb fix: fix code style 2020-06-03 19:35:28 +08:00
chuntaojun
a212641730 fix: fix front-end Long precision loss problem 2020-06-03 19:12:13 +08:00
wangwei
dc0c5375a8 Merge remote-tracking branch 'alibaba/develop' into issue_2749 2020-06-03 11:29:29 +08:00
wangwei
aae7b341de Merge remote-tracking branch 'alibaba/develop' into issue_2749 2020-06-03 11:19:06 +08:00
chuntaojun
a8bcf35b63 refactor: log print adjustment 2020-06-02 14:22:22 +08:00
chuntaojun
7c9f43dfdf refactor: add log printing 2020-06-02 14:17:38 +08:00
Jack Dai
1a7264d9b6 解决和develop的冲突 2020-06-01 18:41:03 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
chuntaojun
5fceafac3f refactor: optimize the error message prompt 2020-05-30 17:28:25 +08:00
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +08:00
chuntaojun
5dcee2f1c6 fix: fix pmd 2020-05-29 19:59:08 +08:00
Jack Dai
9692cd1b8c 合并和origin/develop的冲突 2020-05-29 19:01:48 +08:00
chuntaojun
a5661f033d feat: add the metircs 2020-05-29 18:42:14 +08:00
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +08:00
Jack Dai
594eac42b3 整理每个module的plugin和dependency的版本号 2020-05-29 16:35:48 +08:00
chuntaojun
e8533155c7 fix: fix startup problem 2020-05-27 22:05:38 +08:00
chuntaojun
6525b5a6f8 fix: fix startup read failure 2020-05-27 18:37:36 +08:00
yfh0918
3f956bef4b #2896 bugfix 2020-05-26 16:51:32 +08:00
yfh0918
38a3f5d735 #2896 bug fix 2020-05-26 16:36:29 +08:00
chuntaojun
6fe1d0d0da improvement: adjust part of the code 2020-05-26 11:57:27 +08:00
chuntaojun
bf2adb4be5 feat: merge develop 2020-05-26 09:43:37 +08:00
liaochuntao
aad542a098
Merge pull request #2874 from alibaba/hotfix_notify_cast_error
fix: fix the class cast problem
2020-05-24 22:32:18 +08:00
chuntaojun
843692b10a fix: fix the class cast problem 2020-05-24 21:56:29 +08:00
yanlinly
6a9e9e9b14
Merge pull request #2871 from wolfgangzhu/issue-2657
[ISSUE #2657]SQLException when config server quickstart
2020-05-24 21:54:16 +08:00
wolfgang.zhu
05da79f99b fix #2657 add type in sql using ConfigInfoWrapper 2020-05-24 12:07:35 +08:00
chuntaojun
0e52d0457c refactor: modify method name to avoid ambiguity 2020-05-23 21:35:47 +08:00
chuntaojun
41703f9805 refactor: code optimization 2020-05-22 23:12:50 +08:00
chuntaojun
5e52484a46 refactor: removes the Http forward for the configuration module 2020-05-21 22:11:43 +08:00
wangwei
7179cc34a7 [ISSUE #2749]dumpAllTaskMgr did not add the correct processor
rebase develop
2020-05-21 22:03:16 +08:00
chuntaojun
87a32a926b refactor: merge develop 2020-05-21 18:08:29 +08:00
chuntaojun
c615699933 refactor: removes the request forwarding logic for the configuration module 2020-05-21 14:53:23 +08:00
chuntaojun
c4a93d1c37 refactor: code refactor 2020-05-20 15:45:15 +08:00
chuntaojun
10d8edb4f3 refactor: optimize code logic 2020-05-19 14:16:52 +08:00
chuntaojun
b8dddf0ec1 refactor: block initialization before dump completes 2020-05-19 14:04:11 +08:00
chuntaojun
f9412fd4d6 fix: fix config dump 2020-05-18 22:57:40 +08:00
chuntaojun
587a0937c9 refactor: perform consistency logic 2020-05-17 23:13:40 +08:00
chuntaojun
eb64afecba perf: optimize the configuration publishing process 2020-05-16 22:47:49 +08:00
chuntaojun
baae3c7572 perf: config 2020-05-16 22:04:06 +08:00
chuntaojun
feebd1623f refactor: performance optimization 2020-05-16 19:23:11 +08:00
chuntaojun
b86f633c8a Merge branch 'develop' of https://github.com/alibaba/nacos into feature_1.3.0_beta_grpc 2020-05-16 14:36:49 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
chuntaojun
a317c7a80b refactor: jraft node removal logic optimization 2020-05-15 15:20:39 +08:00
chuntaojun
08623c9ef3 refactor: support grpc 2020-05-14 18:10:40 +08:00
chuntaojun
0c6a03724a fix: fix grpc-version bug 2020-05-14 16:25:41 +08:00
chuntaojun
a68f5e22cf fix: fix code style 2020-05-13 18:14:27 +08:00
chuntaojun
82bcbd9b17 refactor: jRaft partial logical adjustment 2020-05-13 09:38:46 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
zongtanghu
f46fa41d1e [#2738]add tenant legality verification. 2020-05-11 19:48:51 +08:00
yanlinly
9f4061eed6
Revert "[#2738]add tenant legality verification." 2020-05-11 19:33:57 +08:00
zongtanghu
c2c752a969 Merge remote-tracking branch 'origin/feature_tenant_verify' into feature_tenant_verify
# Conflicts:
#	client/src/test/java/com/alibaba/nacos/client/BeatReactorTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
2020-05-11 18:57:41 +08:00
zongtanghu
71ce203768 [#2738]rebase and resolve conflict codes. 2020-05-11 18:13:06 +08:00
zongtanghu
b7207cbe73 [#2738]Put ParamUtils into origin place for tenant legality verification. 2020-05-11 18:06:20 +08:00
zongtanghu
0305c0d01f [#2738]add tenant legality verification. 2020-05-11 18:05:01 +08:00
zongtanghu
18de6388a0 [#2738]remove redundant codes. 2020-05-11 16:59:09 +08:00
zongtanghu
f71c435f89 [#2738]remove redundant codes. 2020-05-11 16:51:06 +08:00
zongtanghu
1bb7613ff2 [#2738]Put ParamUtils into origin place for tenant legality verification. 2020-05-11 15:57:53 +08:00
zongtanghu
2b091f1a5d [#2738]add tenant legality verification. 2020-05-11 11:13:38 +08:00
chuntaojun
6a6725a269 fix: fix expansion issues 2020-05-09 20:32:55 +08:00
chuntaojun
5879b03c7d fix: expansion and volume timing issue fixed 2020-05-09 14:49:04 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
chuntaojun
5e281892a1 refactor: remove debug log 2020-05-07 00:33:06 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +08:00
chuntaojun
60b84a4981 refactor: merge upstream develop 2020-05-05 16:06:02 +08:00
chuntaojun
1563dc7104 fix: fixed a problem where parameters were encoded multiple times 2020-05-05 09:43:54 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
chuntaojun
a82bcc1d6e fix: fix request transfer bug 2020-05-02 13:12:38 +08:00
chuntaojun
eca2aca6bb fix: bug fix 2020-05-01 10:09:08 +08:00
chuntaojun
eb11ff945b fix: fix standalone sync node info bug 2020-04-30 20:02:54 +08:00
chuntaojun
041effebc7 refactor: some code refactor 2020-04-30 13:46:04 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
chuntaojun
a025e56b3a fix: fix config dump bug 2020-04-28 15:08:38 +08:00
chuntaojun
bf94c96af1 refactor: none 2020-04-24 22:43:15 +08:00
chuntaojun
41e1f04914 refactor: code refactor 2020-04-24 22:42:02 +08:00
chuntaojun
853a8f587f refactor: core
logic optimization
2020-04-22 22:16:27 +08:00
chuntaojun
ef405e09e2 refactor: remove complex listening logic and bug fixes 2020-04-22 17:28:53 +08:00
chuntaojun
f222dccd3d refactor: code optimization 2020-04-21 17:14:59 +08:00
wangwei
dcdbaf50ea use MD5Utils replace MD5 2020-04-20 14:18:23 +08:00
wangwei
aeb14910e7 unify the MD5 generation on both sides by MD5 utility classes in the common module 2020-04-19 18:42:59 +08:00
chuntaojun
a9918f2332 refactor: request forwarding logic adjustment 2020-04-19 09:25:28 +08:00
chuntaojun
0b3b5e83ac refactor(all): code optimization 2020-04-16 23:50:08 +08:00
chuntaojun
1aca7bc3e0 refactor: core 2020-04-13 22:44:08 +08:00
chuntaojun
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
chuntaojun
9f8c19cafb refactor: Change the distributed ID logic 2020-04-02 19:24:11 +08:00
chuntaojun
66db5207d3 fix: merge upstream develop 2020-03-30 13:42:55 +08:00
Peter Zhu
b7a2c756fe
Merge pull request #2403 from lkxiaolou/develop
fix checksum bug #2401
2020-03-29 23:01:48 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
chuntaojun
3dd42fed27 refactor: Generic fetch method modification 2020-03-27 18:48:00 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
da7ef15196 style: fix code style 2020-03-26 20:53:46 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
lkxiaolou
83c098b8ca 统一md5计算 2020-03-14 17:54:06 +08:00
liaochuntao
76ca05edc1
Merge pull request #2304 from KeRan213539/fix#2275
fix #2275
2020-03-13 18:48:41 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
025b1b4980 Fix test case error 2020-03-02 16:47:13 +08:00
nkorange
cc0a4915c7 Merge branch 'develop_1.2.0' into develop
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2020-02-27 16:18:54 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
374c575c79 #1105 fix bug 2020-02-04 17:21:33 +08:00
qq213539
9673afd068 修改重复代码 2020-01-17 17:08:51 +08:00
zhanglong
74b9d3a197 Fixed heath check error with Nacos by standalone #2295 2020-01-17 01:45:57 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
qq213539
58db0e266e fix #2275 2020-01-14 16:33:06 +08:00
nkorange
2da88de159 Fix findbugs 2020-01-12 16:57:03 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control
Feature access control
2020-01-10 17:54:29 +08:00
Peter Zhu
47f1085563
Merge pull request #2283 from rushsky518/log_config
#2245 correct log config
2020-01-10 16:04:29 +08:00
Peter Zhu
a96cb67f44
Merge pull request #2276 from langghaha/develop
replace null return value
2020-01-10 16:02:38 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop
receive config change event
2020-01-10 15:41:24 +08:00
Peter Zhu
f4c01068c9
Merge pull request #2282 from jzdayz/no_necessary
简化一点代码
2020-01-10 15:25:23 +08:00
Peter Zhu
7e2e530729
Merge pull request #2194 from KeRan213539/sameNamespaceClone#2171
Same namespace clone#2171
2020-01-10 15:24:35 +08:00
rushsky518
91368b4389 #2245 correct log config 2020-01-10 14:46:32 +08:00
jzdayz
6a88ca3539 简化一些代码。。 2020-01-10 09:46:10 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
langghaha
6f777607d8 replace null return value 2020-01-08 19:07:50 +08:00
Qin Meijie
aa9cd362e3 Fix #1781 2020-01-07 10:13:50 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
b415ddaedf #1105 Access control finish 83% 2019-12-26 15:01:43 +08:00
qq213539
54043f7735 修改配制导出的文件名中的日期格式为 yyyyMMddHHmmss 2019-12-24 17:39:27 +08:00
qq213539
29fd50456f Merge branch 'develop' into sameNamespaceClone#2171
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-12-20 15:02:30 +08:00
qq213539
0723fa279d tenantInfoCountByTenantId 2019-12-19 12:36:18 +08:00
Peter Zhu
a44fa8d0d9
Merge pull request #2163 from KeRan213539/customNamespaceId
Custom namespace id
2019-12-19 11:38:18 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
qq213539
6ee99aaf5a #2171 服务端部分 2019-12-18 14:41:56 +08:00
nkorange
2460dcddcb #1105 Access control finish 70% 2019-12-12 21:50:34 +08:00
nkorange
013125c1ee #1105 Access control finish 60% 2019-12-12 18:57:36 +08:00
qq213539
b47cb1e381 sql注入修改 2019-12-12 09:26:04 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
qq213539
6703b2abbb #2145 自定义namespaceId 服务端部分 2019-12-10 21:18:56 +08:00
shenggangshu
7e277ae2f1 fix #2142 CI error 2019-12-04 11:36:28 +08:00
shenggangshu
1082539d89 refactor #2134 optimization code 2019-12-03 18:45:10 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
2acee95885 #1550 完善单元测试 2019-11-30 13:22:47 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
Peter Zhu
a219dbeafc
Merge pull request #2061 from MistRay/develop
fix #1966
2019-11-25 20:51:40 +08:00
Peter Zhu
3b19a30a32
Merge pull request #2085 from lzf971107/a_1
optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type
2019-11-25 13:20:23 +08:00
黄大相
31a59e8451 fix 2025 2019-11-21 16:19:51 +08:00
withthewind
ec6e52ee9d optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type 2019-11-21 15:59:28 +08:00
junyi
36a5259930 add toUpperCase 2019-11-14 15:36:03 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
nkorange
0212de87a3 fix #2000 2019-11-06 13:46:39 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Beldon
927e8d6fe4 Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
#	console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
2019-10-21 22:36:24 +08:00
rushsky518
a815d7b7de Merge branch 'develop' of https://github.com/rushsky518/nacos into develop
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
2019-10-11 20:09:19 +08:00
rushsky518
f3bd147317 #1550 nacos server return config type 2019-10-11 19:58:42 +08:00
ly
221d81dab8 Clean up redundant StringUtils 2019-09-25 20:49:37 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
Fury Zhu
4b1a65c1cf
Merge pull request #1659 from Diffblue-benchmarks/add-GroupKey-tests
Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
2019-09-19 17:19:31 +08:00
Beldon
83aa8e2186 clean controllers code 2019-09-18 00:12:20 +08:00
chuntaojun
5074d06903 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-09-11 22:44:02 +08:00
chuntaojun
8c47619af9 feat: 2019-09-11 22:43:57 +08:00
xianlaioy
08e69a0b21 refactor: 局部变量是线程安全的;
urlPattern改成static final;
          GroupKey重构
2019-09-09 20:15:19 +08:00
xianlaioy
7b5c6e9273 style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:56:14 +08:00
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:55:02 +08:00
ly
40be568c01 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-31 10:39:42 +08:00
ly
59a36f91e4 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-30 21:31:40 +08:00
ly
1fd5ee360e [Issue] #1769 Solve the bug of the clone configuration function 2019-08-29 01:23:12 +08:00
Thomas Perkins
934c4238c1 Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
These tests were written using Diffblue Cover
2019-08-06 17:15:01 +01:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00
nkorange
15c913e346 Update version to 1.1.2 2019-08-06 17:10:37 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3
format code
2019-08-01 11:04:24 +08:00
Fury Zhu
9b2367eb91
Merge pull request #1552 from nkorange/hotfix_log_optimization
Fix #290
2019-08-01 11:02:55 +08:00
yanlinly
ebca6772bd
Merge pull request #1547 from wfnuser/develop
feat: support update password api
2019-08-01 10:31:36 +08:00
Fury Zhu
b0dd759a85
Merge pull request #1511 from KeRan213539/multipleSelectionDeletion
Multiple selection deletion
2019-07-30 17:11:40 +08:00
Fury Zhu
ad5c249e7c
Merge pull request #1499 from chuntaojun/fix_issue_1492
feat(config): support different db name and password
2019-07-30 14:52:29 +08:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
wfnuser
c5aec4c227 feat: support update password api 2019-07-14 22:28:34 +08:00
赵禹光
8320701f2e fmt 2019-07-11 20:27:59 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
赵禹光
1042831c2a fmt 2019-07-11 20:22:31 +08:00
赵禹光
60ae75f870 fmt 2019-07-11 20:21:10 +08:00
keran
b0530d6558 多选删除接口部分 2019-07-09 17:27:03 +08:00
keran
ac5acc9c6a Merge branch 'develop' into multipleSelectionDeletion 2019-07-09 14:13:27 +08:00
Fury Zhu
627331ef12
Merge pull request #1508 from KeRan213539/develop
导出查询结果增加dataId条件,修复导入失败的问题
2019-07-09 14:07:35 +08:00
keran
a39d288d15 导出查询结果增加dataId条件,修复导入失败的问题 2019-07-09 13:40:02 +08:00
keran
6f8bd9b1b1 增加多选删除的服务端接口 2019-07-09 11:15:09 +08:00
nkorange
65c2f55617 Fix standalone use derby failed bug 2019-07-09 11:04:00 +08:00
nkorange
d8eef4f2f5 Fix standalone mode cannot use MySQL bug. 2019-07-08 11:00:00 +08:00
chuntaojun
93a9b089cc feat(config): support different db name and password 2019-07-06 12:03:14 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
Fury Zhu
402b31adb6
Merge pull request #1254 from KeRan213539/exportAndImport
#1115 feature: configs export/import and clone
2019-07-02 12:42:30 +08:00
Fury Zhu
702289ad69
Merge pull request #1454 from zhaoyuguang/zen1
Fix #1453
2019-07-02 11:44:49 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
keran
51990b6a11 还原误提交的 2019-07-01 17:52:17 +08:00
keran
61b6302625 按照review意见修改 2019-07-01 17:48:45 +08:00
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
2019-07-01 13:12:03 +08:00
赵禹光
ea5eaf5441 fix2 2019-07-01 11:59:04 +08:00
赵禹光
179f810d89 bugfix and opt 2019-07-01 11:45:19 +08:00
Fury Zhu
fe950dccc2
Merge pull request #1401 from slievrly/develop
optimize array and negated codestyle
2019-06-30 22:47:46 +08:00
Fury Zhu
268d1d4ea9
Merge pull request #1443 from iHelin/develop
[ISSUE #1442] Fix JSONUtils#deserializeObject method.
2019-06-30 22:41:13 +08:00
nkorange
2c4e659d6c Update version to 1.0.2-SNAPSHOT 2019-06-28 17:51:04 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
keran
98edb0edfa 统一code枚举和result生成工具 2019-06-28 15:43:16 +08:00
iHelin
368b355fca Modify JSONUtils's deserializeObject method. 2019-06-28 15:23:06 +08:00
Fury Zhu
7ec7f525fd
Merge branch 'develop' into develop 2019-06-28 12:53:19 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
caoyixiong
65a4d27e1e fix 2019-06-26 12:15:11 +08:00
slievrly
f17f40e0af fix review
Signed-off-by: slievrly <slievrly@163.com>
2019-06-25 21:42:13 +08:00
Fury Zhu
94f034bccf
Merge pull request #1407 from slievrly/junit
optimize junit
2019-06-24 10:23:47 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier
optimize modifier access
2019-06-24 10:17:39 +08:00
slievrly
15ad43b924 optimize junit
Signed-off-by: slievrly <slievrly@163.com>
2019-06-20 14:40:57 +08:00
slievrly
e01a44702b optimize charset、continue and return
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:47:55 +08:00
slievrly
21bf279532 optimize modifier access
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:12:43 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
slievrly
8d74ac90aa optimize array and negated codestyle 2019-06-19 22:35:52 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
Fury Zhu
c691739300
Merge pull request #1365 from IanCao/dev_cyx
format code and remove useless code
2019-06-17 16:58:01 +08:00
赵禹光
170a0d7d0a better 2019-06-15 12:52:54 +08:00
赵禹光
ebeacb0e31 Avoid accessing static variables or static methods of this class through object references of a class. It increases the cost of compiler parsing and can be accessed directly by class name. 2019-06-15 00:16:51 +08:00
赵禹光
10aa620315 All overriding methods must be preceded by @Override annotations. 2019-06-14 18:54:04 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
chuntaojun
ecc015402e refactor(nacos-client): 修改与本pr无关的注释信息 2019-06-07 21:25:09 +08:00
chuntaojun
456e84785f refactor(nacos-client:config): Rewrite the HTTP retry rule 2019-06-07 18:41:08 +08:00
chuntaojun
5623577a36 refactor(nacos-client): 修改config的LongPoll轮询的机制 2019-06-06 21:44:42 +08:00
chuntaojun
1f102f52f4 feat: 2019-06-06 20:38:24 +08:00
chuntaojun
72a3a9b213 feat: 2019-06-05 22:31:09 +08:00
pbting
9963ca5f3f change the version 2019-05-31 15:25:25 +08:00
pbting
c4be24a536 nacos client namespace support multi enviroment switch 2019-05-31 15:21:58 +08:00
keran
162f505fad no message 2019-05-28 14:06:53 +08:00
keran
e0fb599303 no message 2019-05-28 13:15:01 +08:00
keran
eb7009003b 修复当导入目标为public时会报namespace不存在的BUG 2019-05-28 13:04:13 +08:00
keran
0321a0a060 删除不该提交的测试 2019-05-27 22:48:56 +08:00
keran
8e92e5a907 新增克隆相关功能接口 2019-05-27 22:32:19 +08:00
keran
8eba1e4a45 no message 2019-05-23 11:49:08 +08:00
keran
7e01606347 修改注释 2019-05-23 10:38:08 +08:00
keran
4db743072c 新增类加入licences 2019-05-22 16:30:44 +08:00
keran
01a0622c75 增加导入导出功能 2019-05-22 15:31:05 +08:00