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

666 Commits

Author SHA1 Message Date
赵禹光
3503fe29d8 build main 2019-07-22 10:29:52 +08:00
赵禹光
b29c1193f1 Merge commit 'd1127041cf4678b8306101f108d3d463b993a9ca' into fix-1535-1 
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-07-22 10:22:58 +08:00
赵禹光
2f1d88cf8b fix bug 2019-07-22 10:17:55 +08:00
LoadChange
ba1e6a2333 fix: closes #1569 2019-07-20 18:40:26 +08:00
LoadChange
d1127041cf fix: closes #1520 2019-07-20 18:09:04 +08:00
赵禹光
038a50d478 WIP 2019-07-20 14:16:59 +08:00
wfnuser
c5aec4c227 feat: support update password api 2019-07-14 22:28:34 +08:00
LoadChange
5d019cb55e fix: closes #1521 2019-07-14 17:00:53 +08:00
赵禹光
511e134ec5 fix1479 2019-07-13 12:43:01 +08:00
赵禹光
7d0aebccbc fix 1541 2019-07-12 23:38:35 +08:00
ly
a87f0bd2bb Fix #1519 The subscriber list is not displayed correctly 2019-07-11 01:48:11 +08:00
keran
ff7d683d24 多选删除前端部分 2019-07-09 17:25:57 +08:00
nkorange
7ddaf19106 Build console 2019-07-09 14:46:25 +08:00
keran
551f64ba84 导出查询结果增加dataId条件 2019-07-09 13:38:28 +08:00
Fury Zhu
a15fc9faf7
Merge pull request #1494 from loadchange/feat/1.1.0 
Fix ConfigEditor
 2019-07-06 20:06:07 +08:00
LoadChange
8eb2677738 fix: edit configuration show data 2019-07-05 22:17:46 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
Fury Zhu
d2f26bd4e4
Merge pull request #1483 from loadchange/feat/1.1.0 
Fix edit configuration publish beta
 2019-07-05 12:54:11 +08:00
Fury Zhu
fbe01896f7
Merge pull request #1461 from alibaba/feature_address_server 
support address server mode and nacos client will use the endpoint to initializer
 2019-07-05 12:51:39 +08:00
LoadChange
996faf298f fix: edit configuration publish beta 2019-07-05 11:46:37 +08:00
Fury Zhu
9210a507bf
Merge pull request #1482 from KeRan213539/exportAndImportBugFix 
fix: Export and import
 2019-07-05 10:53:19 +08:00
keran
751699200c 修改错别字 2019-07-05 10:40:09 +08:00
LoadChange
592d911b97 fix: edit configuration type default value 2019-07-04 20:37:26 +08:00
LoadChange
b29953a594 fix: closes #1476 2019-07-04 20:15:06 +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
LoadChange
38866a464c fix: closes #1476 2019-07-04 14:39:01 +08:00
LoadChange
17442b6523 fix: config editor beta button 2019-07-04 11:13:23 +08:00
LoadChange
c3f160fe87 fix: config editor 2019-07-03 20:09:09 +08:00
Fury Zhu
c0fc702e9e
Merge pull request #1467 from loadchange/feat/1.1.0 
ConfigEditor support beta
 2019-07-03 18:31:06 +08:00
LoadChange
f39bf12e54 feat: NewConfigEditor api 对接 2019-07-02 22:09:42 +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
LoadChange
a3800864ad feat: NewConfigEditor 2019-07-01 22:07:30 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
keran
51990b6a11 还原误提交的 2019-07-01 17:52:17 +08:00
keran
e7ac873fe3 按照review意见修改 2019-07-01 17:49:18 +08:00
keran
61b6302625 按照review意见修改 2019-07-01 17:48:45 +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
Fury Zhu
75b52924ae
Merge pull request #1436 from loadchange/feat/1.1.0 
Feat component subscribers
 2019-06-27 18:46:18 +08:00
LoadChange
6be57033c2 feat: component subscribers 2019-06-26 11:33:38 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier 
optimize modifier access
 2019-06-24 10:17:39 +08:00
