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

338 Commits

Author SHA1 Message Date
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
chuntaojun
9133814bb9 fix: 2020-03-27 19:03:21 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
57fc219f72 style: Fix License problem 2020-03-27 14:43:55 +08:00
chuntaojun
da7ef15196 style: fix code style 2020-03-26 20:53:46 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
dependabot[bot]
a65d687bc3
build(deps): bump jackson-databind from 2.9.10.1 to 2.9.10.3 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.1 to 2.9.10.3.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-04 22:32:43 +00:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
da4192c4a5 Fix bug 2020-02-06 16:33:23 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
dependabot[bot]
a026820201
Bump jackson-databind from 2.9.10 to 2.9.10.1 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10 to 2.9.10.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-13 09:32:15 +00:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp 
Feature mcp
 2019-10-22 18:02:15 +08:00
nkorange
225f0cae51 Fix findbugs 2019-10-22 17:05:48 +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
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp 2019-10-21 16:21:42 +08:00
nkorange
21e7bcdde0 #1409 Fix PMD 2019-10-15 18:07:27 +08:00
dependabot[bot]
395b20c8ea
Bump netty-all from 4.0.42.Final to 4.1.42.Final 
Bumps [netty-all](https://github.com/netty/netty) from 4.0.42.Final to 4.1.42.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.0.42.Final...netty-4.1.42.Final)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-12 03:04:56 +00:00
nkorange
0b66b0c6fd Update jackson version, see https://nvd.nist.gov/vuln/detail/CVE-2019-16335 2019-09-24 10:57:02 +08:00
chuntaojun
2802247d6c Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-08-13 21:41:30 +08:00
chuntaojun
e981f3f787 feat: 2019-08-13 21:41:26 +08: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
pbting
e45546bc66 upgrade the fastjson version 2019-07-29 09:30:02 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458 
support address server mode ,so nacos client will use the endpoint to initializer
 2019-07-01 23:08:08 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
nkorange
bce13d20ac Fix config error 2019-06-12 16:45:46 +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
pbting
37b880b72a remove the distributionManagement 2019-05-31 16:16:43 +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
Fury Zhu
d5b5dbb85e
Merge branch 'develop' into hotfix_jackson_vulnerability 2019-05-24 19:35:36 +08:00
nkorange
9ccce18e16 Update jackson version 2019-05-24 17:23:51 +08:00
keran
6bd8aebd21 增加集成测试 2019-05-24 15:19:02 +08:00
xiaochun.xxc
effb66c386 梳理nacos集测ignore用例 2019-05-07 16:05:41 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
Fury Zhu
3d94644eb4
Merge pull request #1043 from alibaba/hotfix_recognize_080_data 
Hotfix recognize 080 data
 2019-04-10 21:07:40 +08:00
nkorange
8d9b91e712 Fix #1041 2019-04-10 20:03:52 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
nkorange
4dc40311e6 Update version to 1.0.0-RC3 2019-04-03 10:43:08 +08:00
Fury Zhu
e0547c82ca
Merge pull request #997 from alibaba/feature_naming_group 
Feature naming group
 2019-04-02 20:57:04 +08:00
yanlinly
acaee3ffb5
Merge pull request #993 from alibaba/del_warnings 
Remove spotbugs-annotations dependency
 2019-04-02 10:31:06 +08:00
water.lyl
0b6246e9f5 remove lgpl dependency 2019-04-01 21:16:44 +08:00
xuechaos
178b80ea41 del warnings spotbugs-annotations #981 2019-04-01 21:16:14 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
nkorange
493715973f Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-02-26 17:29:22 +08:00
hxy1991
0e9d3e678a Fixes #240 #826 #827 #828 2019-02-26 14:22:38 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
water.lyl
fcbb582e53 1、Fix HmacSHA256 not available，change -Djava.ext.dirs 
2、update jjwt to newest version
3、longger security key,and change hs512 to hs256
 2019-01-16 22:54:51 +08:00
nkorange
425a80167b Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-01-15 18:15:55 +08:00
nkorange
e9811c84c6 Merge branch 'develop' into feature_multi_tenant 2019-01-15 14:55:59 +08:00
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +08:00
water.lyl
917ab72ca1 Fix #381 fix build problem 2019-01-15 11:47:14 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2019-01-14 16:59:13 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# 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/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
 2019-01-14 16:01:14 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
qingliang.ql
2a5df09a53 upgrade springboot 2019-01-07 20:30:24 +08:00
nkorange
fed3c3f986 #498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT 2019-01-07 17:57:13 +08:00
wfnuser
128e8bd0ae init the jwt 2018-12-24 02:07:48 +08:00
nkorange
ffa9f92812 Merge branch 'develop' into 0.7.0 2018-12-14 20:02:37 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
nkorange
d2e4f4e6b4 Merge branch 'feature_cmdb' into 0.7.0 
# Conflicts:
#	api/pom.xml
#	api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/conf/nacos-logback.xml
#	distribution/pom.xml
#	distribution/release-nacos.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
 2018-12-14 17:15:32 +08:00
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
zhichen
bd979c24f9 update nacos-all 2018-12-14 13:52:58 +08:00
hxy1991
e4e9574379 exclude .editorconfig when running apache-rat:check 2018-12-10 20:19:30 +08:00
nkorange
3198ec69ca #187 Refactor some logic 2018-12-10 15:37:48 +08:00
xuechaos
d4edde980b Nacos release 0.6.0 version 
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
 2018-12-07 15:19:43 +08:00
xuechaos
b39733e463 findbugs-maven-plugin version to 3.0.4 
issue #366
 2018-12-07 14:31:31 +08:00
nkorange
7d2f652b36 #187 Refactor selector 2018-12-06 20:14:07 +08:00
nkorange
aace49640a #187 provide CMDB module 2018-12-05 12:08:49 +08:00
nkorange
78523976ba #97 Support integrating to third-party CMDB to filter service providers by their labels. 2018-12-03 17:56:11 +08:00
nkorange
67ebd02408 Merge branch 'develop' into feature_cmdb 2018-12-03 09:52:32 +08:00
nkorange
a9fbc622a2 Add CMDB module 2018-11-22 20:31:53 +08:00
zhichen
5f4e149b00 remove redundant js 2018-11-22 14:29:48 +08:00
zhichen
227a5154fe udpate: add some fe files to rat config 2018-11-20 15:18:29 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
nkorange
b99833cb50 Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 20:34:44 +08:00
xuechaos
7b38731f54 feature : Maven build project Support JDK 11 
issue #302
 2018-11-16 19:59:27 +08:00
nkorange
93246b3ded Merge branch 'naming-model-refactor' into develop 
# Conflicts:
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2018-11-16 19:59:15 +08:00
nkorange
57f2ae4eca Update version 2018-11-16 19:41:19 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
xuechaos
0f51707171 fix maven-surefire-plugin args support jdk 1.8 2018-11-16 14:42:45 +08:00
xuechaos
b6e1ad91b8 feature : Support JDK 11 
issue #214
 2018-11-16 14:22:12 +08:00
nkorange
46c141900e Fix PMD 2018-11-16 12:07:25 +08:00
hxy1991
c6a32e5357 Fixes "unapproved license" issue 2018-11-16 00:29:41 +08:00
nkorange
361ae0b2dd Fix raft publish bug 2018-11-15 14:19:08 +08:00
yangyshdan
f6b39ed309 #166 2018-11-08 16:00:01 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
c32fbd9f65 update lisence header 2018-10-26 21:02:33 +08:00
xuechaos
9275dd7c24 update copyright 2018-10-25 19:02:32 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
xxc
b87efc470e
Merge pull request #140 from alibaba/0.3.0 
0.3.0
 2018-10-19 17:24:29 +08:00
hxy1991
43452229bf update pom.xml for release client jar 2018-10-19 15:41:47 +08:00
nkorange
fa163631a1 Update version to 0.3.0-rc1 2018-10-18 23:06:42 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
mercyblitz
3b5eb060e8 Polish alibaba/nacos#103 2018-10-01 12:15:21 +08:00
mercyblitz
83f536b27d Polish alibaba/nacos#102 2018-10-01 11:43:48 +08:00
mercyblitz
99b5827409 Polish alibaba/nacos#101 2018-10-01 11:19:53 +08:00
xiaomage
421e9a347f Bug fix 2018-10-01 10:00:29 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
hxy1991
04045bee77 Fix #91 2018-09-28 16:14:05 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check 
close #79
 2018-09-26 20:05:17 +08:00
caogu.wyp@alibaba-inc.com
5dfd4b6451 update version 2018-09-26 19:59:41 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
hxy1991
65153c3138 Update "pom.xml" for removing <distributionManagement> 2018-09-19 22:23:47 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
hxy1991
ee0575b1c2 Merge branch 'upstream' into 0.2.1 2018-09-19 21:17:22 +08:00
water.lyl
9839062d32 Fix #67 
The configuration module log is changed to config
 2018-09-19 19:15:54 +08:00
xxc
a976d37808
Update pom.xml 2018-09-17 23:13:14 +08:00
xuechaos
71c4c43e27 update pom 2018-09-17 23:08:31 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
water.lyl
de1d976432 Merge remote-tracking branch 'origin/0.3.0' into v0.2 
* origin/0.3.0: (32 commits)
  [modify info] restruct equal name to void conflict
  [motify info] fix pmd
  [motify info] Api split
  fix bug and change some input style
  fix: modify wrong code
  [motify info] fix rollback problem
  update code
  [motify info] push web ui,and build shell
  gitignore add build dir
  fix: setParams decode bug
  [motify info] push static result
  [motify info] fix edit info
  [motify info] push build result,and fix namespace undefined problem
  fix tags bug
  update add index.css
  [motify info] mix useful
  [motify info] push core ui
  feat: add i18n feature
  替换白底logo
  update: update header css
  ...
 2018-09-13 15:48:24 +08:00
water.lyl
8719aea7c7 [motify info] Api split 2018-09-13 11:30:25 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00