Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈文顺
discovery
Commits
acb22c45
Commit
acb22c45
authored
Jun 23, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正消费端未配置版本号的Bug
parent
4c271ffc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/strategy/DiscoveryControlStrategy.java
+7
-2
No files found.
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/strategy/DiscoveryControlStrategy.java
View file @
acb22c45
...
@@ -67,6 +67,11 @@ public class DiscoveryControlStrategy {
...
@@ -67,6 +67,11 @@ public class DiscoveryControlStrategy {
}
}
private
void
applyVersionFilter
(
String
consumerServiceId
,
String
consumerServiceVersion
,
String
providerServiceId
,
List
<
ServiceInstance
>
instances
)
{
private
void
applyVersionFilter
(
String
consumerServiceId
,
String
consumerServiceVersion
,
String
providerServiceId
,
List
<
ServiceInstance
>
instances
)
{
// 如果消费端未配置版本号,那么它可以调用提供端所有服务,需要符合规范,极力避免该情况发生
if
(
StringUtils
.
isEmpty
(
consumerServiceVersion
))
{
return
;
}
DiscoveryEntity
discoveryEntity
=
pluginEntity
.
getDiscoveryEntity
();
DiscoveryEntity
discoveryEntity
=
pluginEntity
.
getDiscoveryEntity
();
if
(
discoveryEntity
==
null
)
{
if
(
discoveryEntity
==
null
)
{
return
;
return
;
...
@@ -82,7 +87,7 @@ public class DiscoveryControlStrategy {
...
@@ -82,7 +87,7 @@ public class DiscoveryControlStrategy {
return
;
return
;
}
}
// 当前版本的消费
者所能调用提供者的版本
列表
// 当前版本的消费
端所能调用提供端的版本号
列表
List
<
String
>
allFilterVersions
=
new
ArrayList
<
String
>();
List
<
String
>
allFilterVersions
=
new
ArrayList
<
String
>();
for
(
DiscoveryServiceEntity
serviceEntity
:
serviceEntityList
)
{
for
(
DiscoveryServiceEntity
serviceEntity
:
serviceEntityList
)
{
String
providerServiceName
=
serviceEntity
.
getProviderServiceName
();
String
providerServiceName
=
serviceEntity
.
getProviderServiceName
();
...
@@ -93,7 +98,7 @@ public class DiscoveryControlStrategy {
...
@@ -93,7 +98,7 @@ public class DiscoveryControlStrategy {
List
<
String
>
consumerVersionList
=
getVersionList
(
consumerVersionValue
);
List
<
String
>
consumerVersionList
=
getVersionList
(
consumerVersionValue
);
List
<
String
>
providerVersionList
=
getVersionList
(
providerVersionValue
);
List
<
String
>
providerVersionList
=
getVersionList
(
providerVersionValue
);
// 判断consumer-version-value值是否包含当前消费
者
的版本号
// 判断consumer-version-value值是否包含当前消费
端
的版本号
if
(
CollectionUtils
.
isNotEmpty
(
consumerVersionList
)
&&
consumerVersionList
.
contains
(
consumerServiceVersion
))
{
if
(
CollectionUtils
.
isNotEmpty
(
consumerVersionList
)
&&
consumerVersionList
.
contains
(
consumerServiceVersion
))
{
if
(
CollectionUtils
.
isNotEmpty
(
providerVersionList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
providerVersionList
))
{
allFilterVersions
.
addAll
(
providerVersionList
);
allFilterVersions
.
addAll
(
providerVersionList
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment