Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
22a7f0099
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2022
22a7f0099
Commits
2c5a4f60
Commit
2c5a4f60
authored
5 years ago
by
邹毅贤
Browse files
Options
Downloads
Patches
Plain Diff
fix zookeeper config center namespace default value invalid
parent
932e1495
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/config_center_config.go
+1
-1
1 addition, 1 deletion
config/config_center_config.go
config_center/apollo/impl.go
+1
-1
1 addition, 1 deletion
config_center/apollo/impl.go
config_center/apollo/impl_test.go
+1
-1
1 addition, 1 deletion
config_center/apollo/impl_test.go
with
3 additions
and
3 deletions
config/config_center_config.go
+
1
−
1
View file @
2c5a4f60
...
@@ -40,7 +40,7 @@ type ConfigCenterConfig struct {
...
@@ -40,7 +40,7 @@ type ConfigCenterConfig struct {
Username
string
`yaml:"username" json:"username,omitempty"`
Username
string
`yaml:"username" json:"username,omitempty"`
Password
string
`yaml:"password" json:"password,omitempty"`
Password
string
`yaml:"password" json:"password,omitempty"`
ConfigFile
string
`default:"dubbo.properties" yaml:"config_file" json:"config_file,omitempty"`
ConfigFile
string
`default:"dubbo.properties" yaml:"config_file" json:"config_file,omitempty"`
Namespace
string
`default:"dubbo
.properties
" yaml:"namespace" json:"namespace,omitempty"`
Namespace
string
`default:"dubbo" yaml:"namespace" json:"namespace,omitempty"`
AppConfigFile
string
`default:"dubbo.properties" yaml:"app_config_file" json:"app_config_file,omitempty"`
AppConfigFile
string
`default:"dubbo.properties" yaml:"app_config_file" json:"app_config_file,omitempty"`
AppId
string
`default:"dubbo" yaml:"app_id" json:"app_id,omitempty"`
AppId
string
`default:"dubbo" yaml:"app_id" json:"app_id,omitempty"`
TimeoutStr
string
`yaml:"timeout" json:"timeout,omitempty"`
TimeoutStr
string
`yaml:"timeout" json:"timeout,omitempty"`
...
...
This diff is collapsed.
Click to expand it.
config_center/apollo/impl.go
+
1
−
1
View file @
2c5a4f60
...
@@ -58,7 +58,7 @@ func newApolloConfiguration(url *common.URL) (*apolloConfiguration, error) {
...
@@ -58,7 +58,7 @@ func newApolloConfiguration(url *common.URL) (*apolloConfiguration, error) {
configCluster
:=
url
.
GetParam
(
constant
.
CONFIG_CLUSTER_KEY
,
""
)
configCluster
:=
url
.
GetParam
(
constant
.
CONFIG_CLUSTER_KEY
,
""
)
appId
:=
url
.
GetParam
(
constant
.
CONFIG_APP_ID_KEY
,
""
)
appId
:=
url
.
GetParam
(
constant
.
CONFIG_APP_ID_KEY
,
""
)
namespaces
:=
url
.
GetParam
(
constant
.
CONFIG_NAMESPACE_KEY
,
getProperties
(
DEFAULT_GROUP
))
namespaces
:=
getProperties
(
url
.
GetParam
(
constant
.
CONFIG_NAMESPACE_KEY
,
DEFAULT_GROUP
))
c
.
appConf
=
&
agollo
.
AppConfig
{
c
.
appConf
=
&
agollo
.
AppConfig
{
AppId
:
appId
,
AppId
:
appId
,
Cluster
:
configCluster
,
Cluster
:
configCluster
,
...
...
This diff is collapsed.
Click to expand it.
config_center/apollo/impl_test.go
+
1
−
1
View file @
2c5a4f60
...
@@ -192,7 +192,7 @@ func initMockApollo(t *testing.T) *apolloConfiguration {
...
@@ -192,7 +192,7 @@ func initMockApollo(t *testing.T) *apolloConfiguration {
Address
:
"106.12.25.204:8080"
,
Address
:
"106.12.25.204:8080"
,
AppId
:
"testApplication_yang"
,
AppId
:
"testApplication_yang"
,
Cluster
:
"dev"
,
Cluster
:
"dev"
,
Namespace
:
"mockDubbog
.properties
"
,
Namespace
:
"mockDubbog"
,
}}
}}
apollo
:=
initApollo
()
apollo
:=
initApollo
()
apolloUrl
:=
strings
.
ReplaceAll
(
apollo
.
URL
,
"http"
,
"apollo"
)
apolloUrl
:=
strings
.
ReplaceAll
(
apollo
.
URL
,
"http"
,
"apollo"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment