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

 .idea/
 */target/*
 *.iml
+.project
+monitor-service-nginx/.classpath
+monitor-service-nginx/.gitignore
+monitor-service-nginx/.project
+monitor-service-nginx/.settings/org.eclipse.core.resources.prefs
+monitor-service-nginx/.settings/org.eclipse.jdt.core.prefs
+monitor-service-nginx/.settings/org.eclipse.m2e.core.prefs
+monitor-service-nginx/.settings/org.eclipse.wst.common.component
+monitor-service-nginx/.settings/org.eclipse.wst.validation.prefs
+monitor-service-rabbitmq/.classpath
+monitor-service-rabbitmq/.gitignore
+monitor-service-rabbitmq/.project
+monitor-service-rabbitmq/.settings/org.eclipse.core.resources.prefs
+monitor-service-rabbitmq/.settings/org.eclipse.jdt.core.prefs
+monitor-service-rabbitmq/.settings/org.eclipse.m2e.core.prefs
+monitor-service-rabbitmq/.settings/org.eclipse.wst.common.component
+monitor-service-rabbitmq/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-rabbitmq/.settings/org.eclipse.wst.validation.prefs
+monitor-service-redis/.project
+monitor-service-redis/.settings/org.eclipse.core.resources.prefs
+monitor-service-redis/.settings/org.eclipse.m2e.core.prefs
+monitor-service-common/.settings/org.eclipse.wst.validation.prefs
+monitor-service-influxdb/.classpath
+monitor-service-influxdb/.settings/org.eclipse.wst.validation.prefs
+monitor-service-web/.settings/org.eclipse.wst.validation.prefs
+.settings/org.eclipse.core.resources.prefs
+.settings/org.eclipse.m2e.core.prefs
+monitor-service-cmdb/.classpath
+monitor-service-cmdb/.gitignore
+monitor-service-cmdb/.settings/org.eclipse.core.resources.prefs
+monitor-service-cmdb/.settings/org.eclipse.jdt.core.prefs
+monitor-service-cmdb/.settings/org.eclipse.m2e.core.prefs
+monitor-service-cmdb/.settings/org.eclipse.wst.common.component
+monitor-service-cmdb/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-cmdb/.settings/org.eclipse.wst.validation.prefs
+monitor-service-common/.classpath
+monitor-service-common/.gitignore
+monitor-service-common/.settings/org.eclipse.core.resources.prefs
+monitor-service-common/.settings/org.eclipse.jdt.core.prefs
+monitor-service-common/.settings/org.eclipse.m2e.core.prefs
+monitor-service-common/.settings/org.eclipse.wst.common.component
+monitor-service-common/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-influxdb/.gitignore
+monitor-service-influxdb/.settings/org.eclipse.core.resources.prefs
+monitor-service-influxdb/.settings/org.eclipse.jdt.core.prefs
+monitor-service-influxdb/.settings/org.eclipse.m2e.core.prefs
+monitor-service-influxdb/.settings/org.eclipse.wst.common.component
+monitor-service-influxdb/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-javaserver/.classpath
+monitor-service-javaserver/.gitignore
+monitor-service-javaserver/.settings/org.eclipse.core.resources.prefs
+monitor-service-javaserver/.settings/org.eclipse.jdt.core.prefs
+monitor-service-javaserver/.settings/org.eclipse.m2e.core.prefs
+monitor-service-javaserver/.settings/org.eclipse.wst.common.component
+monitor-service-javaserver/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-javaserver/.settings/org.eclipse.wst.validation.prefs
+monitor-service-mysql/.classpath
+monitor-service-mysql/.gitignore
+monitor-service-mysql/.settings/org.eclipse.core.resources.prefs
+monitor-service-mysql/.settings/org.eclipse.jdt.core.prefs
+monitor-service-mysql/.settings/org.eclipse.m2e.core.prefs
+monitor-service-mysql/.settings/org.eclipse.wst.common.component
+monitor-service-mysql/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-mysql/.settings/org.eclipse.wst.validation.prefs
+monitor-service-nginx/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-service/.classpath
+monitor-service-service/.gitignore
+monitor-service-service/.settings/org.eclipse.core.resources.prefs
+monitor-service-service/.settings/org.eclipse.jdt.core.prefs
+monitor-service-service/.settings/org.eclipse.m2e.core.prefs
+monitor-service-service/.settings/org.eclipse.wst.common.component
+monitor-service-service/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-service/.settings/org.eclipse.wst.validation.prefs
+monitor-service-switch/.classpath
+monitor-service-switch/.gitignore
+monitor-service-switch/.settings/org.eclipse.core.resources.prefs
+monitor-service-switch/.settings/org.eclipse.jdt.core.prefs
+monitor-service-switch/.settings/org.eclipse.m2e.core.prefs
+monitor-service-switch/.settings/org.eclipse.wst.common.component
+monitor-service-switch/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-switch/.settings/org.eclipse.wst.validation.prefs
+monitor-service-web/.classpath
+monitor-service-web/.gitignore
+monitor-service-web/.settings/.jsdtscope
+monitor-service-web/.settings/org.eclipse.core.resources.prefs
+monitor-service-web/.settings/org.eclipse.jdt.core.prefs
+monitor-service-web/.settings/org.eclipse.m2e.core.prefs
+monitor-service-web/.settings/org.eclipse.wst.common.component
+monitor-service-web/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+monitor-service-web/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>monitor-service</groupId>
-            <artifactId>monitor-service-service</artifactId>
+            <artifactId>monitor-service-model</artifactId>
         </dependency>
         <!--项目内部依赖-->
 

@@ -21,6 +21,10 @@
             <groupId>org.influxdb</groupId>
             <artifactId>influxdb-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>monitor-service</groupId>
+            <artifactId>monitor-service-model</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>monitor-service</groupId>
-            <artifactId>monitor-service-service</artifactId>
+            <artifactId>monitor-service-model</artifactId>
         </dependency>
         <!--项目内部依赖-->
 

@@ -37,6 +37,10 @@
             <artifactId>c3p0</artifactId>
             <version>0.9.1.2</version>
         </dependency>
+        <dependency>
+            <groupId>monitor-service</groupId>
+            <artifactId>monitor-service-model</artifactId>
+        </dependency>
     </dependencies>
 
 

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>monitor-service</groupId>
-            <artifactId>monitor-service-service</artifactId>
+            <artifactId>monitor-service-model</artifactId>
         </dependency>
         <!--项目内部依赖-->
 

@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>monitor-service</groupId>
-            <artifactId>monitor-service-service</artifactId>
+            <artifactId>monitor-service-model</artifactId>
         </dependency>
         <!--项目内部依赖-->
 

@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>monitor-service</groupId>
-            <artifactId>monitor-service-service</artifactId>
+            <artifactId>monitor-service-model</artifactId>
         </dependency>
         <!--项目内部依赖-->
 

-<?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-service</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>
-
-    </dependencies>
-
-</project>
\ No newline at end of file

-package com.monitor.service;
-
-/**
- * Created by zhengyouwei on 2016/6/13.
- */
-public class Request {
-    private int id;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-}

