Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
5b6e8bc8
Commit
5b6e8bc8
authored
Apr 19, 2016
by
Jason Song
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #110 from yiming187/cat
Integrate Cat in web
parents
2f24e4ee
464da4de
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
37 deletions
+73
-37
app.properties
...o-adminservice/src/main/resources/META-INF/app.properties
+1
-0
pom.xml
apollo-client/pom.xml
+0
-6
CatConfig.java
...in/java/com/ctrip/apollo/common/controller/CatConfig.java
+33
-0
app.properties
...-configservice/src/main/resources/META-INF/app.properties
+1
-0
pom.xml
apollo-core/pom.xml
+37
-31
app.properties
apollo-portal/src/main/resources/META-INF/app.properties
+1
-0
No files found.
apollo-adminservice/src/main/resources/META-INF/app.properties
0 → 100644
View file @
5b6e8bc8
app.id
=
100003172
apollo-client/pom.xml
View file @
5b6e8bc8
...
...
@@ -27,12 +27,6 @@
<artifactId>
framework-foundation
</artifactId>
</dependency>
<!-- end of foundation service -->
<!-- cat -->
<dependency>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
cat-client
</artifactId>
</dependency>
<!-- end of cat -->
<!-- log -->
<dependency>
<groupId>
org.slf4j
</groupId>
...
...
apollo-common/src/main/java/com/ctrip/apollo/common/controller/CatConfig.java
0 → 100644
View file @
5b6e8bc8
package
com
.
ctrip
.
apollo
.
common
.
controller
;
import
javax.servlet.DispatcherType
;
import
org.springframework.boot.context.embedded.FilterRegistrationBean
;
import
org.springframework.boot.context.embedded.ServletListenerRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
com.dianping.cat.servlet.CatFilter
;
import
com.dianping.cat.servlet.CatListener
;
@Configuration
public
class
CatConfig
{
@Bean
public
FilterRegistrationBean
catFilter
()
{
FilterRegistrationBean
bean
=
new
FilterRegistrationBean
();
bean
.
setFilter
(
new
CatFilter
());
bean
.
setName
(
"cat-filter"
);
bean
.
addUrlPatterns
(
"/*"
);
bean
.
setDispatcherTypes
(
DispatcherType
.
REQUEST
,
DispatcherType
.
FORWARD
);
return
bean
;
}
@Bean
public
ServletListenerRegistrationBean
<
CatListener
>
catListener
()
{
ServletListenerRegistrationBean
<
CatListener
>
bean
=
new
ServletListenerRegistrationBean
<
CatListener
>(
new
CatListener
());
bean
.
setName
(
"cat-listener"
);
return
bean
;
}
}
apollo-configservice/src/main/resources/META-INF/app.properties
0 → 100644
View file @
5b6e8bc8
app.id
=
100003171
apollo-core/pom.xml
View file @
5b6e8bc8
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>
<parent>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-core
</artifactId>
<name>
Apollo Core
</name>
<packaging>
jar
</packaging>
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>
<parent>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-core
</artifactId>
<name>
Apollo Core
</name>
<packaging>
jar
</packaging>
<properties>
<github.path>
${project.artifactId}
</github.path>
</properties>
<dependencies>
<!-- json -->
<dependency>
<groupId>
com.google.code.gson
</groupId>
<artifactId>
gson
</artifactId>
</dependency>
<!-- end of json -->
<!-- util -->
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
</dependency>
<!-- end of util -->
<!-- log -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
</dependency>
<!-- end of log -->
</dependencies>
<dependencies>
<!-- cat -->
<dependency>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
cat-client
</artifactId>
</dependency>
<!-- end of cat -->
<!-- json -->
<dependency>
<groupId>
com.google.code.gson
</groupId>
<artifactId>
gson
</artifactId>
</dependency>
<!-- end of json -->
<!-- util -->
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
</dependency>
<!-- end of util -->
<!-- log -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
</dependency>
<!-- end of log -->
</dependencies>
</project>
apollo-portal/src/main/resources/META-INF/app.properties
0 → 100644
View file @
5b6e8bc8
app.id
=
100003173
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