Commit Graph

139 Commits

Author SHA1 Message Date
KomachiSion
cf5a171ac5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	NOTICE
#	api/pom.xml
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
#	naming/src/test/java/com/alibaba/nacos/naming/consistency/persistent/impl/NamingSnapshotOperationTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskTest.java
#	pom.xml
#	test/src/test/java/com/alibaba/nacos/test/core/JacksonUtils.java
2021-05-14 11:04:52 +08:00
rui.zhang
de070a53ce
faet: relayout configurations page (#5673) 2021-05-11 20:48:16 +08:00
brotherlu-xcq
9300c39375
Fix the locales of field Action Type don't take effect in config history detail page (#5664)
* fix #5623, the locale issue in config rollback page

* build the change
2021-05-11 09:18:34 +08:00
rui.zhang
639297372e
fix: button to add margin-right (#5637) 2021-05-10 20:43:09 +08:00
plusmancn
7e57b90160
[ISSUE #3548] The srcUser fills with username when auth is disabled (console case) (#5566)
* feat: srcUser fills with username (console case)

* fix: code sytle of Constants.java

* fix: code style of the remaining files

* fix: the back button of HistoryDetail.js won't work

* fix: change '源 IP' to '来源 IP'

* fix: undo changes of goList
2021-05-10 20:41:35 +08:00
rui.zhang
4146a1e8b1
fix: 详情页返回历史版本页后查询参数丢失 (#5619) 2021-05-10 12:47:42 +08:00
brothelul
ae83b9b3d5
enhance the rollback message when it will delete the config. (#5529) 2021-04-30 18:04:37 +08:00
drgnchan
3aae93d523
fix #5517,invoke reQuery after change queryType (#5525) 2021-04-29 19:06:55 +08:00
KomachiSion
92da848375 Merge remote-tracking branch 'upstream/develop' into merge-1.X-to-2.0
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/PushReceiver.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/SubscribeManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/BaseTest.java
2021-04-27 15:57:24 +08:00
brothelul
3070bb8ffc
fix the press F1 to full screen issue in new config page (#5507) 2021-04-27 15:15:59 +08:00
brothelul
b148d4b503
fix the press F1 to full screen issue (#5505) 2021-04-27 14:07:12 +08:00
brothelul
72e5da6baf
[ISSUE #4770] Beta publish: change the way of select betaIps, from input to select (#5493)
* change the way of select betaIps, from input to select

* solve the conflict and change the Select from mutiple to tag
2021-04-27 09:41:51 +08:00
brothelul
81c1e53ac6
fix the tag remove error. (#5457) 2021-04-26 13:46:30 +08:00
haoyann
394230309d
[ISSUE #4602]add new version config export feat (#5345)
* add new version config export feat

* add new export button

* fix ci

* fix magical value

* add YamlParserConstructor
parse config reduce loop

* fix ci
2021-04-16 10:39:55 +08:00
KomachiSion
51cc2b1b4b Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/test/java/com/alibaba/nacos/client/config/common/GroupKeyTest.java
#	common/src/test/resources/META-INF/services/com.alibaba.nacos.common.spi.SpiTestInterface
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	istio/src/main/java/com/alibaba/nacos/istio/mcp/NacosMcpService.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ApiController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
2021-04-13 14:28:30 +08:00
ShawnSiao
f22b93cac3
fix #5234 (#5266) 2021-04-12 10:04:24 +08:00
iaoongin
f8702238f4
Fix. The mouse hovers over the margin in a pointer state and cannot be clicked (#5332) 2021-04-12 10:00:19 +08:00
haoyann
b542de727c
Subscriber list servername add required (#5310) 2021-04-09 10:45:25 +08:00
haoyann
50c37b044a
remove unused methods (#5256) 2021-04-08 17:35:14 +08:00
haoyann
6ce150371d
fix config list sort and search problem (#5223) 2021-03-29 12:02:37 +08:00
邪影oO
5146fad227
fix #4852: main.js too large (#5199) 2021-03-26 13:43:06 +08:00
haoyann
8cef69e502
service list add view subscriber feat (#5185) 2021-03-25 09:59:08 +08:00
KomachiSion
6cda5ad55a Merge remote-tracking branch 'upstream/develop' into develop-merge-to-2.0
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	client/src/test/java/com/alibaba/nacos/client/config/impl/YmlChangeParserTest.java
#	common/src/main/java/com/alibaba/nacos/common/http/param/Header.java
#	common/src/main/java/com/alibaba/nacos/common/utils/ConcurrentHashSet.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	console/src/main/resources/static/js/main.js
#	core/src/main/java/com/alibaba/nacos/core/cluster/ServerMemberManager.java
#	core/src/main/java/com/alibaba/nacos/core/utils/Loggers.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
#	pom.xml
2021-03-18 12:08:45 +08:00
haoyann
d70e9efff3
add config compare feat (#5102) 2021-03-15 09:39:10 +08:00
haoyann
bfc97f3371
fix instance list page bug (#5097) 2021-03-13 16:08:29 +08:00
邪影oO
3a86bd1020
登录框增加提示信息 (#4903)
* 登陆框增加提示信息

* 前端编译
2021-02-08 11:41:56 +08:00
KomachiSion
4096026048 Fix edit cluster use error data 2021-01-27 20:33:42 +08:00
wjm0729
0545e851db
导入优化 (#4775)
* import 优化

* 无法识别项目 提示优化

* revert

* revert

* 改回原来的格式
2021-01-22 17:03:37 +08:00
杨翊 SionYang
a44bf67402
Add Http and MySQL health check. (#4750)
* Add Http health check.

* Add Tcp as ClusterMetadata default checker

* Fix console can update cluster metadata if port no change

* Add MySQL health check.
2021-01-19 19:30:02 +08:00
邪影oO
cfefc28402
upgrade axios version to 0.21.1 (#4632) 2021-01-08 16:43:49 +08:00
wjm0729
dcd2fcec94
console-ui config排序优化 (#4599)
* ignore

* config 列表支持排序

* remove local cfg
2020-12-31 11:34:41 +08:00
Gagharv
ce57b98332
[ISSUE-#3005] fix ClusterController 403 and some display wrong (#4512)
* fix 3005

* fix 3005
2020-12-23 19:48:03 +08:00
赵延
638d89b70a
[ISSUE-3917] Enhance service detail console web, add metadata filter (#4439)
* add metadata filter at back-end of nacos naming console

* code enhance

* 添加input,tag等组件,初步布局

* 实现页面交互,可添加,删除filter

* 更新filter向后端发起请求获取数据

* 实现更新更改过滤条件,刷新表格

* 添加国际化配置

* 输入完后按空格直接添加,没输入的input给出响应

* 提交单元测试,更新打包后的静态资源

* 修改配置 解决生产环境上sourcemap不生效的问题

* 用hook重构组件InstanceFilter

* 多个集群各自使用过滤

* 解决多集群时,元数据过滤无法单独使用的问题

* revert backend code

* revert metadata filter test

* 只从客户端已获取到的实例中过滤

* 变动更新到打包后的mian.js

Co-authored-by: jzhishu <john1994@foxmail.com>
2020-12-21 10:19:42 +08:00
geek
97efd23b3e
refactor(console): add fuzzy tips (#4488)
* refactor(console): add fuzzy tips

add fuzzy tips ,add * in placeholder

Closes #4476

* refactor(console): add fuzzy tips for en-us

add fuzzy tips for  en-us ,add * in placeholder

Closes #4476

* refactor(console): add better fuzzy tips for zh-cn and en-us

add better fuzzy tips for zh-cn and en-us in placeholder

Closes #4476
2020-12-16 09:52:51 +08:00
iochenlei
149ba91966
fix styles at the button '新建命名空间' (#4362) 2020-11-30 09:58:25 +08:00
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 (#4206) 2020-11-12 09:18:45 +08:00
杨翊 SionYang
757fc1efeb
Revert "解决前端目录调整后前端访问不了问题 (#4195)" (#4196)
This reverts commit a0bbd562b0.
2020-11-11 13:59:50 +08:00
邪影oO
a0bbd562b0
解决前端目录调整后前端访问不了问题 (#4195) 2020-11-11 10:44:43 +08:00
邪影oO
f01aae73ee
console\src\main\resources\static\console-fe 挪到根目录并改名为 console-ui (#4174) 2020-11-09 11:53:33 +08:00