LoadChange
9381a10d1f refactor: closes #1354 2019-06-23 21:55:11 +08:00
Fury Zhu
490e93ddcf
Merge pull request #1402 from slievrly/optimize 
remove unused import
 2019-06-20 13:58:50 +08:00
slievrly
21bf279532 optimize modifier access 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-19 23:12:43 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
nkorange
b52ba3ed91 Fix #1397 2019-06-19 17:57:26 +08:00
LoadChange
fcda55b95e refactor: closes #1352 2019-06-19 12:08:36 +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
zhichen
cdcbf10854 resolve conflict #1084 2019-06-10 16:45:20 +08:00
Fury Zhu
555e323302
Merge pull request #1258 from universefeeler/master 
[ISSUE #876] feature(console):support console show cluster node state
 2019-06-10 16:16:36 +08:00
universefeeler
5d9ae1541d chore(console): adjust console show details 2019-06-10 13:02:12 +08:00
yongchao9
748070cb71 #169 示例代码中的服务名与点击记录进行联动 
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
 2019-06-07 11:56:41 +08:00
universefeeler
d08557a725 chore(clusterNode): adjust some code 2019-06-07 00:19:25 +08:00
yongchao9
320a496625 同步develop分支pom配置 
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
 2019-06-06 08:51:31 +08:00
yongchao9
224bc9c7cc 删除log文件 
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
 2019-06-06 08:43:09 +08:00
yongchao9
a9a809b214 清楚log文件 
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
 2019-06-05 20:49:23 +08:00
yongchao9
0a58348438 Merge remote-tracking branch 'upstream/develop' into hotfix_169 
合并远程develop分支
 2019-06-05 20:43:20 +08:00
yongchao9
c1ac93aee8 同步远程develop分支 2019-06-05 20:43:12 +08:00
yongchao9
3c971e9c45 issue#169 服务列表中增加java示例代码查看功能 提交编译后文件 
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
 2019-06-05 20:36:35 +08:00
universefeeler
ef8e1aac36 Merge remote-tracking branch 'upstream/develop' 2019-06-04 23:43:37 +08:00
Fury Zhu
9319b76d22
Merge pull request #1307 from pbting/namespace_unified 
Namespace And Endpoint Support Multi Enviroment Switch
 2019-06-04 17:15:26 +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
yongchao9
25611359dc issue#169 服务列表中增加示例代码查看功能 提交编译后文件 
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
 2019-05-28 15:53:11 +08:00
keran
8f1edbb93b 删除没用到的变量 2019-05-28 13:05:24 +08:00
keran
0321a0a060 删除不该提交的测试 2019-05-27 22:48:56 +08:00
keran
72d6987b3b 新增克隆相关功能UI 2019-05-27 22:33:11 +08:00
keran
8e92e5a907 新增克隆相关功能接口 2019-05-27 22:32:19 +08:00
zhichen
e680f10ee8 fix #676 2019-05-24 15:47:59 +08:00
keran
545ee944b9 修复:导出的配制只有一个的情况下,在导入时选择重复项终止,该项已存在时提示弹窗不显示的BUG 2019-05-24 14:54:24 +08:00
keran
b2eb97de9b no message 2019-05-23 10:39:18 +08:00
keran
ac0977b711 去除本机开发时增加的数据库配制 2019-05-23 09:11:57 +08:00
universefeeler
c15276cfcb [ISSUE #876] feature(console):support console show cluster node state 2019-05-23 02:41:41 +08:00
keran
6c56240bb9 导入导出前端部分 2019-05-22 15:31:39 +08:00
yongchao9
b54838948e issue#169 服务列表中增加示例代码查看功能 2019-05-20 22:13:42 +08:00
keran
e16a3406e4 修改导出的流程(先弹窗确认),未修改完 2019-05-19 22:30:00 +08:00
keran
ad3a6953cb 导出重写,导出格式兼容阿里云ACM 2019-05-19 16:49:22 +08:00
keran
66d3dfd12d 前端增加上传组件和导出导入功能 2019-05-16 12:40:11 +08:00
LoadChange
7c1afc30c8 fix: closes #1007 2019-05-14 15:18:29 +08:00
justlive1
fd327268fe build 2019-05-13 17:48:57 +08:00
justlive1
11304ff0b6 Merge branch 'develop' of https://github.com/alibaba/nacos 
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-05-13 17:33:32 +08:00
Fury Zhu
1f1b047984
Merge pull request #1126 from XCXCXCXCX/ISSUE_#359 
[#359] provide a way for user to implement their health checkers.
 2019-05-12 11:04:14 +08:00
justlive1
54e2afb7f9 修复服务分组为非DEFAULT_GROUP，服务详情集群列表获取为DEFAULT_GROUP 2019-05-09 16:27:04 +08:00
XCXCXCXCX
6695805c69 Let nacos-server.jar import external jar package 2019-05-08 09:14:54 +08:00
LoadChange
c9a5134de5 fix: group form validation 2019-04-28 14:41:11 +08:00
zhichen
fc6581d6fa feature: add yaml validator #1084 2019-04-19 17:55:43 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
Fury Zhu
ffa1da871d
Merge pull request #1039 from sofior/master 
console 里的public首字母是大写的和命名空间里那个保留控件不一致
 2019-04-14 00:05:31 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
sofior
6cd77572a3 修改Public命令空间和console的大小写一致 2019-04-10 16:16:04 +08:00
nkorange
cab10aa914 Merge branch 'master' into develop 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2019-04-09 16:30:03 +08:00
dungu.zpf
de26e2a8f9 #502 Modify default dispatch thread count 2019-04-09 15:44:50 +08:00
pbting
b7a1fb22b3
Merge branch 'develop' into develop 2019-04-03 19:08:09 +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
suxiaolin
73d13b51a2 fix typo 控件 => 空间 2019-04-03 10:32:11 +08:00
nkorange
2fe8a76c71 Fix console 401 error 2019-04-02 21:36:28 +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
074d243f63
Merge branch 'master' into develop 2019-03-27 10:09:51 +08:00
nkorange
a745423dec Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	pom.xml
#	test/pom.xml
 2019-03-25 15:03:31 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
LoadChange
8ff2ced3be fix: delete service add group name 2019-03-22 15:01:58 +08:00
LoadChange
320d694913 fix: function Mode default home page 2019-03-20 17:19:15 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
qingliang.ql
4cf86dfc66 fix derby size 大于32kb报错问题 2019-03-18 15:49:48 +08:00
xxc
24f6b20634
Merge pull request #899 from jameslcj/feature/issue803 
Integrate UI test unit
 2019-03-18 11:10:00 +08:00
nkorange
7ca6143550 #502 Fix concurrent problem. 2019-03-16 20:07:04 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
LoadChange
feb466864e feat: console add instance ephemeral 2019-03-15 14:58:40 +08:00
LoadChange
cac293aba1 feat: console add instance table column 2019-03-15 11:56:46 +08:00
LoadChange
a3406a0ec5 fix: add serviceDetail groupName 2019-03-14 21:04:50 +08:00
nkorange
86b524127d Merge branch 'develop' into feature_naming_group 2019-03-14 16:17:59 +08:00
LoadChange
4c62afa63b feat: fe add groupName, #269 2019-03-14 15:39:31 +08:00
zhichen
8329f52968 roll back webpack.dev.config.js 2019-03-14 14:03:47 +08:00
zhichen
662264f118 roll back webpack.dev.config.js 2019-03-14 14:00:37 +08:00
zhichen
296009b6f0 add front-end test unit #803 2019-03-14 13:57:58 +08:00
nkorange
902a77aedd Merge branch 'develop' into feature_naming_group 2019-03-13 18:43:13 +08:00
zhichen
dba80be9ec update: change the service detail url 2019-03-13 17:54:27 +08:00
zhichen
b6c341a58b protocol: add license #479 2019-03-13 17:44:50 +08:00
zhichen
5251b12063 update: standardize the editor of metadata #479 2019-03-13 17:34:01 +08:00
nkorange
8d28958cb7 #629 Fix bug 2019-03-08 17:18:01 +08:00
得少
43a51c0f25 #861 2019-03-04 16:56:01 +08:00
nkorange
616a8031bc Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
 2019-03-04 10:12:11 +08:00
xuechaos
80c260e207 Release 0.9.0 Nacos : Nacos server function mode and fix 13 issues 
* [#840] Nacos server adds startup mode to distinguish between config and naming.
* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
* [#240] Log strong dependence problem.
* [#824] getServicesOfServer throws exception if service list is empty.
* [#802] Nacos server multi-boot mode support.
* [#800] Nacos's client-to-server addressing mode document introduction.
* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
* [#759] why instance can't auto-delete.
* [#756] Format of instance and service should be validated.
* [#720] Memory leak in PushService.
* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
* [#588] Client compatible to jdk1.6. On branch develop
 2019-03-01 00:46:50 +08:00
LoadChange
6a6fe71c37 fix: state compatible 2019-02-28 21:10:37 +08:00
xuechaos
f88b8018b5 merge develop to fix merge 2019-02-28 19:50:33 +08:00
zhichen
04bc0e2a03
Merge pull request #738 from loadchange/issues-735 
Fix Issues #735
 2019-02-28 18:03:28 +08:00
xuechaos
678fc8a5f7 update version get for pom 2019-02-28 17:34:25 +08:00
LoadChange
979c2bd6e1 fix: code indentation 2019-02-28 16:06:59 +08:00
LoadChange
fdab4824e0 feat: optimize Console version && Menu 2019-02-28 14:18:10 +08:00
得少
c279d31c10 Merge remote-tracking branch 'origin/develop' into support_ans_developer 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/identify/CredentialWatcher.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
 2019-02-27 20:42:30 +08:00
xuechaos
5711ace91f function mode server code completed 2019-02-27 20:00:05 +08:00
hxy1991
af016f072d Fixes #814 2019-02-27 17:16:06 +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
得少
b3ee9698fa #817 2019-02-22 17:06:02 +08:00
qingliang.ql
eb87625083 fetch self ip 2019-02-22 16:24:26 +08:00
zhanglong
b8aaa5aa7c Fix The number of configurations in the details of the default public namespace is incorrect. #777 2019-02-17 13:29:10 +08:00
nkorange
451863fe33 Update version to 0.8.1 2019-02-15 11:54:10 +08:00
pbting
5e78e9a315
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans 2019-02-15 11:08:03 +08:00
pbting
15e0f30849 fix #367 2019-02-14 18:00:01 +08:00
nkorange
81dd9fbc6b #745 Support service creation in AP mode 2019-02-12 20:11:57 +08:00
LoadChange
589d6c3413 fix: closes #735 2019-02-01 15:27:49 +08:00
nkorange
caf7213c2d #502 Fix serialize problem and do some refactoring for health check 2019-01-27 22:50:41 +08:00
nkorange
e3440fe7f0 #502 tuning Serializer 2019-01-26 23:19:57 +08:00
nkorange
4560b3ca25 Merge branch 'develop' into feature_naming_ap 2019-01-25 11:51:31 +08:00
LoadChange
52d32c85ca fix: RegionGroup height 2019-01-24 15:20:06 +08:00
LoadChange
7b30369447 fix: ServiceList display namespace 2019-01-24 14:28:12 +08:00
nkorange
19b785b20d Merge branch 'develop' into feature_naming_ap 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/RaftController.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	pom.xml
#	test/pom.xml
 2019-01-23 13:50:02 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
LoadChange
b213be7fe9 fix: protectThreshold validator 2019-01-22 21:49:02 +08:00
nkorange
cd8f079609 Merge branch 'develop' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-01-22 15:58:51 +08:00
water.lyl
fc5db210bb Fix #639 fix namespace desc problem 2019-01-22 12:38:06 +08:00
LoadChange
d37228caef fix: new config width 2019-01-22 11:26:40 +08:00
nkorange
cc9b6b58b7 Merge branch 'develop' into feature_naming_ap 2019-01-22 10:13:22 +08:00
water.lyl
e6f07b2db0 Fix #381 add encode password tool 2019-01-22 09:53:54 +08:00
water.lyl
9947e8565c change default user/password to nacos/nacos 2019-01-22 09:42:25 +08:00
LoadChange
79874b26d6 Update fe build 2019-01-21 18:43:49 +08:00
LoadChange
73c98d3541 fix: closes #640, #648 2019-01-21 18:43:49 +08:00
LoadChange
59fd26abaa Update fe build 2019-01-21 18:43:49 +08:00
LoadChange
fdd4521a64 fix: Menu status 2019-01-21 18:43:49 +08:00
LoadChange
aafd30eb2b fix: newconfig style 2019-01-21 18:43:49 +08:00
nkorange
a72467e077 Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	console/src/main/resources/META-INF/nacos-default.properties
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-01-21 15:06:00 +08:00
yanlinly
a63910940a
Merge pull request #666 from wfnuser/enhancement/login-ui-enhancement 
fix the style
 2019-01-21 14:18:47 +08:00
wfnuser
bd063d283d fix the style 2019-01-21 14:10:47 +08:00
qingliang.ql
80bf9717cd add url 2019-01-18 14:26:32 +08:00
qingliang.ql
def3c196a1 add url 2019-01-18 14:24:53 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
Keep
ed4c41fdad
Merge pull request #642 from wuyoushan/fix_jwtAuth_npe 
fix JwtAuthenticationTokenFilter NPE bug
 2019-01-18 10:40:22 +08:00
wuyoushan
e589b29351 fix JwtAuthenticationTokenFilter NPE bug 2019-01-17 20:39:20 +08:00
zhichen
5f9790962b build js 2019-01-17 19:54:49 +08:00
zhichen
98454d6abd fix namespace bugs 2019-01-17 19:51:08 +08:00
zhichen
8f5c6b0b3e update i18n 2019-01-17 10:56:32 +08:00
nkorange
806e7030d2 #502 Fix bean inject error 2019-01-17 10:15:51 +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
yanlinly
3149aabfc4
Merge pull request #632 from wfnuser/enhancement/login-ui-enhancement 
Enhancement/login ui enhancement
 2019-01-16 22:39:34 +08:00
wfnuser
4d711788a5 fix styles of login page 2019-01-16 20:14:29 +08:00
nkorange
980e2a62ef Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-01-16 18:12:54 +08:00
LoadChange
65d9ecf421 Update fe build 2019-01-16 11:39:37 +08:00
LoadChange
ceb86d61a1 fix: API request method 2019-01-16 11:38:26 +08:00
LoadChange
a4b1e38ff6 Update fe build 2019-01-15 21:20:04 +08:00
LoadChange
f19a67fca6 fix: fe done #498 2019-01-15 21:18:36 +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
7fe087dea2 press key enter to login 2019-01-15 13:26:23 +08:00
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +08:00
water.lyl
c9d32ed260 Fix #381 fix findbugs 2019-01-14 23:21:32 +08:00
zhanglong
bf305eaa0e Fix #619 2019-01-14 22:07:49 +08:00
wfnuser
65f2ab2d2c add username and password validator 2019-01-14 21:33:57 +08:00
wfnuser
90c4159d06 fix conlict 2019-01-14 21:08:34 +08:00
wfnuser
062cc07be1 the problem of locale 2019-01-14 20:48:18 +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
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +08:00
water.lyl
a25e5eb650 Fix #381 disable auth config 2019-01-13 13:19:12 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +08:00
nkorange
9898a3c8e4 Merge branch 'develop' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.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/web/ApiCommands.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
 2019-01-11 14:08:13 +08:00
zhichen
9789e13bf6 fix #499 2019-01-10 15:14:51 +08:00
zhichen
b464ce193e fix #499 2019-01-10 15:13:37 +08:00
zhichen
3e02d0d595 fix #499 2019-01-10 15:02:58 +08:00
王彦民
829f538e9f refactor: clean code && Upgrade 2019-01-10 14:06:29 +08:00
王彦民
5d6085fcee refactor: ConfigRollback i18n #474 2019-01-09 15:17:59 +08:00
王彦民
f2f11327c2 refactor: ConfigDetail i18n #474 2019-01-09 13:15:18 +08:00
wfnuser
2db55b1a71 Fix some problem 
1. use post instead of get for auth/login api
2. refactor api filter, but still need to work on it
3. if login failed show some message in front end
 2019-01-09 12:59:10 +08:00
qingliang.ql
fb5bbf3689 merge develop 2019-01-09 11:27:51 +08:00
wfnuser
d09c0e59c9 realization of i18n 2019-01-09 11:18:06 +08:00
王彦民
fa57fa053d refactor: NameSpaceList i18n #474 2019-01-08 14:24:46 +08:00
qingliang.ql
ef5fa53afa console and configfile 2019-01-07 20:53:34 +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
water.lyl
f77dbd0e6d Fix #381 format code, add license info 2019-01-06 21:55:59 +08:00
王彦民
27ca776525 Update fe build 2019-01-06 09:56:24 +08:00
王彦民
5483e733c3 refactor: NewNameSpace i18n #474 2019-01-06 09:56:24 +08:00
王彦民
031863e1ca Update fe build 2019-01-05 19:13:28 +08:00
王彦民
b36dc44868 refactor: ConfigSync i18n #474 2019-01-05 19:13:28 +08:00
water.lyl
6ba58f24c0 Fix #381 persist user info 2019-01-04 15:46:55 +08:00
王彦民
54e69f01bc refactor: SuccessDialog i18n #474 2019-01-03 17:39:20 +08:00
Fury Zhu
35e6daf948
Merge pull request #538 from canglang1973/master 
translate javadoc to English.
 2019-01-03 12:26:11 +08:00
wfnuser
b330e4b4d7 move apis from filter to ignore 2019-01-02 20:45:57 +08:00
wfnuser
14b4c64c24 parse the username from token 2019-01-02 16:51:30 +08:00
leitao1
fd31408ddd translate javadoc to English. 2018-12-29 09:39:48 +08:00
wfnuser
23c7f29e73 custom the authorization exception handler 2018-12-28 23:59:47 +08:00
王彦民
07bfb68c06 refactor: ShowCodeing i18n #474 && fe build 2018-12-28 16:41:52 +08:00
王彦民
404e488a72 refactor: ImportDialog i18n #474 2018-12-28 16:41:52 +08:00
wfnuser
a75e927ee8 logout done 2018-12-28 00:59:34 +08:00
wfnuser
377e5bb936 调通登录链路 2018-12-26 23:32:10 +08:00
wfnuser
ffd184e527 fix the response of login 2018-12-26 21:36:54 +08:00
wfnuser
8855bc5bda auth the apis 2018-12-26 09:38:22 +08:00
wfnuser
09d1edf3eb add login api 2018-12-26 01:11:38 +08:00
wfnuser
ba380e62c8 the auth login api 2018-12-26 00:28:43 +08:00
王彦民
6a3370e2fd refactor: ExportDialog i18n #474 2018-12-25 18:16:36 +08:00
王彦民
d6cb0423a4 refactor: EditorNameSpace i18n #474 2018-12-25 10:50:43 +08:00
王彦民
a2d6eac728 refactor: DiffEditorDialog, ConfigEditor i18n #474 2018-12-24 22:26:20 +08:00
wfnuser
128e8bd0ae init the jwt 2018-12-24 02:07:48 +08:00
王彦民
79f73ff17c refactor: DeleteDialog i18n #474 2018-12-23 20:39:04 +08:00
王彦民
b6491cc25c refactor: CloneDialog internationalization 2018-12-22 20:10:39 +08:00
wfnuser
afba7dc0e1 Merge branch 'login' into feature/login 2018-12-20 14:25:41 +08:00
water.lyl
d0eb373ecc Fix #381 2018-12-19 16:30:28 +08:00
wfnuser
557cadfbea login page almost done 2018-12-18 20:41:33 +08:00
nkorange
64f29ddd78 #187 Add label dump task 2018-12-18 16:03:26 +08:00
wfnuser
9a9c2d7dbd add login component 2018-12-17 19:01:47 +08:00
nkorange
109a196dce Merge branch 'develop' into 0.7.0 2018-12-14 21:15:58 +08:00
zhichen
fb72fa8098 build js 2018-12-14 21:05:04 +08:00
zhichen
8e6e6f0362 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2018-12-14 21:01:53 +08:00
zhichen
135056057c update: the console version 2018-12-14 21:01:33 +08:00
nkorange
71f1d946fd Merge branch 'develop' into 0.7.0 2018-12-14 20:52:00 +08:00