ops / monitor-service · Commits

Go to a project

Authored by FengRuwei
Commit a1ac3d0c152a806038efa19cd83f1090208cf976 2 parents 4d6f02ce 30cf45f9

Merge branch 'master' of http://git.yoho.cn/ops/monitor-service 

# Conflicts:
#	monitor-service-web/pom.xml
Inline Side-by-side
Showing 12 changed files with 70 additions and 220 deletions
@@ -9,33 +9,8 @@ @@ -9,33 +9,8 @@
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 11
12 - <artifactId>monitor-service-nginx</artifactId> 12 + <artifactId>monitor-service-middleware</artifactId>
13 <version>1.0-SNAPSHOT</version> 13 <version>1.0-SNAPSHOT</version>
14 14
15 - <dependencies>  
16 -  
17 -  
18 - <!--项目内部依赖-->  
19 - <dependency>  
20 - <groupId>monitor-service</groupId>  
21 - <artifactId>monitor-service-common</artifactId>  
22 - </dependency>  
23 - <dependency>  
24 - <groupId>monitor-service</groupId>  
25 - <artifactId>monitor-service-mysql</artifactId>  
26 - </dependency>  
27 - <dependency>  
28 - <groupId>monitor-service</groupId>  
29 - <artifactId>monitor-service-influxdb</artifactId>  
30 - </dependency>  
31 - <dependency>  
32 - <groupId>monitor-service</groupId>  
33 - <artifactId>monitor-service-model</artifactId>  
34 - </dependency>  
35 - <!--项目内部依赖-->  
36 -  
37 - </dependencies>  
38 -  
39 -  
40 15
41 </project> 16 </project>
1 -package com.monitor.nginx; 1 +package com.monitor.middleware.rabbitmq;
2 2
3 /** 3 /**
4 - * Created by zhengyouwei on 2016/6/13. 4 + * Created by zhengyouwei on 2016/6/20.
5 */ 5 */
6 public class Test { 6 public class Test {
7 } 7 }
1 -package com.monitor.rabbitmq; 1 +package com.monitor.middleware.redis;
2 2
3 /** 3 /**
4 - * Created by zhengyouwei on 2016/6/13. 4 + * Created by zhengyouwei on 2016/6/20.
5 */ 5 */
6 public class Test { 6 public class Test {
7 } 7 }
1 -package com.monitor.redis; 1 +package com.monitor.middleware.zookeeper;
2 2
3 /** 3 /**
4 - * Created by zhengyouwei on 2016/6/13. 4 + * Created by zhengyouwei on 2016/6/20.
5 */ 5 */
6 public class Test { 6 public class Test {
7 } 7 }
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 select 41 select
42 <include refid="Base_Column_List" /> 42 <include refid="Base_Column_List" />
43 from host_group 43 from host_group
44 - order by id 44 + order by id desc
45 limit #{startIndex},#{pageSize} 45 limit #{startIndex},#{pageSize}
46 </select> 46 </select>
47 47
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<beans xmlns="http://www.springframework.org/schema/beans"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://www.springframework.org/schema/beans  
5 - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">  
6 -  
7 -</beans>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
5 - <parent>  
6 - <artifactId>monitor-service-parent</artifactId>  
7 - <groupId>monitor-service</groupId>  
8 - <version>1.0-SNAPSHOT</version>  
9 - </parent>  
10 - <modelVersion>4.0.0</modelVersion>  
11 -  
12 - <artifactId>monitor-service-rabbitmq</artifactId>  
13 - <version>1.0-SNAPSHOT</version>  
14 -  
15 -  
16 - <dependencies>  
17 -  
18 -  
19 - <!--项目内部依赖-->  
20 - <dependency>  
21 - <groupId>monitor-service</groupId>  
22 - <artifactId>monitor-service-common</artifactId>  
23 - </dependency>  
24 - <dependency>  
25 - <groupId>monitor-service</groupId>  
26 - <artifactId>monitor-service-mysql</artifactId>  
27 - </dependency>  
28 - <dependency>  
29 - <groupId>monitor-service</groupId>  
30 - <artifactId>monitor-service-influxdb</artifactId>  
31 - </dependency>  
32 - <dependency>  
33 - <groupId>monitor-service</groupId>  
34 - <artifactId>monitor-service-model</artifactId>  
35 - </dependency>  
36 - <!--项目内部依赖-->  
37 -  
38 - </dependencies>  
39 -  
40 -  
41 -</project>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<beans xmlns="http://www.springframework.org/schema/beans"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://www.springframework.org/schema/beans  
5 - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">  
6 -  
7 -</beans>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
5 - <parent>  
6 - <artifactId>monitor-service-parent</artifactId>  
7 - <groupId>monitor-service</groupId>  
8 - <version>1.0-SNAPSHOT</version>  
9 - </parent>  
10 - <modelVersion>4.0.0</modelVersion>  
11 -  
12 - <artifactId>monitor-service-redis</artifactId>  
13 - <dependencies>  
14 -  
15 -  
16 - <!--项目内部依赖-->  
17 - <dependency>  
18 - <groupId>monitor-service</groupId>  
19 - <artifactId>monitor-service-common</artifactId>  
20 - </dependency>  
21 - <dependency>  
22 - <groupId>monitor-service</groupId>  
23 - <artifactId>monitor-service-mysql</artifactId>  
24 - </dependency>  
25 - <dependency>  
26 - <groupId>monitor-service</groupId>  
27 - <artifactId>monitor-service-influxdb</artifactId>  
28 - </dependency>  
29 - <dependency>  
30 - <groupId>monitor-service</groupId>  
31 - <artifactId>monitor-service-model</artifactId>  
32 - </dependency>  
33 - <!--项目内部依赖-->  
34 -  
35 - </dependencies>  
36 -  
37 -  
38 -</project>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<beans xmlns="http://www.springframework.org/schema/beans"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://www.springframework.org/schema/beans  
5 - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">  
6 -  
7 -</beans>  
1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">  
3 - <parent>  
4 - <artifactId>monitor-service-parent</artifactId>  
5 - <groupId>monitor-service</groupId>  
6 - <version>1.0-SNAPSHOT</version>  
7 - </parent>  
8 -  
9 - <modelVersion>4.0.0</modelVersion> 2 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  3 + <parent>
  4 + <artifactId>monitor-service-parent</artifactId>