-package com.monitor.service;
-
-import com.model.OrderInfoCheck;
-import com.monitor.mysql.mapper.MOrderCheckErrorMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * Created by zhengyouwei on 2016/6/13.
- */
-@Controller
-@RequestMapping("/test")
-public class TestCtrl {
-
-    @Autowired
-    private MOrderCheckErrorMapper mOrderCheckErrorMapper;
-
-    @RequestMapping(value = "get", method = RequestMethod.POST)
-    @ResponseBody
-    public OrderInfoCheck get(@RequestBody Request req){
-        return mOrderCheckErrorMapper.selectByid(req.getId());
-    }
-
-}

-<?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">
-    
-   <bean id="pollingConnectionManager"  class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager">
-    <property name="maxTotal" value="10" />
-    <property name="defaultMaxPerRoute" value="5" />
-  </bean>
-
-  <bean id="httpClientBuilder" class="org.apache.http.impl.client.HttpClientBuilder"
-    factory-method="create">
-    <property name="connectionManager" ref="pollingConnectionManager" />
-  </bean>
-
-  <bean id="httpClient" factory-bean="httpClientBuilder"
-    factory-method="build" />
-
-  <!-- -->
-  <bean id="clientHttpRequestFactory"
-    class="org.springframework.http.client.HttpComponentsClientHttpRequestFactory">
-    <constructor-arg ref="httpClient" />
-    <property name="connectTimeout" value="30000" />
-    <property name="readTimeout" value="30000" />
-  </bean>
-  
-  <bean id="restTemplate" class="org.springframework.web.client.RestTemplate">
-    <constructor-arg ref="clientHttpRequestFactory" />
-    <property name="messageConverters">
-      <list>
-        <bean class="org.springframework.http.converter.StringHttpMessageConverter" />
-        <bean class="org.springframework.http.converter.xml.SourceHttpMessageConverter" />
-        <bean class="org.springframework.http.converter.FormHttpMessageConverter" />
-        <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter" />
-        <bean class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter" />
-      </list>
-    </property>
-  </bean>
-    
-    
-</beans>
\ No newline at end of file

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>monitor-service</groupId>
-            <artifactId>monitor-service-service</artifactId>
+            <artifactId>monitor-service-model</artifactId>
         </dependency>
         <!--项目内部依赖-->
 

@@ -109,11 +109,6 @@
             </dependency>
             <dependency>
                 <groupId>monitor-service</groupId>
-                <artifactId>monitor-service-service</artifactId>
-                <version>${project-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>monitor-service</groupId>
                 <artifactId>monitor-service-switch</artifactId>
                 <version>${project-version}</version>
             </dependency>
@@ -131,7 +126,6 @@
         <module>monitor-service-web</module>
         <module>monitor-service-mysql</module>
         <module>monitor-service-influxdb</module>
-        <module>monitor-service-service</module>
         <module>monitor-service-switch</module>
         <module>monitor-service-redis</module>
         <module>monitor-service-rabbitmq</module>