Commit Graph

2163 Commits

Author SHA1 Message Date
chuntaojun
a659493205 refactor: Uniform configuration format 2020-03-09 15:57:22 +08:00
chuntaojun
b44e7d6f44 docs: remove dir 2020-03-09 15:52:46 +08:00
chuntaojun
8b848873e4 docs: 2020-03-09 15:48:31 +08:00
chuntaojun
8466c347be Merge branch 'fea_auto_clean_service' of https://github.com/chuntaojun/nacos into fea_auto_clean_service 2020-03-09 15:39:44 +08:00
chuntaojun
0a325bf9c7 fix: fix merge confilt 2020-03-09 15:38:03 +08:00
Peter Zhu
aa9a0c045a
Merge branch 'develop' into fea_auto_clean_service 2020-03-09 11:35:12 +08:00
Peter Zhu
f4c527f9b6
Merge branch 'master' into develop 2020-03-09 11:33:31 +08:00
chuntaojun
6a7b664bfb fix(naming): The fix configuration name is different 2020-03-09 11:28:39 +08:00
chuntaojun
0886653a08 feat(naming): Support empty service cleanup task time configurable 2020-03-08 00:00:44 +08:00
chuntaojun
4f264fed2d style(naming): Variable name specification 2020-03-07 11:39:08 +08:00
chuntaojun
86e3b0dbc9 fix(naming): Fixed a namespace parameter passing error 2020-03-06 19:33:06 +08:00
chuntaojun
f8fb011bd6 fix(naming): Fixed finalizeCnt error count problem 2020-03-06 16:36:50 +08:00
chuntaojun
3e403c5655 refactor: remove unuse dir 2020-03-06 16:33:33 +08:00
chuntaojun
f65e4fcbc0 refactor(naming): Optimize the empty service removal logic 2020-03-06 16:32:59 +08:00
chuntaojun
502e9c7597 feat(naming): Support for automatic removal of empty services 2020-03-06 11:42:05 +08:00
nkorange
842818f4f0 Fix namespace get 403 2020-03-04 14:49:16 +08:00
nkorange
eb754eb62b Fix namespace get 403 2020-03-03 20:40:14 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
043a091445 Merge remote-tracking branch 'upstream/develop' into develop 2020-03-02 16:47:28 +08:00
nkorange
025b1b4980 Fix test case error 2020-03-02 16:47:13 +08:00
liaochuntao
7b68943e36
Update README.md 2020-03-02 15:02:03 +08:00
liaochuntao
1579f5544a
Update README.md 2020-03-01 20:21:34 +08:00
liaochuntao
853bc1c8f2
Update README.md 2020-03-01 20:20:33 +08:00
liaochuntao
806ca5c473
Update README.md 2020-03-01 20:20:00 +08:00
liaochuntao
5319897ca2
Merge pull request #2390 from jzdayz/develop
delete duplicate code and fix log error
2020-03-01 16:06:26 +08:00
nkorange
cc0a4915c7 Merge branch 'develop_1.2.0' into develop
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2020-02-27 16:18:54 +08:00
jzdayz
deab304d5b fix log error 2020-02-27 14:41:25 +08:00
jzdayz
1b9e1db351 去掉重复代码 2020-02-27 14:33:47 +08:00
nkorange
0f513c1f20 Merge remote-tracking branch 'upstream/develop_1.2.0' into develop_1.2.0 2020-02-23 20:03:10 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
liaochuntao
701cbbf1d2
Merge pull request #2381 from zhixiangyuan/develop_1.2.0
统一 taskDispatchPeriod 的默认值
2020-02-23 12:01:29 +08:00
zhixiang.yuan
c2743f90eb #2381 modify taskDispatchPeriod defalue value 2020-02-22 19:37:26 +08:00
zhixiang.yuan
aa141e0aac update taskDispatchPeriod default value 2020-02-21 15:24:42 +08:00
nkorange
13126a3af6 Add namespace page access control 2020-02-11 12:26:04 +08:00
liaochuntao
de836a6e2b
Merge pull request #2355 from ZShUn/dev-1.2.0
1.NacosProperties注解添加username password参数
2020-02-11 12:22:35 +08:00
Peter Zhu
938f024b51
Merge pull request #2347 from loadchange/develop_1.2.0
fix: menu config
2020-02-11 10:10:19 +08:00
ZShUn
16bbf5f37e 1.添加username password参数 2020-02-10 23:42:40 +08:00
LoadChange
94ddff5be5 fix: menu config 2020-02-07 09:09:15 +08:00
nkorange
da4192c4a5 Fix bug 2020-02-06 16:33:23 +08:00
Peter Zhu
983204c0c1
Merge pull request #2346 from loadchange/develop_1.2.0
fix: icon font url
2020-02-06 16:23:43 +08:00
LoadChange
43f3620474 fix: icon font url 2020-02-06 16:17:18 +08:00
LoadChange
abc6a44088 fix: configuration export 2020-02-06 13:41:42 +08:00
LoadChange
b6988b7516 fix: edit configuration 2020-02-06 13:41:42 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
ad8bec7391 #1105 fix startup script 2020-02-05 14:03:40 +08:00
nkorange
e0f9398e91 #1105 fix bug 2020-02-05 14:02:15 +08:00
Peter Zhu
fb3e176ccd
Merge pull request #2343 from loadchange/develop_1.2.0
fix: loading error
2020-02-05 13:37:20 +08:00
LoadChange
df9b939071 fix: loading error 2020-02-05 12:26:31 +08:00
Peter Zhu
8ba9313493
Merge pull request #2342 from loadchange/develop_1.2.0
fix: redirect error
2020-02-05 09:26:13 +08:00
LoadChange
7457b04e88 fix: redirect error 2020-02-04 23:12:44 +08:00