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

@@ -92,3 +92,15 @@ 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
+monitor-service-model/.classpath
+monitor-service-model/.gitignore
+monitor-service-model/.settings/org.eclipse.core.resources.prefs
+monitor-service-model/.settings/org.eclipse.jdt.core.prefs
+monitor-service-model/.settings/org.eclipse.m2e.core.prefs
+monitor-service-model/.settings/org.eclipse.wst.common.component
+monitor-service-model/.settings/org.eclipse.wst.common.project.facet.core.xml
+monitor-service-redis/.classpath
+monitor-service-redis/.gitignore
+monitor-service-redis/.settings/org.eclipse.jdt.core.prefs
+monitor-service-redis/.settings/org.eclipse.wst.common.component
+monitor-service-redis/.settings/org.eclipse.wst.common.project.facet.core.xml

-package com.monitor.cmdb;
-
-/**
- * Created by zhengyouwei on 2016/6/13.
- */
-public class Test {
-}

-package com.monitor.cmdb.controller;
+package com.monitor.cmdb.ctrl;
 
 import com.model.HostGroup;
 import com.monitor.cmdb.service.IHostGroupService;
@@ -18,7 +18,7 @@ import java.util.List;
  * 查询机器信息
  */
 @Controller
-@RequestMapping("HostGroup")
+@RequestMapping("hostGroup")
 public class HostGroupCtrl {
 
     Logger log = LoggerFactory.getLogger(HostGroupCtrl.class);

-package com.monitor.cmdb.controller;
+package com.monitor.cmdb.ctrl;
 
 import com.model.HostInfo;
 import com.monitor.cmdb.service.IHostInfoService;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * 查询机器信息
  */
 @Controller
-@RequestMapping("mechineInfo")
+@RequestMapping("hostInfo")
 public class HostInfoCtrl {
 
     Logger log = LoggerFactory.getLogger(HostInfoCtrl.class);

-package com.monitor.cmdb.controller;
+package com.monitor.cmdb.ctrl;
 
 import com.model.MObjectInfo;
 import com.monitor.cmdb.common.ConObject;

-package com.monitor.cmdb.controller;
+package com.monitor.cmdb.ctrl;
 
 import com.model.TypeInfo;
 import com.monitor.cmdb.common.ConObject;

+package com.monitor.model.request;
+
+import lombok.Data;
+
+/**
+ * Created by yoho on 2016/6/14.
+ */
+@Data
+public class BaseReq {
+    private String params;
+}