Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
matrix
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mall
arch
matrix
Commits
266f45e3
Commit
266f45e3
authored
Aug 08, 2019
by
QIANGLU
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev'
parents
0d2cf649
cecbbe32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ApolloContextInitializer.java
config-starter/src/main/java/com/secoo/mall/config/internals/ApolloContextInitializer.java
+1
-1
MatrixLogListenerConfiguration.java
logger-starter/secoo-log-starter/src/main/java/com/secoo/mall/logs/config/MatrixLogListenerConfiguration.java
+1
-1
No files found.
config-starter/src/main/java/com/secoo/mall/config/internals/ApolloContextInitializer.java
View file @
266f45e3
...
@@ -23,7 +23,7 @@ public class ApolloContextInitializer implements ApplicationContextInitializer<C
...
@@ -23,7 +23,7 @@ public class ApolloContextInitializer implements ApplicationContextInitializer<C
String
appId
=
environment
.
getProperty
(
"spring.application.name"
);
String
appId
=
environment
.
getProperty
(
"spring.application.name"
);
String
cacheDir
=
environment
.
getProperty
(
"apollo.cacheDir"
,
"/data/cacheDir"
);
String
cacheDir
=
environment
.
getProperty
(
"apollo.cacheDir"
,
"/data/cacheDir"
);
String
namespaces
=
environment
.
getProperty
(
"apollo.bootstrap.namespaces"
,
"application,
jg
.pub_logs"
);
String
namespaces
=
environment
.
getProperty
(
"apollo.bootstrap.namespaces"
,
"application,
arch
.pub_logs"
);
if
(!
StringUtils
.
isEmpty
(
appId
))
{
if
(!
StringUtils
.
isEmpty
(
appId
))
{
System
.
setProperty
(
"app.id"
,
appId
);
System
.
setProperty
(
"app.id"
,
appId
);
System
.
setProperty
(
"apollo.cacheDir"
,
cacheDir
);
System
.
setProperty
(
"apollo.cacheDir"
,
cacheDir
);
...
...
logger-starter/secoo-log-starter/src/main/java/com/secoo/mall/logs/config/MatrixLogListenerConfiguration.java
View file @
266f45e3
...
@@ -14,11 +14,11 @@ import org.springframework.boot.logging.LoggingSystem;
...
@@ -14,11 +14,11 @@ import org.springframework.boot.logging.LoggingSystem;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
javax.annotation.PostConstruct
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.Set
;
import
java.util.Set
;
/**
/**
* 用于提供动态日志切换
* @author qianglu
* @author qianglu
*/
*/
@Configuration
@Configuration
...
...
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