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

3174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 (#4206) 2020-11-12 09:18:45 +08:00
Gagharv
7baa696983
[ISSUE-#4181] fix url replace logic error，adjust the getContextPath logic (#4203) 2020-11-11 21:25:12 +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
liaochuntao
7a44dcbb7d
fix: fix issue 4187 (#4194) 2020-11-11 17:49:25 +08:00
蚊子猫
bc7a153ec0
add commons-lang3 dependency into core and sys, prepare to remove lang/lang3 dependency in common/api/client. (#4198) 
Change-Id: I4b7a0bec09359e64ecf997b123b85c265bfe16cf
 2020-11-11 17:46:47 +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
赵延
4e26b0da84
move relation doc info to naming module. (#4193) 2020-11-11 10:31:35 +08:00
杨翊 SionYang
8950304f03
Revert "[ISSUE #3102] Create utils class to nacos-common (#4165)" (#4191) 
This reverts commit cf92d19d03.
 2020-11-10 18:21:59 +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
杨翊 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
蚊子猫
cf92d19d03
[ISSUE #3102] Create utils class to nacos-common (#4165) 
* [ISSUE #3102] Create utils class to nacos-common.

Change-Id: I30970371b86a032366bd66c7b031a4cc3085512e

* [ISSUE #3102] Create utils class to nacos-common, fix check style errors.

Change-Id: I4711ad2b64a4265379f5d7df7434352e69c3760d
 2020-11-09 19:30:56 +08:00
邪影oO
f01aae73ee
console\src\main\resources\static\console-fe 挪到根目录并改名为 console-ui (#4174) 2020-11-09 11:53:33 +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
赵延
48d0c68527
[ISSUE-#4166] Optimize notifyCenter code (#4167) 
* enhance notify center code quality

* reverse the judge logic
 2020-11-09 11:17:30 +08:00
sanxun0325
fb616483a2
updates the default time zone for interface results (#4073) 2020-11-09 10:56:29 +08:00
杨翊 SionYang
10e00e8cd3
Use SPI to load health check interceptor (#4154) 2020-11-06 17:31:24 +08:00
杨翊 SionYang
c81bb5b722
Add NacosServiceLoader and replace ServiceLoader usage directly (#4151) 
* Add NacosServiceLoader

* Replace ServiceLoader by NacosServiceLoader
 2020-11-06 14:46:28 +08:00
mai.jh
51fa1c052a
for #3832, add common http client shutdown method. (#4150) 2020-11-06 14:44:22 +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
杨翊 SionYang
0d4f882835
Merge pull request #4149 from KomachiSion/feature_support_grpc_core 
Synchronize develop branch and upgrade version to 2.0.0-ALPHA
 2020-11-05 20:06:48 +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
邪影oO
6ddfa3e997
fix the occasional failure of CI (#4131) 
* fix the occasional failure of CI

* 修复错误的修改

* no message
 2020-11-05 10:12:06 +08:00
赵延
4cd19990f2
[ISSUE-#4066] Make serviceNameList followed string order (#4087) 
* make serviceNameList followed string order

* code format
 2020-11-05 09:54:25 +08:00
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT (#4135) 2020-11-05 09:43:33 +08:00
赵延
c38ee0b34c
com.alibaba.nacos.naming.controllers.ServiceController.list param groupName support '*' to get all group serviceName (#4133) 2020-11-05 09:23:02 +08:00
mai.jh
796849b17d
refactor: delete the old http client code marked as @Deprecated (#4122) 2020-11-05 09:10:30 +08:00
赵延
053b7819d6
[ISSUE-#4125] Fix param check in com.alibaba.nacos.common.utils.MapUtils#computeIfAbsent (#4126) 
* fix param check mismatch

* add map check
 2020-11-04 16:41:07 +08:00
Gagharv
1282445cf6
Reduce unnecessary InetAddress.getLocalHost() calls (#4095) 
* Reduce unnecessary InetAddress.getLocalHost() calls

* Set workerId to instance variables to ensure that its value can be different on the same server
 2020-11-03 10:54:50 +08:00
mai.jh
83daa1a909
Merge pull request #4118 from KomachiSion/1.4.0 
Upgrade to 1.4.0
 2020-11-02 19:58:05 +08:00
KomachiSion
adbcb7549d Upgrade to 1.4.0 2020-11-02 19:09:19 +08:00
杨翊 SionYang
9c39757580
Use interceptors and checkers to refactor client beat check task (#4112) 
* Add Health check Interceptable to decouple task and responsible

* Move v2 heart beat class to heartbeat package.

* use interceptors and checkers to refactor client beat check task
 2020-11-01 19:41:55 +08:00
liaochuntao
4203eec7a4
fix: fix issue #4110 (#4111) 2020-11-01 19:37:29 +08:00
Xinda
29d82c4a1a
fix: typo fix in ServiceManager (#4101) 2020-10-31 13:14:45 +08:00
杨翊 SionYang
d8b3c1ecf2
Async some time-consuming operation and add metadata (#4099) 
* async update ip port client heart beat

* async push service data

* Remove unused class

* Judge ip port tag by server member ability

* Remove unused codes in HealthCheckCommon

* Add metadata

* Get client beat check timeout from metadata first.
 2020-10-30 17:00:09 +08:00
Hoswey
45049b426a
Update codeStyle.md (#4092) 
修改错误拼写

Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2020-10-30 16:53:31 +08:00
sanxun0325
2fef8f2466
refine GoClient value (#4043) 2020-10-29 16:19:28 +08:00
赵延
5776775325
fix com.alibaba.nacos.naming.core.ServiceManagerTest#testUpdateIpAddressesNoInstance unit test can't pass (#4069) 2020-10-28 14:00:55 +08:00
Geertjan Wielenga
adf07eb935
Create maven.yml (#4076) 2020-10-28 10:44:18 +08:00
赵延
bdbb3de62e
[ISSUE-#4056] Ignore load data from remote when standalone mode (#4061) 
* ignore load data from remote when standalone mode

* refactor. move standalone mode check from DistroLoadDataTask to DistroProtocol

* rename variable loadCompleted to isInitialized
 2020-10-26 19:58:07 +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
杨翊 SionYang
9ecc17ec17
Merge pull request #4034 from alibaba/jraft_naming_fix_commit_log 
Merge jraft naming to develop branch
 2020-10-21 15:43:34 +08:00
KomachiSion
fc33fb211c Fix integration test error 2020-10-21 13:49:16 +08:00
KomachiSion
7ad96444c8 Fix unit test error in ci 2020-10-21 10:42:50 +08:00
KomachiSion
cf607a47cd For checkStyle 2020-10-21 09:45:14 +08:00
KomachiSion
5d068a96c7 Merge branch 'jraft_naming' into jraft_naming_fix_commit_log 
# Conflicts:
#	console/src/main/resources/static/js/main.js
 2020-10-21 09:24:53 +08:00
wangpin
acc865d441
Modify the startup script custom configuration first default configuration (#4021) 2020-10-20 20:11:50 +08:00
杨翊 SionYang
4ee7626bd9
Merge pull request #4024 from alibaba/revert-4023-jraft_naming 
Revert "Naming module Raft protocol migration"
 2020-10-20 14:33:01 +08:00