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 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>monitor-service-nginx</artifactId>
<artifactId>monitor-service-middleware</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<!--项目内部依赖-->
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-common</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-mysql</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-influxdb</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-model</artifactId>
</dependency>
<!--项目内部依赖-->
</dependencies>
</project>
\ No newline at end of file
... ...
package com.monitor.nginx;
package com.monitor.middleware.rabbitmq;
/**
* Created by zhengyouwei on 2016/6/13.
* Created by zhengyouwei on 2016/6/20.
*/
public class Test {
}
... ...
package com.monitor.rabbitmq;
package com.monitor.middleware.redis;
/**
* Created by zhengyouwei on 2016/6/13.
* Created by zhengyouwei on 2016/6/20.
*/
public class Test {
}
... ...
package com.monitor.redis;
package com.monitor.middleware.zookeeper;
/**
* Created by zhengyouwei on 2016/6/13.
* Created by zhengyouwei on 2016/6/20.
*/
public class Test {
}
... ...
... ... @@ -41,7 +41,7 @@
select
<include refid="Base_Column_List" />
from host_group
order by id
order by id desc
limit #{startIndex},#{pageSize}
</select>
... ...
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
</beans>
\ No newline at end of file
<?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/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>monitor-service-parent</artifactId>
<groupId>monitor-service</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>monitor-service-rabbitmq</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<!--项目内部依赖-->
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-common</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-mysql</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-influxdb</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-model</artifactId>
</dependency>
<!--项目内部依赖-->
</dependencies>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
</beans>
\ No newline at end of file
<?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/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>monitor-service-parent</artifactId>
<groupId>monitor-service</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>monitor-service-redis</artifactId>
<dependencies>
<!--项目内部依赖-->
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-common</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-mysql</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-influxdb</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-model</artifactId>
</dependency>
<!--项目内部依赖-->
</dependencies>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
</beans>
\ No newline at end of file
<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>
<artifactId>monitor-service-parent</artifactId>
<groupId>monitor-service</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>monitor-service-parent</artifactId>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-web</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-web</artifactId>
<packaging>war</packaging>
<dependencies>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-cmdb</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-javaserver</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-nginx</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-rabbitmq</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-redis</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-switch</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.2.2.RELEASE</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-cmdb</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-javaserver</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-middleware</artifactId>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-switch</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>monitor-service</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>monitor</warName>
</configuration>
</plugin>
</plugins>
</build>
<build>
<finalName>monitor-service</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>monitor</warName>
</configuration>
</plugin>
</plugins>
</build>
</project>
... ...
... ... @@ -96,30 +96,20 @@
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-nginx</artifactId>
<artifactId>monitor-service-switch</artifactId>
<version>${project-version}</version>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-rabbitmq</artifactId>
<artifactId>monitor-service-model</artifactId>
<version>${project-version}</version>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-redis</artifactId>
<artifactId>monitor-service-middleware</artifactId>
<version>${project-version}</version>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-switch</artifactId>
<version>${project-version}</version>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-model</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok-version}</version>
... ... @@ -139,16 +129,14 @@
<modules>
<module>monitor-service-common</module>
<module>monitor-service-nginx</module>
<module>monitor-service-web</module>
<module>monitor-service-mysql</module>
<module>monitor-service-influxdb</module>
<module>monitor-service-switch</module>
<module>monitor-service-redis</module>
<module>monitor-service-rabbitmq</module>
<module>monitor-service-javaserver</module>
<module>monitor-service-cmdb</module>
<module>monitor-service-model</module>
<module>monitor-service-middleware</module>
</modules>
... ...