10 <groupId>monitor-service</groupId> 5 <groupId>monitor-service</groupId>
11 - <artifactId>monitor-service-web</artifactId>  
12 - <packaging>war</packaging> 6 + <version>1.0-SNAPSHOT</version>
  7 + </parent>
  8 +
  9 + <modelVersion>4.0.0</modelVersion>
  10 + <groupId>monitor-service</groupId>
  11 + <artifactId>monitor-service-web</artifactId>
  12 + <packaging>war</packaging>
13 13
14 - <dependencies> 14 + <dependencies>
15 15
16 - <dependency>  
17 - <groupId>javax.servlet</groupId>  
18 - <artifactId>servlet-api</artifactId>  
19 - </dependency>  
20 - <dependency>  
21 - <groupId>javax.servlet.jsp</groupId>  
22 - <artifactId>jsp-api</artifactId>  
23 - </dependency>  
24 - <dependency>  
25 - <groupId>javax.servlet</groupId>  
26 - <artifactId>jstl</artifactId>  
27 - </dependency> 16 + <dependency>
  17 + <groupId>javax.servlet</groupId>
  18 + <artifactId>servlet-api</artifactId>
  19 + </dependency>
  20 + <dependency>
  21 + <groupId>javax.servlet.jsp</groupId>
  22 + <artifactId>jsp-api</artifactId>
  23 + </dependency>
  24 + <dependency>
  25 + <groupId>javax.servlet</groupId>
  26 + <artifactId>jstl</artifactId>
  27 + </dependency>
28 28
29 - <dependency>  
30 - <groupId>monitor-service</groupId>  
31 - <artifactId>monitor-service-cmdb</artifactId>  
32 - </dependency>  
33 - <dependency>  
34 - <groupId>monitor-service</groupId>  
35 - <artifactId>monitor-service-javaserver</artifactId>  
36 - </dependency>  
37 - <dependency>  
38 - <groupId>monitor-service</groupId>  
39 - <artifactId>monitor-service-nginx</artifactId>  
40 - </dependency>  
41 - <dependency>  
42 - <groupId>monitor-service</groupId>  
43 - <artifactId>monitor-service-rabbitmq</artifactId>  
44 - </dependency>  
45 - <dependency>  
46 - <groupId>monitor-service</groupId>  
47 - <artifactId>monitor-service-redis</artifactId>  
48 - </dependency>  
49 - <dependency>  
50 - <groupId>monitor-service</groupId>  
51 - <artifactId>monitor-service-switch</artifactId>  
52 - </dependency>  
53 - <dependency>  
54 - <groupId>org.springframework</groupId>  
55 - <artifactId>spring-test</artifactId>  
56 - <version>4.2.2.RELEASE</version>  
57 - </dependency>  
58 - <dependency>  
59 - <groupId>junit</groupId>  
60 - <artifactId>junit</artifactId>  
61 - <version>4.11</version>  
62 - <scope>test</scope>  
63 - </dependency>  
64 - </dependencies> 29 + <dependency>
  30 + <groupId>monitor-service</groupId>
  31 + <artifactId>monitor-service-cmdb</artifactId>
  32 + </dependency>
  33 + <dependency>
  34 + <groupId>monitor-service</groupId>
  35 + <artifactId>monitor-service-javaserver</artifactId>
  36 + </dependency>
  37 + <dependency>
  38 + <groupId>monitor-service</groupId>
  39 + <artifactId>monitor-service-middleware</artifactId>
  40 + </dependency>
  41 + <dependency>
  42 + <groupId>monitor-service</groupId>
  43 + <artifactId>monitor-service-switch</artifactId>
  44 + </dependency>
  45 + <dependency>
  46 + <groupId>junit</groupId>
  47 + <artifactId>junit</artifactId>
  48 + <version>4.11</version>
  49 + <scope>test</scope>
  50 + </dependency>
  51 + </dependencies>
