KomachiSion
fd06b5a7b6
Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
...
# Conflicts:
# address/pom.xml
# api/pom.xml
# auth/pom.xml
# client/pom.xml
# cmdb/pom.xml
# common/pom.xml
# config/pom.xml
# consistency/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# istio/pom.xml
# naming/pom.xml
# pom.xml
# sys/pom.xml
# test/pom.xml
2021-01-18 10:32:57 +08:00
杨翊 SionYang
1bd67269cd
Use revision to set version and upgrade to 1.4.2-SNAPSHOT ( #4711 )
...
* Use revision set version
* Use revision set version
* Add flatten plugin
2021-01-15 14:37:47 +08:00
杨翊 SionYang
67eb36976e
Upgrade to 1.4.1 ( #4695 )
2021-01-14 11:36:57 +08:00
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
杨翊 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
KomachiSion
11210c057d
Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-dev
2021-01-07 17:09:30 +08:00
haoyann
2be09ae940
change tokenValidityInSeconds default value
2021-01-05 10:41:26 +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
赵延
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
杨翊 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
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
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
赵延
e7c269a2f5
move jwt dependency from console,core to auth. ( #3624 )
2020-08-18 13:38:07 +08:00
赵延
a041c8ef58
[ISSUE #3600 ] Replace the deprecated api of jwt ( #3616 )
...
* replace the deprecated api of jwt
* transfer secretKey to byte array just using String encode with utf-8
2020-08-18 09:23:04 +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
mai.jh
df9ae66fe0
create a nacos-auth module, And add nacos-auth dependency for nacos-core module. ( #3590 )
2020-08-12 19:15:58 +08:00
