Commit Graph

750 Commits

Author SHA1 Message Date
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
KomachiSion
db1314e78e 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:27:04 +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
d568030823 Fix #4701 (#4703)
(cherry picked from commit 2cc0be6ae1)
2021-01-14 21:14:45 +08:00
杨翊 SionYang
2cc0be6ae1
Fix #4701 (#4703) 2021-01-14 21:02:28 +08:00
杨翊 SionYang
67eb36976e
Upgrade to 1.4.1 (#4695) 2021-01-14 11:36:57 +08:00
杨翊 SionYang
d22e5909d4
Build nacos console front for 1.4.1 (#4690) 2021-01-13 20:13:32 +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
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
haoyann
c979b9eefc remove JwtTokenUtils 2021-01-04 23:31: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
haoyann
374e7e39d8
[ISSUE #3406] fix change self's password fail (#4536)
* fix change self's password fail

* refactor use util Objects
2020-12-28 09:53:40 +08:00
Gagharv
ce57b98332
[ISSUE-#3005] fix ClusterController 403 and some display wrong (#4512)
* fix 3005

* fix 3005
2020-12-23 19:48:03 +08:00
赵延
638d89b70a
[ISSUE-3917] Enhance service detail console web, add metadata filter (#4439)
* add metadata filter at back-end of nacos naming console

* code enhance

* 添加input,tag等组件,初步布局

* 实现页面交互,可添加,删除filter

* 更新filter向后端发起请求获取数据

* 实现更新更改过滤条件,刷新表格

* 添加国际化配置

* 输入完后按空格直接添加,没输入的input给出响应

* 提交单元测试,更新打包后的静态资源

* 修改配置 解决生产环境上sourcemap不生效的问题

* 用hook重构组件InstanceFilter

* 多个集群各自使用过滤

* 解决多集群时,元数据过滤无法单独使用的问题

* revert backend code

* revert metadata filter test

* 只从客户端已获取到的实例中过滤

* 变动更新到打包后的mian.js

Co-authored-by: jzhishu <john1994@foxmail.com>
2020-12-21 10:19:42 +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
杨翊 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
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
孙继峰
c8d46a6046
[ISSUE-#4310] Delete the main function only for testing (#4312) 2020-11-24 13:22:22 +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
杨翊 SionYang
d4b2d2f146
Adapt update service metadata api. (#4260)
* Adapt update service metadata api.

* For checkstyle
2020-11-18 21:09:47 +08:00
nov.lzf
69c84f1397
pmd ,checkstyle (#4252) 2020-11-18 13:46:27 +08:00
nov.lzf
70d976db18
更新版本;集群整体重新负载均衡功能;变更推送内容;推送SLA日志;常量池改造;启动时长链接优化;删除rpc digest 日志 (#4217)
* listen context bugfix.

* 更新版本;集群整体重新负载均衡功能;变更推送内容;推送SLA日志;常量池改造;启动时长链接优化;删除rpc digest 日志
2020-11-12 18:03:07 +08:00
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 (#4206) 2020-11-12 09:18: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
757fc1efeb
Revert "解决前端目录调整后前端访问不了问题 (#4195)" (#4196)
This reverts commit a0bbd562b0.
2020-11-11 13:59:50 +08:00
邪影oO
a0bbd562b0
解决前端目录调整后前端访问不了问题 (#4195) 2020-11-11 10:44:43 +08:00
赵延
f808ffdb65
[ISSUE-#4179] Add index for db.user and db.password (#4186)
* add index for db.user and db.password, to avoid some situation that it contains symbol ','

* add multi data source template

* add line to separate

* Revert "add line to separate"

This reverts commit 390eb6fb

* Revert "add multi data source template"

This reverts commit 4470e633
2020-11-10 17:53:37 +08:00
邪影oO
f01aae73ee
console\src\main\resources\static\console-fe 挪到根目录并改名为 console-ui (#4174) 2020-11-09 11:53:33 +08:00
sanxun0325
fb616483a2
updates the default time zone for interface results (#4073) 2020-11-09 10:56:29 +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
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
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
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
杨翊 SionYang
9e064b7f92
Add client distro sync logic (#3809)
* Adapt query service info request with new model

* Remove indexes when client disconnect

* Add distro sync client data

* Add sync delete client

* Add maintain expired cluster connection client
2020-09-11 20:00:47 +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
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
nov.lzf
682a46d541
loader balance basic support: adjust loader count once and up limit ; switch single (#3752) 2020-09-03 20:29:34 +08:00
nov.lzf
93364734ea
client switch server bugfix ; cluster server connection manage, and loader balance with specific server ip (#3751) 2020-09-03 18:02:55 +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
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
ljhrot
879bfaf7de
Fix revert chunk isn't work in Content Comparison page (#3686) 2020-08-28 10:31:34 +08:00