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

389 Commits

Author SHA1 Message Date
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
zhichen
6e1074e721 build js 2018-12-14 20:49:07 +08:00
zhichen
a656519794 change service remove url #393 2018-12-14 20:45:01 +08:00
nkorange
d3a164ca8b Merge branch 'develop' into 0.7.0 2018-12-14 20:28:23 +08:00
zhichen
a95f623f33 resolve conflict 2018-12-14 20:24:04 +08:00
zhichen
fd3d3d8491 fix request params pattern #393 2018-12-14 20:19:16 +08:00
nkorange
ffa9f92812 Merge branch 'develop' into 0.7.0 2018-12-14 20:02:37 +08:00
Fury Zhu
5d08a7b61f
Merge pull request #465 from jameslcj/hotfix_393 
fix #393
 2018-12-14 20:01:47 +08:00
nkorange
1a72cbeff9 Update default property 2018-12-14 19:59:59 +08:00
zhichen
2bacedf58a fix #393 2018-12-14 19:55:33 +08:00
zhichen
608935d08d resolve conflict 2018-12-14 19:34:03 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
zhichen
d8291244e9 fix: #455 2018-12-13 21:17:00 +08:00
zhichen
abf4f9ba6e fix: #455 2018-12-13 21:08:21 +08:00
zhichen
2f2404c14a build js 2018-12-13 20:32:47 +08:00
zhichen
9200cbc329 fix 445 2018-12-13 20:29:24 +08:00
王彦民
6c1818a2b6 Update: public service 2018-12-13 19:09:42 +08:00
王彦民
261dd75f15 Update: build #393 2018-12-13 18:26:32 +08:00
王彦民
565ce81e34 fix: update instance 2018-12-13 18:19:20 +08:00
王彦民
bcfe37f912 Update: build #393 2018-12-13 17:48:18 +08:00
王彦民
d706b62e60 fix: Support operation of selector on console, #393 2018-12-13 17:13:44 +08:00
yuwenlong
4fba53d159 Fixes #435 2018-12-12 22:14:16 +08:00
hxy1991
ff55be27d3 Merge branch 'anjia0532-master' into upstream-develop 
# Conflicts:
#	console/src/main/resources/diamond-server-logback.xml
 2018-12-11 19:17:43 +08:00
hxy1991
5efed006ac Fixes #430 2018-12-11 14:40:07 +08:00
hxy1991
97743685ac Fixes #363 2018-12-10 19:53:15 +08:00
anjia0532
0c5654cec8 1. change charset to UTF-8(replace GBK or utf8) 
2. support custom nacos server logs path in application* profile(key:nacos.logs.path)
 2018-12-09 13:24:17 +08:00
zhichen
11fc6729e5 fixed #413 2018-12-07 22:54:39 +08:00
王彦民
771b129a19 Update: fe release 0.6 2018-12-07 15:39:55 +08:00
王彦民
68e72748b0 update: Build the page 2018-12-07 15:39:55 +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
王彦民
baa79164e2 fix: closes #353 2018-12-07 14:11:52 +08:00
zhichen
9425a53124
Merge pull request #355 from jameslcj/hotfix_337 
validate config syntax #337
 2018-12-06 15:20:00 +08:00
王彦民
2ef2e5a5c6 fix: closes #362 2018-12-06 11:01:42 +08:00
zhichen
52fe7d52c1
Merge branch 'develop' into hotfix_337 2018-12-06 10:38:21 +08:00
hxy1991
1ca774b42c Fixes #391 2018-12-05 22:50:52 +08:00
hxy1991
6deb418c36 Fixes #391 2018-12-05 21:41:03 +08:00
hxy1991
190ac8d057 Fixes #391 2018-12-05 20:33:50 +08:00
Keep
f309d2ecb1
Merge pull request #296 from hxy1991/master 
Fixes #255 #363
 2018-12-04 10:30:35 +08:00