65 52
66 - <build>  
67 - <finalName>monitor-service</finalName>  
68 - <plugins>  
69 - <plugin>  
70 - <groupId>org.apache.maven.plugins</groupId>  
71 - <artifactId>maven-war-plugin</artifactId>  
72 - <configuration>  
73 - <warName>monitor</warName>  
74 - </configuration>  
75 - </plugin>  
76 - </plugins>  
77 - </build> 53 + <build>
  54 + <finalName>monitor-service</finalName>
  55 + <plugins>
  56 + <plugin>
  57 + <groupId>org.apache.maven.plugins</groupId>
  58 + <artifactId>maven-war-plugin</artifactId>
  59 + <configuration>
  60 + <warName>monitor</warName>
  61 + </configuration>
  62 + </plugin>
  63 + </plugins>
  64 + </build>
78 65
79 </project> 66 </project>
@@ -96,30 +96,20 @@ @@ -96,30 +96,20 @@
96 </dependency> 96 </dependency>
97 <dependency> 97 <dependency>
98 <groupId>monitor-service</groupId> 98 <groupId>monitor-service</groupId>
99 - <artifactId>monitor-service-nginx</artifactId> 99 + <artifactId>monitor-service-switch</artifactId>
100 <version>${project-version}</version> 100 <version>${project-version}</version>
101 </dependency> 101 </dependency>
102 <dependency> 102 <dependency>
103 <groupId>monitor-service</groupId> 103 <groupId>monitor-service</groupId>
104 - <artifactId>monitor-service-rabbitmq</artifactId> 104 + <artifactId>monitor-service-model</artifactId>
105 <version>${project-version}</version> 105 <version>${project-version}</version>
106 </dependency> 106 </dependency>
107 <dependency> 107 <dependency>
108 <groupId>monitor-service</groupId> 108 <groupId>monitor-service</groupId>
109 - <artifactId>monitor-service-redis</artifactId> 109 + <artifactId>monitor-service-middleware</artifactId>
110 <version>${project-version}</version> 110 <version>${project-version}</version>
111 </dependency> 111 </dependency>
112 <dependency> 112 <dependency>
113 - <groupId>monitor-service</groupId>  
114 - <artifactId>monitor-service-switch</artifactId>  
115 - <version>${project-version}</version>  
116 - </dependency>  
117 - <dependency>  
118 - <groupId>monitor-service</groupId>  
119 - <artifactId>monitor-service-model</artifactId>  
120 - <version>1.0-SNAPSHOT</version>  
121 - </dependency>  
122 - <dependency>  
123 <groupId>org.projectlombok</groupId> 113 <groupId>org.projectlombok</groupId>
124 <artifactId>lombok</artifactId> 114 <artifactId>lombok</artifactId>
125 <version>${lombok-version}</version> 115 <version>${lombok-version}</version>
@@ -139,16 +129,14 @@ @@ -139,16 +129,14 @@
139 129
140 <modules> 130 <modules>
141 <module>monitor-service-common</module> 131 <module>monitor-service-common</module>
142 - <module>monitor-service-nginx</module>  
143 <module>monitor-service-web</module> 132 <module>monitor-service-web</module>
144 <module>monitor-service-mysql</module> 133 <module>monitor-service-mysql</module>
145 <module>monitor-service-influxdb</module> 134 <module>monitor-service-influxdb</module>
146 <module>monitor-service-switch</module> 135 <module>monitor-service-switch</module>
147 - <module>monitor-service-redis</module>  
148 - <module>monitor-service-rabbitmq</module>  
149 <module>monitor-service-javaserver</module> 136 <module>monitor-service-javaserver</module>
150 <module>monitor-service-cmdb</module> 137 <module>monitor-service-cmdb</module>
151 <module>monitor-service-model</module> 138 <module>monitor-service-model</module>
  139 + <module>monitor-service-middleware</module>
152 </modules> 140 </modules>
153 141
154 142