71 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
flystar32	ad11b5b96f	Adds spring profile to circleci, Adds circleci support	2018-10-30 12:44:22 +08:00
format	255dea2c6b	Merge pull request #74 from flystar32/1.x ... add acm and ans module	2018-10-30 11:50:27 +08:00
flystar32	c868ca2fa5	add acm and ans module	2018-10-30 11:48:28 +08:00
xiaojing	b702d891d6	Merge pull request #73 from xiaolongzuo/1.x ... Optimize spring-cloud-alicloud-context module for branch 1.x	2018-10-30 11:19:48 +08:00
xiaolongzuo	c309993fe0	optimize error message.	2018-10-30 11:18:22 +08:00
xiaolongzuo	529926b99d	Delete invalid test cases.	2018-10-30 10:56:20 +08:00
flystar32	7b7cb91258	fix tests	2018-10-30 10:50:56 +08:00
xiaolongzuo	1445c0a007	Fix acm settings bug.	2018-10-30 10:32:52 +08:00
flystar32	a2b158d67d	put all nacos config metadata to bootstrap	2018-10-29 23:01:30 +08:00
xiaolongzuo	b3e22ba73c	Fix version error, ignore alicloud-context tests.	2018-10-29 19:45:53 +08:00
xiaojing	43a4f97907	Merge pull request #70 from xiaolongzuo/1.x ... Add spring-cloud-alicloud-context module for branch 1.x	2018-10-29 15:00:57 +08:00
chenzhu.zxl	76cb758ca0	Add configuration-processor pom.	2018-10-29 14:46:58 +08:00
chenzhu.zxl	6503f8d2cf	Add spring-cloud-alicloud-context module.	2018-10-29 14:35:34 +08:00
format	056d4d9471	Merge pull request #60 from fangjian0423/1.x ... sentinel add logs to query datasource process for branch 1.x.	2018-10-25 11:12:31 +08:00
fangjian0423	d924184fec	sentinel add logs to query datasource process.	2018-10-25 10:47:03 +08:00
xiaojing	5d82ab1c5a	Merge pull request #57 from fangjian0423/1.x ... fix sentinel bug and add a new module spring-cloud-alibaba-sentinel-datasource in branch 1.x	2018-10-24 17:29:36 +08:00
fangjian0423	8190b0f4a1	remove duplicate and put once in datasource registry.	2018-10-24 16:54:18 +08:00
fangjian0423	ed7fb738f0	Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel in 1.x branch	2018-10-24 16:40:08 +08:00
fangjian0423	21c5b964f2	Merge remote-tracking branch 'upstream/1.x' into 1.x	2018-10-24 16:16:36 +08:00
fangjian0423	b374a291be	Add rules automation	2018-10-24 16:08:15 +08:00
Spencer Gibb	ca3f02c281	Adds spring profile to circleci	2018-10-23 16:21:15 -04:00
Spencer Gibb	fe716483ad	Adds circleci support	2018-10-23 16:16:44 -04:00
Spencer Gibb	79b41ceaa6	Updates to snapshot versions	2018-10-23 15:01:13 -04:00
format	6243fa9400	Merge pull request #54 from flystar32/1.x ... update nacos version to 0.3.0-RC1	2018-10-23 14:06:19 +08:00
flystar32	b434af4455	separate namingservice from nacosregistration and discoveryclient	2018-10-22 20:10:41 +08:00
flystar32	cf5d407e85	update nacos version to 0.3.0-RC1	2018-10-22 19:00:34 +08:00
format	b67c39e643	Merge pull request #46 from flystar32/1.x ... separate registry and discovery, Fixes #42	2018-10-19 20:52:18 +08:00
亦盏	27ddaa68a8	separate registry and discovery	2018-10-17 12:35:42 +08:00
format	0f444a40ab	Merge pull request #45 from flystar32/1.x ... add management info to registry metadata, Fixes #41	2018-10-17 10:36:33 +08:00
fangjian0423	41db9c945b	update comments and docs	2018-10-16 16:51:31 +08:00
亦盏	7449073841	add management info to registry metadata	2018-10-16 16:51:29 +08:00
fangjian0423	65f380c064	update sentinel examples and metadata info to support new configurations of sentinel	2018-10-11 23:09:54 +08:00
fangjian0423	e0382d9876	sentinel support more properties in springboot 1.x	2018-10-11 22:14:21 +08:00
flystar32	c8d911e89b	update sentinel version to 0.2.0	2018-10-11 22:03:26 +08:00
format	b9710ada46	Merge pull request #36 from flystar32/1.x ... Fixes #32 support fileExtension yaml and yml	2018-10-11 16:33:15 +08:00
亦盏	a50361c29b	Fixes #32 support fileExtension yaml and yml	2018-10-09 20:54:52 +08:00
flystar32	1620f97b97	update spring cloud build version to 1.3.10	2018-10-08 22:56:01 +08:00
flystar32	5ab2faedb5	update version to 0.1.0	2018-10-08 20:30:03 +08:00
fangjian0423	d79f2ef411	refactor storage module: rename storage to oss	2018-09-30 11:31:47 +08:00
flystar32	bd2783d7fc	update nacos version to 0.2.1	2018-09-30 11:12:55 +08:00
flystar32	541a4bac9d	use method getAllInstances instead of selectInstance to get instance	2018-09-26 12:33:36 +08:00
flystar32	2b953bae69	fix NacosDiscoveryClienet getInstance method, only healthy instancerename alibaba storage to alicloud storage	2018-09-26 11:07:39 +08:00
flystar32	bfa8f24cc8	update nacos config properties , content-type to file-extension	2018-09-20 14:30:00 +08:00
flystar32	21dfd637b3	update example readme nacos port to 8848	2018-09-20 11:42:55 +08:00
flystar32	16d2c1b903	update nacos version to 0.2.1-RC and format code	2018-09-20 11:32:30 +08:00
xiaojing	e2b73fc3f0	Merge pull request #24 from liaozan/1.x ... remove unnecessary comment	2018-09-19 12:33:34 +08:00
liaozan	4931aef5fd	remove unnecessary comment	2018-09-19 11:46:45 +08:00
flystar32	879e689390	update NacosAutoServiceRegistration, update pom.xml, and format code	2018-09-18 14:58:50 +08:00
xiaojing	50ffcef735	Merge pull request #21 from HaojunRen/1.x ... Fixes #19	2018-09-18 14:30:40 +08:00
Nepxion	541eaee0b8	Fixes #19	2018-09-18 14:07:34 +08:00