王彦民
3d59322721 fix: remove console log && closes #352 2018-12-03 19:08:47 +08:00
王彦民
40d333d529 refactor: Language switching 2018-12-03 19:08:47 +08:00
王彦民
91d0052563 fix: NewConfig internationalization 2018-12-03 19:08:47 +08:00
王彦民
941469af7f fix: HistoryDetail internationalization 2018-12-03 19:08:47 +08:00
王彦民
d487f522b6 fix: HistoryRollback internationalization 2018-12-03 19:08:47 +08:00
王彦民
4f419b0058 fix: ListeningToQuery internationalization 2018-12-03 19:08:47 +08:00
王彦民
3a5bec51cd fix: ServiceManagement internationalization 2018-12-03 19:08:47 +08:00
王彦民
74e72a8664 Fixed language 2018-12-03 19:08:47 +08:00
王彦民
4a0ce8e331 fix: Language switch 2018-12-03 19:08:47 +08:00
hxy1991
30e7c5273a Fixes #363 2018-12-01 13:57:03 +08:00
wfnuser
9d8db9799d remove the unexpected padding of editor. 2018-11-29 15:11:43 +08:00
wfnuser
01a067be42 remove balloons in configuration management page 2018-11-29 15:11:43 +08:00
zhichen
626b41c859 format code 2018-11-28 10:01:59 +08:00
zhichen
be3fa66e2d format code 2018-11-28 09:59:53 +08:00
zhichen
00d660b0eb validate config syntax fix #337 2018-11-27 16:30:08 +08:00
zhichen
5f4e149b00 remove redundant js 2018-11-22 14:29:48 +08:00
zhichen
c077c385f0 rewrite url #321 2018-11-21 17:47:01 +08:00
zhichen
7d0bef5342 fix #321 2018-11-21 11:25:19 +08:00
zhichen
646e5bf9fa feature: webpack adds hot dev mode 2018-11-20 14:39:46 +08:00
zhichen
84b9dd6e77
[issues #294]Merge pull request #305 
FE Scaffold reconstruction, #294
 2018-11-20 09:58:38 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
王彦民
1a85a76e39 refactor: Add alibaba copyright, Clean up useless files 2018-11-19 15:13:48 +08:00
王彦民
a1f6974690 refactor: Add redux, ConfigProvider 2018-11-18 23:17:22 +08:00
王彦民
f8b03c321a refactor: 脚手架重构 2018-11-18 13:58:33 +08:00
zhichen
bf57c74603
Merge pull request #298 from loadchange/develop 
Fixes #256，#177，#168
 2018-11-16 21:00:51 +08:00
王彦民
3d91d03383 docs: 补充npm 安装、运行和构建说明 2018-11-16 20:45:43 +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
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
王彦民
76f760bbba merge 2018-11-16 15:10:55 +08:00
王彦民
0a4ed295a2 fix: closes #256, #177, #168 2018-11-16 14:58:14 +08:00
王彦民
9348ef49b1 fix: closes #256, #177, #168 2018-11-16 14:55:52 +08:00
zhichen
17a7aaaa96 format the third libs 2018-11-16 10:46:52 +08:00
zhichen
e63aba6070 the fe console adds eslint and prettier #283 2018-11-15 22:18:38 +08:00
zhichen
2d36cae9d7 resolve conflict #281 2018-11-15 21:24:11 +08:00
zhichen
2f8db47768 update .eslintrc 
Fix #281
 2018-11-14 21:32:41 +08:00
zhichen
5a811733a3 move the dir of fe to console-fe 2018-11-14 20:47:21 +08:00
zhichen
29752b1e72 upgrade the npm of husky and lint-staged 2018-11-14 19:42:35 +08:00
zhichen
6836dca96f optimize and format code by eslint and prettier 2018-11-14 19:40:42 +08:00
zhichen
48ceb4032f add eslint prettier 2018-11-14 19:38:13 +08:00
zhichen
d866a62050 build js 2018-11-12 22:10:56 +08:00