Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
incubator-dubbo-admin
提交
8f71e534
I
incubator-dubbo-admin
项目概览
爱吃血肠
/
incubator-dubbo-admin
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-dubbo-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
8f71e534
编写于
2月 25, 2019
作者:
N
nzomkxia
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
separate version and group for service test #313
上级
5367378b
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
35 addition
and
127 deletion
+35
-127
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
.../java/org/apache/dubbo/admin/common/util/ConvertUtil.java
+4
-36
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
.../org/apache/dubbo/admin/controller/ServiceController.java
+4
-13
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
...in/java/org/apache/dubbo/admin/model/domain/Consumer.java
+5
-14
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
...in/java/org/apache/dubbo/admin/model/domain/Override.java
+5
-14
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
.../main/java/org/apache/dubbo/admin/model/domain/Route.java
+5
-14
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/GenericServiceImpl.java
...g/apache/dubbo/admin/service/impl/GenericServiceImpl.java
+7
-1
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
.../apache/dubbo/admin/service/impl/ProviderServiceImpl.java
+5
-13
dubbo-admin-ui/src/components/test/ServiceTest.vue
dubbo-admin-ui/src/components/test/ServiceTest.vue
+0
-22
未找到文件。
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
浏览文件 @
8f71e534
...
...
@@ -28,22 +28,13 @@ public class ConvertUtil {
}
public
static
Map
<
String
,
String
>
serviceName2Map
(
String
serviceName
)
{
String
group
=
null
;
String
version
=
null
;
int
i
=
serviceName
.
indexOf
(
"/"
);
if
(
i
>
0
)
{
group
=
serviceName
.
substring
(
0
,
i
);
serviceName
=
serviceName
.
substring
(
i
+
1
);
}
i
=
serviceName
.
lastIndexOf
(
":"
);
if
(
i
>
0
)
{
version
=
serviceName
.
substring
(
i
+
1
);
serviceName
=
serviceName
.
substring
(
0
,
i
);
}
String
group
=
Tool
.
getGroup
(
serviceName
);
String
version
=
Tool
.
getVersion
(
serviceName
);
String
interfaze
=
Tool
.
getInterface
(
serviceName
);
Map
<
String
,
String
>
ret
=
new
HashMap
<
String
,
String
>();
if
(!
StringUtils
.
isEmpty
(
serviceName
))
{
ret
.
put
(
Constants
.
INTERFACE_KEY
,
serviceNam
e
);
ret
.
put
(
Constants
.
INTERFACE_KEY
,
interfaz
e
);
}
if
(!
StringUtils
.
isEmpty
(
version
))
{
ret
.
put
(
Constants
.
VERSION_KEY
,
version
);
...
...
@@ -72,27 +63,4 @@ public class ConvertUtil {
return
org
.
apache
.
dubbo
.
admin
.
common
.
util
.
Constants
.
SERVICE
;
}
}
// public static <T extends BaseDTO> T convertDTOtoStore(T dto) {
// if (StringUtils.isNotEmpty(dto.getApplication())) {
// dto.setScope("application");
// dto.setKey(dto.getApplication());
// } else {
// dto.setScope("service");
// dto.setKey(dto.getService());
// }
// return dto;
// }
//
// public static <T extends BaseDTO> T convertDTOtoDisplay(T dto) {
// if (dto == null) {
// return null;
// }
// if(dto.getScope().equals("application")) {
// dto.setApplication(dto.getKey());
// } else {
// dto.setService(dto.getKey());
// }
// return dto;
// }
}
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
浏览文件 @
8f71e534
...
...
@@ -19,6 +19,7 @@ package org.apache.dubbo.admin.controller;
import
com.google.gson.Gson
;
import
org.apache.dubbo.admin.common.util.Constants
;
import
org.apache.dubbo.admin.common.util.Tool
;
import
org.apache.dubbo.admin.model.domain.Consumer
;
import
org.apache.dubbo.admin.model.domain.Provider
;
import
org.apache.dubbo.admin.model.dto.ServiceDTO
;
...
...
@@ -61,19 +62,9 @@ public class ServiceController {
@RequestMapping
(
value
=
"/service/{service}"
,
method
=
RequestMethod
.
GET
)
public
ServiceDetailDTO
serviceDetail
(
@PathVariable
String
service
,
@PathVariable
String
env
)
{
service
=
service
.
replace
(
Constants
.
ANY_VALUE
,
Constants
.
PATH_SEPARATOR
);
String
group
=
null
;
String
version
=
null
;
String
interfaze
=
service
;
int
i
=
interfaze
.
indexOf
(
"/"
);
if
(
i
>=
0
)
{
group
=
interfaze
.
substring
(
0
,
i
);
interfaze
=
interfaze
.
substring
(
i
+
1
);
}
i
=
interfaze
.
lastIndexOf
(
":"
);
if
(
i
>=
0
)
{
version
=
interfaze
.
substring
(
i
+
1
);
interfaze
=
interfaze
.
substring
(
0
,
i
);
}
String
group
=
Tool
.
getGroup
(
service
);
String
version
=
Tool
.
getVersion
(
service
);
String
interfaze
=
Tool
.
getInterface
(
service
);
List
<
Provider
>
providers
=
providerService
.
findByService
(
service
);
List
<
Consumer
>
consumers
=
consumerService
.
findByService
(
service
);
...
...
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
浏览文件 @
8f71e534
...
...
@@ -16,6 +16,7 @@
*/
package
org.apache.dubbo.admin.model.domain
;
import
org.apache.dubbo.admin.common.util.Tool
;
import
org.apache.dubbo.common.Constants
;
import
org.apache.dubbo.common.URL
;
import
org.apache.dubbo.common.utils.StringUtils
;
...
...
@@ -201,19 +202,9 @@ public class Consumer extends Entity {
}
public
URL
toUrl
()
{
String
group
=
null
;
String
version
=
null
;
String
path
=
service
;
int
i
=
path
.
indexOf
(
"/"
);
if
(
i
>
0
)
{
group
=
path
.
substring
(
0
,
i
);
path
=
path
.
substring
(
i
+
1
);
}
i
=
path
.
lastIndexOf
(
":"
);
if
(
i
>
0
)
{
version
=
path
.
substring
(
i
+
1
);
path
=
path
.
substring
(
0
,
i
);
}
String
group
=
Tool
.
getGroup
(
service
);
String
version
=
Tool
.
getVersion
(
service
);
String
interfaze
=
Tool
.
getInterface
(
service
);
Map
<
String
,
String
>
param
=
StringUtils
.
parseQueryString
(
parameters
);
param
.
put
(
Constants
.
CATEGORY_KEY
,
Constants
.
CONSUMERS_CATEGORY
);
if
(
group
!=
null
)
{
...
...
@@ -222,7 +213,7 @@ public class Consumer extends Entity {
if
(
version
!=
null
)
{
param
.
put
(
Constants
.
VERSION_KEY
,
version
);
}
return
URL
.
valueOf
(
Constants
.
CONSUMER_PROTOCOL
+
"://"
+
address
+
"/"
+
path
return
URL
.
valueOf
(
Constants
.
CONSUMER_PROTOCOL
+
"://"
+
address
+
"/"
+
interfaze
+
"?"
+
StringUtils
.
toQueryString
(
param
));
}
...
...
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
浏览文件 @
8f71e534
...
...
@@ -16,6 +16,7 @@
*/
package
org.apache.dubbo.admin.model.domain
;
import
org.apache.dubbo.admin.common.util.Tool
;
import
org.apache.dubbo.common.Constants
;
import
org.apache.dubbo.common.URL
;
import
org.apache.dubbo.common.utils.StringUtils
;
...
...
@@ -158,19 +159,9 @@ public class Override extends Entity {
}
public
URL
toUrl
()
{
String
group
=
null
;
String
version
=
null
;
String
path
=
service
;
int
i
=
path
.
indexOf
(
"/"
);
if
(
i
>
0
)
{
group
=
path
.
substring
(
0
,
i
);
path
=
path
.
substring
(
i
+
1
);
}
i
=
path
.
lastIndexOf
(
":"
);
if
(
i
>
0
)
{
version
=
path
.
substring
(
i
+
1
);
path
=
path
.
substring
(
0
,
i
);
}
String
group
=
Tool
.
getGroup
(
service
);
String
version
=
Tool
.
getVersion
(
service
);
String
interfaze
=
Tool
.
getInterface
(
service
);
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
Constants
.
OVERRIDE_PROTOCOL
);
sb
.
append
(
"://"
);
...
...
@@ -180,7 +171,7 @@ public class Override extends Entity {
sb
.
append
(
Constants
.
ANYHOST_VALUE
);
}
sb
.
append
(
"/"
);
sb
.
append
(
path
);
sb
.
append
(
interfaze
);
sb
.
append
(
"?"
);
Map
<
String
,
String
>
param
=
StringUtils
.
parseQueryString
(
params
);
param
.
put
(
Constants
.
CATEGORY_KEY
,
Constants
.
CONFIGURATORS_CATEGORY
);
...
...
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
浏览文件 @
8f71e534
...
...
@@ -18,6 +18,7 @@
package
org.apache.dubbo.admin.model.domain
;
import
org.apache.dubbo.admin.common.util.Tool
;
import
org.apache.dubbo.common.Constants
;
import
org.apache.dubbo.common.URL
;
...
...
@@ -208,20 +209,10 @@ public class Route extends Entity {
}
public
URL
toUrl
()
{
String
group
=
null
;
String
version
=
null
;
String
path
=
service
;
int
i
=
path
.
indexOf
(
"/"
);
if
(
i
>
0
)
{
group
=
path
.
substring
(
0
,
i
);
path
=
path
.
substring
(
i
+
1
);
}
i
=
path
.
lastIndexOf
(
":"
);
if
(
i
>
0
)
{
version
=
path
.
substring
(
i
+
1
);
path
=
path
.
substring
(
0
,
i
);
}
return
URL
.
valueOf
(
Constants
.
ROUTE_PROTOCOL
+
"://"
+
Constants
.
ANYHOST_VALUE
+
"/"
+
path
String
group
=
Tool
.
getGroup
(
service
);
String
version
=
Tool
.
getVersion
(
service
);
String
interfaze
=
Tool
.
getInterface
(
service
);
return
URL
.
valueOf
(
Constants
.
ROUTE_PROTOCOL
+
"://"
+
Constants
.
ANYHOST_VALUE
+
"/"
+
interfaze
+
"?"
+
Constants
.
CATEGORY_KEY
+
"="
+
Constants
.
ROUTERS_CATEGORY
+
"&router=condition&runtime="
+
isRuntime
()
+
"&enabled="
+
isEnabled
()
+
"&priority="
+
getPriority
()
+
"&force="
+
isForce
()
+
"&dynamic="
+
isDynamic
()
+
"&name="
+
getName
()
+
"&"
+
Constants
.
RULE_KEY
+
"="
+
URL
.
encode
(
getMatchRule
()
+
" => "
+
getFilterRule
())
...
...
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/GenericServiceImpl.java
浏览文件 @
8f71e534
...
...
@@ -17,6 +17,7 @@
package
org.apache.dubbo.admin.service.impl
;
import
org.apache.dubbo.admin.common.util.Tool
;
import
org.apache.dubbo.config.ApplicationConfig
;
import
org.apache.dubbo.config.ReferenceConfig
;
import
org.apache.dubbo.config.RegistryConfig
;
...
...
@@ -47,9 +48,14 @@ public class GenericServiceImpl {
public
Object
invoke
(
String
service
,
String
method
,
String
[]
parameterTypes
,
Object
[]
params
)
{
ReferenceConfig
<
GenericService
>
reference
=
new
ReferenceConfig
<>();
String
group
=
Tool
.
getGroup
(
service
);
String
version
=
Tool
.
getVersion
(
service
);
String
interfaze
=
Tool
.
getInterface
(
service
);
reference
.
setGeneric
(
true
);
reference
.
setApplication
(
applicationConfig
);
reference
.
setInterface
(
service
);
reference
.
setInterface
(
interfaze
);
reference
.
setVersion
(
version
);
reference
.
setGroup
(
group
);
GenericService
genericService
=
reference
.
get
();
return
genericService
.
$invoke
(
method
,
parameterTypes
,
params
);
}
...
...
dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
浏览文件 @
8f71e534
...
...
@@ -21,6 +21,7 @@ import org.apache.dubbo.admin.common.util.Constants;
import
org.apache.dubbo.admin.common.util.Pair
;
import
org.apache.dubbo.admin.common.util.ParseUtils
;
import
org.apache.dubbo.admin.common.util.SyncUtils
;
import
org.apache.dubbo.admin.common.util.Tool
;
import
org.apache.dubbo.admin.model.domain.Provider
;
import
org.apache.dubbo.admin.model.dto.ServiceDTO
;
import
org.apache.dubbo.admin.service.OverrideService
;
...
...
@@ -460,21 +461,12 @@ public class ProviderServiceImpl extends AbstractService implements ProviderServ
for
(
Provider
provider
:
providers
)
{
String
app
=
provider
.
getApplication
();
String
service
=
provider
.
getService
();
String
group
=
null
;
String
version
=
null
;
int
i
=
service
.
indexOf
(
"/"
);
if
(
i
>=
0
)
{
group
=
service
.
substring
(
0
,
i
);
service
=
service
.
substring
(
i
+
1
);
}
i
=
service
.
lastIndexOf
(
":"
);
if
(
i
>=
0
)
{
version
=
service
.
substring
(
i
+
1
);
service
=
service
.
substring
(
0
,
i
);
}
String
group
=
Tool
.
getGroup
(
service
);
String
version
=
Tool
.
getVersion
(
service
);
String
interfaze
=
Tool
.
getInterface
(
service
);
ServiceDTO
s
=
new
ServiceDTO
();
s
.
setAppName
(
app
);
s
.
setService
(
servic
e
);
s
.
setService
(
interfaz
e
);
s
.
setGroup
(
group
);
s
.
setVersion
(
version
);
result
.
add
(
s
);
...
...
dubbo-admin-ui/src/components/test/ServiceTest.vue
浏览文件 @
8f71e534
...
...
@@ -46,28 +46,6 @@
</v-card>
</v-flex>
</v-layout>
<!--
<v-flex
xs12
>
-->
<!--
<search
v-model=
"filter"
:label=
"$t('placeholders.searchService')"
--
>
<!--:hint="$t('testModule.searchServiceHint')"-->
<!--:submit="search">
</search>
-->
<!--
</v-flex>
-->
<!--
<v-flex
xs12
>
-->
<!--
<v-autocomplete-->
<!--flat-->
<!--hide-no-data-->
<!--v-model="service"-->
<!--:loading="loading"-->
<!--:search-input.sync="filter"-->
<!--:hint="$t('testModule.searchServiceHint')"-->
<!--:items="services"-->
<!--item-value="service"-->
<!--item-text="service"-->
<!--:label="$t('placeholders.searchService')"-->
<!--persistent-hint-->
<!--@keyup.enter="search"-->
<!--clearable-->
<!-->
</v-autocomplete>
-->
<!--
</v-flex>
-->
<v-flex
xs12
>
<h3>
{{
$t
(
'
methods
'
)
}}
</h3>
</v-flex>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录