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
49341f86
Commit
49341f86
authored
Jul 26, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
扩展支持多格式的规则,包括XML和JSON
parent
d243bf13
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
20 deletions
+21
-20
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigInitializer.java
+6
-5
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/configuration/ConfigAutoConfiguration.java
+7
-7
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/XmlConfigParser.java
+4
-4
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/dom4j/Dom4JConstant.java
+1
-1
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/dom4j/Dom4JParser.java
+1
-1
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/dom4j/Dom4JReader.java
+1
-1
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/dom4j/Dom4JWriter.java
+1
-1
No files found.
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigInitializer.java
View file @
49341f86
...
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader
;
import
com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader
;
import
com.nepxion.discovery.plugin.configcenter.loader.RemoteConfigLoader
;
import
com.nepxion.discovery.plugin.configcenter.loader.RemoteConfigLoader
;
import
com.nepxion.discovery.plugin.framework.adapter.PluginAdapter
;
import
com.nepxion.discovery.plugin.framework.adapter.PluginAdapter
;
import
com.nepxion.discovery.plugin.framework.config.PluginConfigParser
;
import
com.nepxion.discovery.plugin.framework.context.PluginContextAware
;
import
com.nepxion.discovery.plugin.framework.context.PluginContextAware
;
import
com.nepxion.discovery.plugin.framework.entity.RuleEntity
;
import
com.nepxion.discovery.plugin.framework.entity.RuleEntity
;
...
@@ -32,14 +33,14 @@ public class ConfigInitializer {
...
@@ -32,14 +33,14 @@ public class ConfigInitializer {
private
PluginAdapter
pluginAdapter
;
private
PluginAdapter
pluginAdapter
;
@Autowired
@Autowired
private
PluginConfigParser
pluginConfigParser
;
@Autowired
private
LocalConfigLoader
localConfigLoader
;
private
LocalConfigLoader
localConfigLoader
;
@Autowired
(
required
=
false
)
@Autowired
(
required
=
false
)
private
RemoteConfigLoader
remoteConfigLoader
;
private
RemoteConfigLoader
remoteConfigLoader
;
@Autowired
private
ConfigParser
configParser
;
@PostConstruct
@PostConstruct
public
void
initialize
()
{
public
void
initialize
()
{
Boolean
registerControlEnabled
=
pluginContextAware
.
isRegisterControlEnabled
();
Boolean
registerControlEnabled
=
pluginContextAware
.
isRegisterControlEnabled
();
...
@@ -56,7 +57,7 @@ public class ConfigInitializer {
...
@@ -56,7 +57,7 @@ public class ConfigInitializer {
String
remoteConfig
=
getRemoteConfig
();
String
remoteConfig
=
getRemoteConfig
();
if
(
StringUtils
.
isNotEmpty
(
remoteConfig
))
{
if
(
StringUtils
.
isNotEmpty
(
remoteConfig
))
{
try
{
try
{
RuleEntity
ruleEntity
=
c
onfigParser
.
parse
(
remoteConfig
);
RuleEntity
ruleEntity
=
pluginC
onfigParser
.
parse
(
remoteConfig
);
pluginAdapter
.
setDynamicRule
(
ruleEntity
);
pluginAdapter
.
setDynamicRule
(
ruleEntity
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
LOG
.
error
(
"Parse rule xml failed"
,
e
);
LOG
.
error
(
"Parse rule xml failed"
,
e
);
...
@@ -66,7 +67,7 @@ public class ConfigInitializer {
...
@@ -66,7 +67,7 @@ public class ConfigInitializer {
String
localConfig
=
getLocalConfig
();
String
localConfig
=
getLocalConfig
();
if
(
StringUtils
.
isNotEmpty
(
localConfig
))
{
if
(
StringUtils
.
isNotEmpty
(
localConfig
))
{
try
{
try
{
RuleEntity
ruleEntity
=
c
onfigParser
.
parse
(
localConfig
);
RuleEntity
ruleEntity
=
pluginC
onfigParser
.
parse
(
localConfig
);
pluginAdapter
.
setLocalRule
(
ruleEntity
);
pluginAdapter
.
setLocalRule
(
ruleEntity
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
LOG
.
error
(
"Parse rule xml failed"
,
e
);
LOG
.
error
(
"Parse rule xml failed"
,
e
);
...
...
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/configuration/ConfigAutoConfiguration.java
View file @
49341f86
...
@@ -14,8 +14,9 @@ import org.springframework.context.annotation.Bean;
...
@@ -14,8 +14,9 @@ import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
com.nepxion.discovery.plugin.configcenter.ConfigInitializer
;
import
com.nepxion.discovery.plugin.configcenter.ConfigInitializer
;
import
com.nepxion.discovery.plugin.configcenter.ConfigParser
;
import
com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader
;
import
com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader
;
import
com.nepxion.discovery.plugin.configcenter.parser.xml.XmlConfigParser
;
import
com.nepxion.discovery.plugin.framework.config.PluginConfigParser
;
import
com.nepxion.discovery.plugin.framework.context.PluginContextAware
;
import
com.nepxion.discovery.plugin.framework.context.PluginContextAware
;
@Configuration
@Configuration
...
@@ -24,6 +25,11 @@ public class ConfigAutoConfiguration {
...
@@ -24,6 +25,11 @@ public class ConfigAutoConfiguration {
private
PluginContextAware
pluginContextAware
;
private
PluginContextAware
pluginContextAware
;
@Bean
@Bean
public
PluginConfigParser
pluginConfigParser
()
{
return
new
XmlConfigParser
();
}
@Bean
public
LocalConfigLoader
localConfigLoader
()
{
public
LocalConfigLoader
localConfigLoader
()
{
return
new
LocalConfigLoader
()
{
return
new
LocalConfigLoader
()
{
@Override
@Override
...
@@ -37,9 +43,4 @@ public class ConfigAutoConfiguration {
...
@@ -37,9 +43,4 @@ public class ConfigAutoConfiguration {
public
ConfigInitializer
configInitializer
()
{
public
ConfigInitializer
configInitializer
()
{
return
new
ConfigInitializer
();
return
new
ConfigInitializer
();
}
}
@Bean
public
ConfigParser
configParser
()
{
return
new
ConfigParser
();
}
}
}
\ No newline at end of file
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigParser.java
→
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
parser/xml/Xml
ConfigParser.java
View file @
49341f86
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
;
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
parser
.
xml
;
/**
/**
* <p>Title: Nepxion Discovery</p>
* <p>Title: Nepxion Discovery</p>
...
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
...
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant
;
import
com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant
;
import
com.nepxion.discovery.plugin.configcenter.
xml
.Dom4JReader
;
import
com.nepxion.discovery.plugin.configcenter.
parser.xml.dom4j
.Dom4JReader
;
import
com.nepxion.discovery.plugin.framework.config.PluginConfigParser
;
import
com.nepxion.discovery.plugin.framework.config.PluginConfigParser
;
import
com.nepxion.discovery.plugin.framework.constant.PluginConstant
;
import
com.nepxion.discovery.plugin.framework.constant.PluginConstant
;
import
com.nepxion.discovery.plugin.framework.entity.CountFilterEntity
;
import
com.nepxion.discovery.plugin.framework.entity.CountFilterEntity
;
...
@@ -37,8 +37,8 @@ import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
...
@@ -37,8 +37,8 @@ import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import
com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity
;
import
com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity
;
import
com.nepxion.discovery.plugin.framework.exception.PluginException
;
import
com.nepxion.discovery.plugin.framework.exception.PluginException
;
public
class
ConfigParser
implements
PluginConfigParser
{
public
class
Xml
ConfigParser
implements
PluginConfigParser
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ConfigParser
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
Xml
ConfigParser
.
class
);
@Override
@Override
public
RuleEntity
parse
(
String
config
)
{
public
RuleEntity
parse
(
String
config
)
{
...
...
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
xml
/Dom4JConstant.java
→
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
parser/xml/dom4j
/Dom4JConstant.java
View file @
49341f86
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
xml
;
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
parser
.
xml
.
dom4j
;
/**
/**
* <p>Title: Nepxion Discovery</p>
* <p>Title: Nepxion Discovery</p>
...
...
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
xml
/Dom4JParser.java
→
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
parser/xml/dom4j
/Dom4JParser.java
View file @
49341f86
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
xml
;
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
parser
.
xml
.
dom4j
;
/**
/**
* <p>Title: Nepxion Discovery</p>
* <p>Title: Nepxion Discovery</p>
...
...
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
xml
/Dom4JReader.java
→
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
parser/xml/dom4j
/Dom4JReader.java
View file @
49341f86
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
xml
;
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
parser
.
xml
.
dom4j
;
/**
/**
* <p>Title: Nepxion Discovery</p>
* <p>Title: Nepxion Discovery</p>
...
...
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
xml
/Dom4JWriter.java
→
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/
parser/xml/dom4j
/Dom4JWriter.java
View file @
49341f86
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
xml
;
package
com
.
nepxion
.
discovery
.
plugin
.
configcenter
.
parser
.
xml
.
dom4j
;
/**
/**
* <p>Title: Nepxion Discovery</p>
* <p>Title: Nepxion Discovery</p>
...
...
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