Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
touzizhuo03
Dubbo
提交
a3c8c627
D
Dubbo
项目概览
touzizhuo03
/
Dubbo
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Dubbo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a3c8c627
编写于
12月 06, 2017
作者:
lovepoem
提交者:
ken.lj
12月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #780, fix dubbo admin console display error
上级
0de126c4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
9 deletion
+31
-9
dubbo-admin/src/main/java/com/alibaba/dubbo/governance/web/governance/module/screen/Providers.java
...bo/governance/web/governance/module/screen/Providers.java
+26
-0
dubbo-admin/src/main/webapp/WEB-INF/i18n/message_zh.properties
...-admin/src/main/webapp/WEB-INF/i18n/message_zh.properties
+1
-1
dubbo-admin/src/main/webapp/WEB-INF/i18n/message_zh_TW.properties
...min/src/main/webapp/WEB-INF/i18n/message_zh_TW.properties
+1
-1
dubbo-admin/src/main/webapp/WEB-INF/templates/governance/screen/providers/index.vm
...pp/WEB-INF/templates/governance/screen/providers/index.vm
+3
-7
未找到文件。
dubbo-admin/src/main/java/com/alibaba/dubbo/governance/web/governance/module/screen/Providers.java
浏览文件 @
a3c8c627
...
...
@@ -23,8 +23,10 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
/**
* <p>Providers.</p>
...
...
@@ -107,11 +109,35 @@ public class Providers extends Restful {
}
context
.
put
(
"providers"
,
providers
);
context
.
put
(
"serviceAppMap"
,
getServiceAppMap
(
providers
));
// 设置搜索结果到cookie中
setSearchHistroy
(
context
,
value
);
}
/**
* @author WangXin
* 计算各个服务对应的应用列表,方便页面对"重复"的提示
* @param providers app services
*/
private
Map
<
String
,
Set
<
String
>>
getServiceAppMap
(
List
<
Provider
>
providers
)
{
Map
<
String
,
Set
<
String
>>
serviceAppMap
=
new
HashMap
<
String
,
Set
<
String
>>();
if
(
providers
!=
null
&&
providers
.
size
()
>=
0
)
{
for
(
Provider
provider
:
providers
)
{
Set
<
String
>
appSet
;
String
service
=
provider
.
getService
();
if
(
serviceAppMap
.
get
(
service
)
==
null
)
{
appSet
=
new
HashSet
<
String
>();
}
else
{
appSet
=
serviceAppMap
.
get
(
service
);
}
appSet
.
add
(
provider
.
getApplication
());
serviceAppMap
.
put
(
service
,
appSet
);
}
}
return
serviceAppMap
;
}
/**
* 设置search记录到cookie中,操作步骤:
* 检查加入的记录是否已经存在cookie中,如果存在,则更新列表次序;如果不存在,则插入到最前面
...
...
dubbo-admin/src/main/webapp/WEB-INF/i18n/message_zh.properties
浏览文件 @
a3c8c627
...
...
@@ -456,7 +456,7 @@ confirm.batch.tostatic=\u786e\u5b9a\u8f6c\u4e3a\u9759\u6001\u6240\u9009\u9879?
confirm.batch.todynamic
=
\u
786e
\u
5b9a
\u
8f6c
\u
4e3a
\u
52a8
\u6001\u6240\u9009\u9879
?
current.user
=
\u
5f53
\u
524d
\u7528\u6237
CheckProviderLocalAddress
=
{0}
\u
4E0D
\u
662F
\u6709\u6548\u7684\u
8FDC
\u
7A0B
\u
670D
\u
52A1
\u5730\u5740\u
FF0C
\u
8BF7
\u
68C0
\u
67E5
\u
63D0
\u
4F9B
\u
65B9/etc/hosts
\u6620\u
5C04
\u
662F
\u5426\u
6B63
\u
786E
\u3002
CheckProviderApplicationDifferent
=
\u
591a
\u
4e2a
\u
4e0d
\u
540c
\u
5e94
\u7528\u
6ce8
\u
518c
\u
4e86
\u
76f8
\u
540c
\u
670d
\u
52a1
\u
FF0C
\u
8BF7
\u
68C0
\u
67E5{0}
\u
548C{1}
\u
4E2D
\u
662F
\u5426\u6709\u
8BEF
\u
66B
4
\u9732\u3002
CheckProviderApplicationDifferent
=
\u
591a
\u
4e2a
\u
4e0d
\u
540c
\u
5e94
\u7528\u
6ce8
\u
518c
\u
4e86
\u
76f8
\u
540c
\u
670d
\u
52a1
\u
ff0c
\u
8bf7
\u
68c0
\u
67e5{0}
\u
4e2d
\u
662f
\u5426\u6709\u
8bef
\u
66b
4
\u9732\u3002
CheckProviderAddressMismatch
=
\u
670d
\u
52a1URL
\u
4e0a
\u7684
IP
\u
4e0e
\u
8fde
\u
63a5
\u
6ce8
\u
518c
\u
4e2d
\u
5fc3
\u7684
IP
\u
4e0d
\u
76f8
\u
540c
CheckConnectionDisconnected
=
\u
8be5
\u
8fde
\u
63a5
\u
5df2
\u
65ad
\u
5f00
\u
ff0c
\u6570\u
636e
\u
5e93
\u
810f
\u6570\u
636e
\u
ff0c
\u
8bf7
\u
70b9
\u
51fb
\u
201c
\u
91cd
\u
8fde
\u
201d
CheckConnectionExpired
=
\u
8be5
\u
8fde
\u
63a5
\u6240\u5728\u
6ce8
\u
518c
\u
4e2d
\u
5fc3
\u
5df2
\u
4e0d
\u
5b58
\u5728\u
ff08
\u6570\u
636e
\u
4f1a
\u
81ea
\u
52a8
\u
5b9a
\u
671f
\u
6e05
\u7406\u
ff09
...
...
dubbo-admin/src/main/webapp/WEB-INF/i18n/message_zh_TW.properties
浏览文件 @
a3c8c627
...
...
@@ -424,7 +424,7 @@ confirm.batch.tostatic=\u78ba\u5b9a\u8f49\u70ba\u975c\u614b\u6240\u9078\u9805?
confirm.batch.todynamic
=
\u
78ba
\u
5b9a
\u
8f49
\u
70ba
\u
52d5
\u
614b
\u6240\u9078\u9805
?
current.user
=
\u7576\u
524d
\u7528\u6236
CheckProviderAddressMismatch
=
\u
670d
\u
52d9URL
\u
4e0a
\u7684
IP
\u8207\u9023\u
63a5
\u
8a3b
\u
518a
\u
4e2d
\u
5fc3
\u7684
IP
\u
4e0d
\u
76f8
\u
540c
CheckProviderApplicationDifferent
=
\u
591a
\u
500b
\u
4e0d
\u
540c
\u
61c9
\u7528\u
8a3b
\u
518a
\u
4e86
\u
76f8
\u
540c
\u
670d
\u
52d9
CheckProviderApplicationDifferent
=
\u
591a
\u
500b
\u
4e0d
\u
540c
\u
61c9
\u7528\u
8a3b
\u
518a
\u
4e86
\u
76f8
\u
540c
\u
670d
\u
52d9
\u
ff0c
\u
8acb
\u
6aa2
\u
67e5{0}
\u
4e2d
\u
662f
\u5426\u6709\u
8aa4
\u
66b4
\u9732\u3002
CheckConnectionDisconnected
=
\u
8a72
\u9023\u
63a5
\u
5df2
\u
65b7
\u
958b
\u
ff0c
\u
8cc7
\u6599\u
5eab
\u
9ad2
\u
8cc7
\u6599\u
ff0c
\u
8acb
\u
9ede
\u
64ca
\u
201c
\u
91cd
\u9023\u
201d
CheckConnectionExpired
=
\u
8a72
\u9023\u
63a5
\u6240\u5728\u
8a3b
\u
518a
\u
4e2d
\u
5fc3
\u
5df2
\u
4e0d
\u
5b58
\u5728\u
ff08
\u
8cc7
\u6599\u6703\u
81ea
\u
52d5
\u
5b9a
\u
671f
\u
6e05
\u7406\u
ff09
CheckDatabaseMiss
=
\u
8cc7
\u6599\u
5eab
\u
8cc7
\u6599\u
610f
\u5916\u
4e1f
\u5931\u
6b64
\u
8cc7
\u6599\u
ff0c
\u
8acb
\u
9ede
\u
64ca
\u
201c
\u6062\u
5fa9
\u
201d
...
...
dubbo-admin/src/main/webapp/WEB-INF/templates/governance/screen/providers/index.vm
浏览文件 @
a3c8c627
...
...
@@ -88,15 +88,11 @@
<td>
#
set
($
errorLevel
=
"ok"
)
#
set
($
errorMessage
=
""
)
#
if
($
providerApplication
==
""
)
#
set
($
providerApplication
=
$
provider
.
application
)
#
end
#
if
($
providerApplication
!=
$
provider
.
application
)
#
set
($
appList
=
$
!
serviceAppMap
.
get
($
provider
.
service
))
#
if
($
appList
.
size
()
>
1
)
#
if
($
errorLevel
!=
"error"
)
#
set
($
errorLevel
=
"warn"
)
#
end
#
set
($
errorMessage
=
"$errorMessage<br>$i18n.get('warn'): $i18n.get(
'CheckProviderApplicationDifferent', $
providerApplication, $provider.application
)"
)
'CheckProviderApplicationDifferent', $
appList
)"
)
#
end
#
if
($
provider
.
address
.
startsWith
(
"127."
)
||
$
provider
.
address
.
startsWith
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录