diff --git a/com.creditease.uav.console.buildComponent/config/web_pro.xml b/com.creditease.uav.console.buildComponent/config/web_pro.xml
index 59536a82..587f9287 100644
--- a/com.creditease.uav.console.buildComponent/config/web_pro.xml
+++ b/com.creditease.uav.console.buildComponent/config/web_pro.xml
@@ -14,7 +14,7 @@
 		<servlet-class>com.creditease.uav.apphub.core.AppHubRestServlet</servlet-class>
 		<init-param>
 			<param-name>jersey.config.server.provider.packages</param-name>
-			<param-value>com.creditease.uav.apphub.rest,com.creditease.uav.godeye.rest,com.creditease.uav.manage.rest,com.creditease.uav.appmongo.rest,com.creditease.uav.grafana</param-value>
+			<param-value>com.creditease.uav.apphub.rest,com.creditease.uav.godeye.rest,com.creditease.uav.manage.rest,com.creditease.uav.appmongo.rest,com.creditease.uav.grafana,com.creditease.uav.opentsdb</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 		<async-supported>true</async-supported>
@@ -41,17 +41,6 @@
 		<servlet-name>es-serlvet</servlet-name>
 		<url-pattern>/es/*</url-pattern>
 	</servlet-mapping>
-	<servlet>
-		<servlet-name>opentsdb-crdu-servlet</servlet-name>
-		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestCRDUServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>opentsdb-crdu-servlet</servlet-name>
-		<url-pattern>/db/*</url-pattern>
-	</servlet-mapping>
 	
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
@@ -130,6 +119,10 @@
 		<param-name>uav.app.godeye.redis.store.addr</param-name>
 		<param-value>127.0.0.1:26379</param-value>
 	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.redis.store.addr</param-name>
+		<param-value>127.0.0.1:26379</param-value>
+ 	</context-param>
 	<context-param>
 		<param-name>uav.app.gui.redis.store.params</param-name>
 		<param-value>{"min":50,"max":300,"queue":10}</param-value>
@@ -146,6 +139,14 @@
 		<param-name>uav.app.godeye.redis.store.params</param-name>
 		<param-value>{"min":30,"max":100,"queue":5,"cacheaccess":5}</param-value>
 	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.redis.store.params</param-name>
+		<param-value>{"min":30,"max":100,"queue":5,"cacheaccess":5}</param-value>
+	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.http.client.params</param-name>
+		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
+	</context-param>
 	<context-param>
 		<param-name>uav.app.gui.http.client.params</param-name>
 		<param-value>{"max.con":5,"max.tot.con":20,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
@@ -178,7 +179,7 @@
 		<param-name>@url:uav.app.godeye.notify.view.http.addr</param-name>
 		<param-value>http://127.0.0.1:9011,http://127.0.0.1:9011</param-value>
 	</context-param>
-		<context-param>
+	<context-param>
 		<param-name>@url:uav.app.godeye.notify.strategy.http.addr</param-name>
 		<param-value>http://127.0.0.1:9004,http://127.0.0.1:9004</param-value>
 	</context-param>
@@ -186,11 +187,11 @@
 		<param-name>@url:uav.app.manage.apphubmanager.http.addr</param-name>
 		<param-value>http://127.0.0.1:8031,http://127.0.0.1:8031</param-value>
 	</context-param>
-	    <context-param> 
+	<context-param> 
         <param-name>@url:uav.app.upgrade.server.http.addr</param-name> 
         <param-value>http://127.0.0.1:8888</param-value>
     </context-param>
-        <context-param> 
+    <context-param> 
         <param-name>@url:uav.app.apm.ivc.http.addr</param-name> 
         <param-value>http://127.0.0.1:7799,http://127.0.0.1:7799</param-value>
     </context-param> 
@@ -222,7 +223,7 @@
 		<param-name>uav.apphub.sso.guest.password</param-name>
 		<param-value>guestAbc23781ADSKHbnwe</param-value>
 	</context-param>
-		<context-param>
+	<context-param>
 		<param-name>uav.apphub.sso.implclass</param-name>
 		<param-value>com.creditease.uav.apphub.sso.GUISSOLdapClient</param-value>
 	</context-param>		
@@ -234,10 +235,6 @@
 		<param-name>uav.apphub.sso.grafana.connection.info</param-name>
 		<param-value>{"api.url":"http://127.0.0.1:3000","web.url":"http://uav.creditease.corp/datacenter","datasource.opentsdb.url":"http://127.0.0.1:4242","datasource.elasticsearch.url":"http://127.0.0.1:9300","authorization.loginId":"apiuser","authorization.loginPwd":"Uav!630admin","authorization.register.defPwd":"1q@W3e","authorization.register.sleep.time":"2000"}</param-value>
 	</context-param>
-	<context-param>
-		<param-name>uav.app.opentsdb.http.client.params</param-name>
-		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
-	</context-param>
 	<context-param>
 		<param-name>uav.apphub.sso.white.list</param-name>
 		<!-- 
diff --git a/com.creditease.uav.console.buildComponent/config/web_test.xml b/com.creditease.uav.console.buildComponent/config/web_test.xml
index e596d65d..47d0f394 100644
--- a/com.creditease.uav.console.buildComponent/config/web_test.xml
+++ b/com.creditease.uav.console.buildComponent/config/web_test.xml
@@ -14,7 +14,7 @@
 		<servlet-class>com.creditease.uav.apphub.core.AppHubRestServlet</servlet-class>
 		<init-param>
 			<param-name>jersey.config.server.provider.packages</param-name>
-			<param-value>com.creditease.uav.apphub.rest,com.creditease.uav.godeye.rest,com.creditease.uav.manage.rest,com.creditease.uav.appmongo.rest,com.creditease.uav.grafana</param-value>
+			<param-value>com.creditease.uav.apphub.rest,com.creditease.uav.godeye.rest,com.creditease.uav.manage.rest,com.creditease.uav.appmongo.rest,com.creditease.uav.grafana,com.creditease.uav.opentsdb</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 		<async-supported>true</async-supported>
@@ -41,17 +41,6 @@
 		<servlet-name>es-serlvet</servlet-name>
 		<url-pattern>/es/*</url-pattern>
 	</servlet-mapping>
-	<servlet>
-		<servlet-name>opentsdb-crdu-servlet</servlet-name>
-		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestCRDUServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>opentsdb-crdu-servlet</servlet-name>
-		<url-pattern>/db/*</url-pattern>
-	</servlet-mapping>
 	
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
@@ -130,6 +119,10 @@
 		<param-name>uav.app.godeye.redis.store.addr</param-name>
 		<param-value>127.0.0.1:6379</param-value>
 	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.redis.store.addr</param-name>
+		<param-value>127.0.0.1:6379</param-value>
+ 	</context-param>
 	<context-param>
 		<param-name>uav.app.gui.redis.store.params</param-name>
 		<param-value>{"min":50,"max":300,"queue":10,"pwd":"Uav!1227Admin"}</param-value>
@@ -146,6 +139,14 @@
 		<param-name>uav.app.godeye.redis.store.params</param-name>
 		<param-value>{"min":30,"max":100,"queue":5,"cacheaccess":5,"pwd":"Uav!1227Admin"}</param-value>
 	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.redis.store.params</param-name>
+		<param-value>{"min":30,"max":100,"queue":5,"cacheaccess":5,"pwd":"Uav!1227Admin"}</param-value>
+	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.http.client.params</param-name>
+		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
+	</context-param>
 	<context-param>
 		<param-name>uav.app.gui.http.client.params</param-name>
 		<param-value>{"max.con":5,"max.tot.con":20,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
@@ -166,6 +167,7 @@
 		<param-name>uav.app.es.http.client.params</param-name>
 		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
 	</context-param>
+	
 	<context-param>
 		<param-name>@url:uav.app.godeye.hbquery.http.addr</param-name>
 		<param-value>http://127.0.0.1:8020,http://127.0.0.1:8020</param-value>
@@ -238,10 +240,6 @@
 		<param-name>uav.apphub.sso.grafana.connection.info</param-name>
 		<param-value>{"api.url":"http://127.0.0.1:3000","web.url":"http://127.0.0.1:3000","datasource.opentsdb.url":"http://127.0.0.1:4243","datasource.elasticsearch.url":"http://127.0.0.1:9200","authorization.loginId":"apiuser","authorization.loginPwd":"apiuser","authorization.register.defPwd":"1q@W3e","authorization.register.sleep.time":"2000"}</param-value>
 	</context-param>
-	<context-param>
-		<param-name>uav.app.opentsdb.http.client.params</param-name>
-		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
-	</context-param>
 	<context-param>
 		<param-name>uav.apphub.sso.white.list</param-name>
 		<!-- 
diff --git a/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestAgentServlet.java b/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestAgentServlet.java
index 7859d6e7..f77dbb54 100644
--- a/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestAgentServlet.java
+++ b/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestAgentServlet.java
@@ -1,3 +1,23 @@
+/*-
+ * <<
+ * UAVStack
+ * ==
+ * Copyright (C) 2016 - 2017 UAVStack
+ * ==
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * >>
+ */
+
 package com.creditease.uav.opentsdb;
 
 import java.io.IOException;
@@ -28,22 +48,15 @@ public class OpenTSDBRestAgentServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1441879223883391706L;
 
-    private static Map<String, String> info = null;
-
     private static String url;
 
     @SuppressWarnings("unchecked")
     @Override
     public void init() throws ServletException {
 
-        if (null == info) {
-            String esInfo = this.getInitParameter("db.info");
-            info = JSONHelper.toObject(esInfo, Map.class);
-        }
-
         if (null == httpAsyncClient) {
             Map<String, Integer> httpParamsMap = JSONHelper
-                    .toObject(getServletContext().getInitParameter("uav.app.es.http.client.params"), Map.class);
+                    .toObject(getServletContext().getInitParameter("uav.app.opentsdb.http.client.params"), Map.class);
             httpAsyncClient = HttpAsyncClientFactory.build(httpParamsMap.get("max.con"),
                     httpParamsMap.get("max.tot.con"), httpParamsMap.get("sock.time.out"),
                     httpParamsMap.get("con.time.out"), httpParamsMap.get("req.time.out"));
diff --git a/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestCRDUServlet.java b/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestCRDUServlet.java
deleted file mode 100644
index e9df69d2..00000000
--- a/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestCRDUServlet.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package com.creditease.uav.opentsdb;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.creditease.agent.helpers.JSONHelper;
-import com.creditease.agent.log.SystemLogger;
-import com.creditease.agent.log.api.ISystemLogger;
-import com.creditease.uav.cache.api.CacheManager;
-import com.creditease.uav.cache.api.CacheManagerFactory;
-import com.creditease.uav.httpasync.HttpAsyncClient;
-import com.creditease.uav.httpasync.HttpAsyncClientFactory;
-
-public class OpenTSDBRestCRDUServlet extends HttpServlet {
-
-    private static Map<String, String> info = null;
-
-    private static HttpAsyncClient httpAsyncClient = null;
-
-    private static String PATH = null;
-
-    private static final String Redis_NAME = "opentsdb_json";
-
-    private static CacheManager cm = null;
-
-    private static final String opentsdbCacheRegion = "apphub.opentsdb.cache";
-
-    private static final String opentsdbCacheRegionKey = "apphub.opentsdb.cache.key";
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void init() {
-
-        if (null == info) {
-            String esInfo = this.getInitParameter("db.info");
-            info = JSONHelper.toObject(esInfo, Map.class);
-        }
-
-        if (null == httpAsyncClient) {
-            Map<String, Integer> httpParamsMap = JSONHelper
-                    .toObject(getServletContext().getInitParameter("uav.app.opentsdb.http.client.params"), Map.class); // 改成db的
-            httpAsyncClient = HttpAsyncClientFactory.build(httpParamsMap.get("max.con"),
-                    httpParamsMap.get("max.tot.con"), httpParamsMap.get("sock.time.out"),
-                    httpParamsMap.get("con.time.out"), httpParamsMap.get("req.time.out"));
-        }
-
-        // cache manager
-        String redisAddrStr = getServletContext().getInitParameter("uav.app.godeye.redis.store.addr");
-        Map<String, Object> redisParamsMap = JSONHelper
-                .toObject(getServletContext().getInitParameter("uav.app.godeye.redis.store.params"), Map.class);
-        cm = CacheManagerFactory.build(redisAddrStr, Integer.valueOf(String.valueOf(redisParamsMap.get("min"))),
-                Integer.valueOf(String.valueOf(redisParamsMap.get("max"))),
-                Integer.valueOf(String.valueOf(redisParamsMap.get("queue"))),
-                String.valueOf(redisParamsMap.get("pwd")));
-
-    }
-
-    @Override
-    public void service(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-
-        if (PATH == null) {
-            PATH = req.getServletContext().getRealPath("") + "/uavapp_baseclassmgt/dbhead/json.txt";
-        }
-        // 获取请求资源
-        String proName = req.getServletContext().getContextPath();
-        String requestSource = req.getRequestURI();
-        requestSource = requestSource.substring(requestSource.indexOf(proName) + proName.length());
-
-        if (requestSource.startsWith("/db")) {
-            requestSource = requestSource.substring(3);
-        }
-        // 加载列表
-        if ("/loadDbs".equals(requestSource)) {
-            String str = loadDbs();
-            try {
-                respWriter(resp, str);
-            }
-            catch (IOException e) {
-                ISystemLogger logger = SystemLogger.getLogger(OpenTSDBRestCRDUServlet.class);
-                logger.err(this, "OpenTSDBRestCRDUServlet Exception: " + e.getMessage(), e);
-            }
-            return;
-        }
-
-        // 删除列
-        if ("/delDb".equals(requestSource)) {
-            String data = loadData(req);
-            data = data.substring(1, data.length() - 1);
-            data = delDb(data);
-            try {
-                respWriter(resp, data);
-            }
-            catch (IOException e) {
-                ISystemLogger logger = SystemLogger.getLogger(OpenTSDBRestCRDUServlet.class);
-                logger.err(this, "OpenTSDBRestCRDUServlet Exception: " + e.getMessage(), e);
-            }
-            return;
-        }
-
-        // 查询ByName
-        if ("/queryDb".equals(requestSource)) {
-            String data = loadData(req);
-            String name = data.substring(data.indexOf(":") + 1, data.length() - 1);
-            String res = queryDbById(name);
-            res = "[" + res + "]";
-            try {
-                respWriter(resp, res);
-            }
-            catch (IOException e) {
-                ISystemLogger logger = SystemLogger.getLogger(OpenTSDBRestCRDUServlet.class);
-                logger.err(this, "OpenTSDBRestCRDUServlet Exception: " + e.getMessage(), e);
-            }
-            return;
-
-        }
-
-        // 更新DB
-        if ("/modifyDb".equals(requestSource)) {
-            String data = loadData(req);
-            String res = updateDb(data);
-            try {
-                respWriter(resp, res);
-            }
-            catch (IOException e) {
-                ISystemLogger logger = SystemLogger.getLogger(OpenTSDBRestCRDUServlet.class);
-                logger.err(this, "OpenTSDBRestCRDUServlet Exception: " + e.getMessage(), e);
-            }
-            return;
-        }
-
-        // 添加DB
-        if ("/addDb".equals(requestSource)) {
-            String data = loadData(req);
-            String res = addDb(data);
-            try {
-                respWriter(resp, res);
-            }
-            catch (IOException e) {
-                ISystemLogger logger = SystemLogger.getLogger(OpenTSDBRestCRDUServlet.class);
-                logger.err(this, "OpenTSDBRestCRDUServlet Exception: " + e.getMessage(), e);
-            }
-            return;
-        }
-        // 搜索功能
-        if ("/searchDbs".equals(requestSource)) {
-            String data = loadData(req);
-            Map<String, String> map = JSONHelper.toObject(data, HashMap.class);
-            String url = map.get("url");
-            String res = queryDbByUrl(url);
-            try {
-                respWriter(resp, res);
-            }
-            catch (IOException e) {
-                ISystemLogger logger = SystemLogger.getLogger(OpenTSDBRestCRDUServlet.class);
-                logger.err(this, "OpenTSDBRestCRDUServlet Exception: " + e.getMessage(), e);
-            }
-            return;
-        }
-
-    }
-
-    private static void respWriter(HttpServletResponse resp, String res) throws IOException {
-
-        resp.setCharacterEncoding("utf-8");
-        resp.getWriter().print(res);
-        resp.getWriter().flush();
-        resp.getWriter().close();
-    }
-
-    private static String loadData(HttpServletRequest req) throws IOException {
-
-        StringBuffer json = new StringBuffer();
-        String line = null;
-        BufferedReader reader = req.getReader();
-        while ((line = reader.readLine()) != null) {
-            json.append(line);
-        }
-        return json.toString();
-    }
-
-    private String loadDbs() throws IOException {
-
-        String str = loadJson();
-        return str;
-    }
-
-    private String queryDbById(String name) throws IOException {
-
-        String res = loadDbs();
-
-        List<Map> list = JSONHelper.toObjectArray(res, Map.class);
-        if (list == null || list.size() == 0) {
-            return null;
-        }
-        if (name.length() > 1) {
-            name = name.substring(1, name.length() - 1);
-        }
-        for (Map m : list) {
-            String map_name = (String) m.get("name");
-            if (name.equals(map_name)) {
-                return JSONHelper.toString(m);
-            }
-        }
-
-        return null;
-    }
-
-    private String queryDbByUrl(String url) throws IOException {
-
-        String res = loadDbs();
-
-        List<Map> list = JSONHelper.toObjectArray(res, Map.class);
-        if (list == null || list.size() == 0) {
-            return null;
-        }
-        List<Map> ret = new ArrayList<Map>();
-        for (Map m : list) {
-            String map_url = (String) m.get("url");
-            if (map_url.contains(url)) {
-                ret.add(m);
-            }
-        }
-        return JSONHelper.toString(ret);
-    }
-
-    private String delDb(String name) throws IOException {
-
-        String res = loadDbs();
-        if (name.length() > 1) {
-            name = name.substring(name.indexOf(":") + 2, name.length() - 1);
-        }
-        List<Map> list = JSONHelper.toObjectArray(res, Map.class);
-
-        for (Map m : list) {
-            String map_name = (String) m.get("name");
-            if (name.equals(map_name)) {
-                list.remove(m);
-                // saveJSON(JSONHelper.toString(list));
-                saveJSONRedis(JSONHelper.toString(list));
-                return loadDbs();
-            }
-        }
-
-        return null;
-    }
-
-    private String addDb(String str) throws IOException {
-
-        String name = str.substring(str.indexOf(":") + 1, str.indexOf(","));
-
-        if (name == null || name.equals("\"\"")) {
-            return null;
-        }
-        String res = queryDbById(name);
-        if (res != null) {
-            // return loadDbs();
-            return "multi_name";
-        }
-
-        res = loadJson();
-
-        List<Map> list = JSONHelper.toObjectArray(res, Map.class);
-        Map m = JSONHelper.toObject(str, Map.class);
-        list.add(m);
-        saveJSONRedis(JSONHelper.toString(list));
-        return loadDbs();
-    }
-
-    private String updateDb(String str) throws IOException {
-
-        String name = str.substring(str.indexOf(":") + 1, str.indexOf(","));
-
-        if (name == null || name.equals("\"\"")) {
-            return null;
-        }
-        String res = loadDbs();
-        if (res == null) {
-            return null;
-        }
-        if (name.length() > 1) {
-            name = name.substring(1, name.length() - 1);
-        }
-
-        List<Map> list = JSONHelper.toObjectArray(res, Map.class);
-        List<Map> ret = new ArrayList<Map>();
-        for (Map m : list) {
-            String map_name = (String) m.get("name");
-            if (name.equals(map_name)) {
-                ret.add(JSONHelper.toObject(str, Map.class));
-            }
-            else {
-                ret.add(m);
-            }
-        }
-        saveJSONRedis(JSONHelper.toString(ret));
-        return loadDbs();
-    }
-
-    private void saveJSONRedis(String str) {
-
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put(this.Redis_NAME, str);
-        cm.putHash(opentsdbCacheRegion, opentsdbCacheRegionKey, this.Redis_NAME, JSONHelper.toString(map));
-    }
-
-    private String queryJSONRedis() {
-
-        Map<String, String> dbMap = cm.getHash(opentsdbCacheRegion, opentsdbCacheRegionKey, this.Redis_NAME);
-        Map<String, String> old = JSONHelper.toObject(dbMap.get(this.Redis_NAME), Map.class);
-        if (null == old) {
-            return null;
-        }
-        return old.get(this.Redis_NAME);
-    }
-
-    private String loadJson() throws IOException {
-
-        String str;
-        str = queryJSONRedis();
-        if (null == str || str.length() < 2) {
-            str = "[]";
-        }
-        return str;
-    }
-
-}
diff --git a/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestService.java b/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestService.java
new file mode 100644
index 00000000..40db89ff
--- /dev/null
+++ b/com.creditease.uav.console/src/main/java/com/creditease/uav/opentsdb/OpenTSDBRestService.java
@@ -0,0 +1,215 @@
+/*-
+ * <<
+ * UAVStack
+ * ==
+ * Copyright (C) 2016 - 2017 UAVStack
+ * ==
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * >>
+ */
+
+package com.creditease.uav.opentsdb;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import com.creditease.agent.helpers.JSONHelper;
+import com.creditease.agent.helpers.StringHelper;
+import com.creditease.uav.apphub.core.AppHubBaseRestService;
+import com.creditease.uav.cache.api.CacheManager;
+import com.creditease.uav.cache.api.CacheManagerFactory;
+
+@Consumes(MediaType.APPLICATION_JSON + ";charset=utf-8")
+@Path("db")
+public class OpenTSDBRestService extends AppHubBaseRestService {
+
+    private static CacheManager cm = null;
+
+    private static final String OPENTSDB_AGENT_CACHEREGION = "opentsdb.agent.cache";
+
+    private static final String OPENTSDB_AGENT_CACHEREGION_KEY = "opentsdb.agent.cache.key";
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void init() {
+
+        // cache manager
+        String redisAddrStr = request.getServletContext().getInitParameter("uav.app.opentsdb.redis.store.addr");
+        Map<String, Object> redisParamsMap = JSONHelper.toObject(
+                request.getServletContext().getInitParameter("uav.app.opentsdb.redis.store.params"), Map.class);
+        cm = CacheManagerFactory.build(redisAddrStr, Integer.valueOf(String.valueOf(redisParamsMap.get("min"))),
+                Integer.valueOf(String.valueOf(redisParamsMap.get("max"))),
+                Integer.valueOf(String.valueOf(redisParamsMap.get("queue"))),
+                String.valueOf(redisParamsMap.get("pwd")));
+
+    }
+
+    @GET
+    @Path("loadDbs")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    public String loadDbs() {
+
+        Map<String, String> total = queryMapRedis();
+        return obtainResultString(total);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @POST
+    @Path("delDb")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    public String delDb(String name) {
+
+        Map<String, String> map = JSONHelper.toObject(name, Map.class);
+        name = map.get("name");
+
+        return delDbFromRedis(name);
+    }
+
+    @GET
+    @Path("queryDb")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    public String queryDb(@QueryParam("name") String name) {
+
+        String res = cm.getHash(OPENTSDB_AGENT_CACHEREGION, OPENTSDB_AGENT_CACHEREGION_KEY, name).get(name);
+        res = "[" + res + "]";
+
+        return res;
+
+    }
+
+    @POST
+    @Path("modifyDb")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    public String modifyDb(String data) {
+
+        return modifyDbFromRedis(data);
+    }
+
+    @POST
+    @Path("addDb")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    public String addDb(String data) {
+
+        return addDbFromRedis(data);
+    }
+
+    @GET
+    @Path("searchDbs")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    public String searchDbs(@QueryParam("url") String url) {
+
+        return queryDbByUrl(url);
+    }
+
+    private String obtainResultString(Map<String, String> total) {
+
+        String res = null;
+        StringBuilder sb = new StringBuilder("[");
+        for (String key : total.keySet()) {
+            sb.append(total.get(key));
+            sb.append(",");
+        }
+        if (sb.length() > 1) {
+            res = sb.substring(0, sb.length() - 1);
+        }
+        else {
+            res = "[";
+        }
+        res += "]";
+
+        return res;
+    }
+
+    @SuppressWarnings("unchecked")
+    private String queryDbByUrl(String url) {
+
+        Map<String, String> total = queryMapRedis();
+
+        Iterator<String> iter = total.keySet().iterator();
+        while (iter.hasNext()) {
+            String key = iter.next();
+            Map<String, String> map = JSONHelper.toObject(total.get(key), Map.class);
+            String mapUrl = map.get("url");
+            if (!mapUrl.contains(url)) {
+                iter.remove();
+            }
+        }
+
+        return obtainResultString(total);
+
+    }
+
+    private String delDbFromRedis(String name) {
+
+        Map<String, String> total = queryMapRedis();
+        total.remove(name);
+        cm.delHash(OPENTSDB_AGENT_CACHEREGION, OPENTSDB_AGENT_CACHEREGION_KEY, name);
+
+        return obtainResultString(total);
+    }
+
+    @SuppressWarnings("unchecked")
+    private String addDbFromRedis(String data) {
+
+        Map<String, String> map = JSONHelper.toObject(data, Map.class);
+        String name = map.get("name");
+        String res = cm.getHash(OPENTSDB_AGENT_CACHEREGION, OPENTSDB_AGENT_CACHEREGION_KEY, name).get(name);
+        if (!StringHelper.isEmpty(res)) {
+            Map<String, String> error = new HashMap<String, String>();
+            error.put("error", "conflict_name");
+            return JSONHelper.toString(error);
+        }
+
+        return updateMapRedisByName(name, data);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    private String modifyDbFromRedis(String data) {
+
+        Map<String, String> map = JSONHelper.toObject(data, Map.class);
+        String name = map.get("name");
+
+        return updateMapRedisByName(name, data);
+    }
+
+    private String updateMapRedisByName(String name, String data) {
+
+        Map<String, String> total = queryMapRedis();
+        total.put(name, data);
+        cm.putHash(OPENTSDB_AGENT_CACHEREGION, OPENTSDB_AGENT_CACHEREGION_KEY, name, data);
+
+        return obtainResultString(total);
+    }
+
+    private Map<String, String> queryMapRedis() {
+
+        Map<String, String> total = cm.getHashAll(OPENTSDB_AGENT_CACHEREGION, OPENTSDB_AGENT_CACHEREGION_KEY);
+        if (null == total) {
+            return new HashMap<String, String>();
+        }
+
+        return total;
+    }
+
+}
diff --git a/com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml b/com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml
index b50e3b2b..c67037d9 100644
--- a/com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml
+++ b/com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml
@@ -14,7 +14,7 @@
 		<servlet-class>com.creditease.uav.apphub.core.AppHubRestServlet</servlet-class>
 		<init-param>
 			<param-name>jersey.config.server.provider.packages</param-name>
-			<param-value>com.creditease.uav.apphub.rest,com.creditease.uav.godeye.rest,com.creditease.uav.manage.rest,com.creditease.uav.appmongo.rest,com.creditease.uav.xrobot.rest,com.creditease.uav.grafana</param-value>
+			<param-value>com.creditease.uav.apphub.rest,com.creditease.uav.godeye.rest,com.creditease.uav.manage.rest,com.creditease.uav.appmongo.rest,com.creditease.uav.xrobot.rest,com.creditease.uav.grafana,com.creditease.uav.opentsdb</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 		<async-supported>true</async-supported>
@@ -41,18 +41,6 @@
 		<url-pattern>/es/*</url-pattern>
 	</servlet-mapping>
 	
-	<servlet>
-		<servlet-name>opentsdb-crdu-servlet</servlet-name>
-		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestCRDUServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>opentsdb-crdu-servlet</servlet-name>
-		<url-pattern>/db/*</url-pattern>
-	</servlet-mapping>
-	
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
@@ -133,6 +121,10 @@
 	<context-param>
 		<param-name>uav.app.godeye.redis.store.addr</param-name>
 		<param-value>localhost:6379</param-value>
+	</context-param>
+		<context-param>
+		<param-name>uav.app.opentsdb.redis.store.addr</param-name>
+		<param-value>localhost:6379</param-value>
 	</context-param>
 	<context-param>
 		<param-name>uav.app.gui.redis.store.params</param-name>
@@ -174,6 +166,14 @@
 		<param-name>uav.app.es.http.client.params</param-name>
 		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
 	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.redis.store.params</param-name>
+		<param-value>{"min":30,"max":100,"queue":5,"cacheaccess":5,"pwd":""}</param-value>
+	</context-param>
+	<context-param>
+		<param-name>uav.app.opentsdb.http.client.params</param-name>
+		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
+	</context-param>
 	<context-param>
 		<param-name>@url:uav.app.godeye.hbquery.http.addr</param-name>
 		<param-value>http://localhost:8020</param-value>
@@ -259,10 +259,7 @@
 		 -->
 		<param-value>{"vipgroup":""}</param-value>
 	</context-param>
-	<context-param>
-		<param-name>uav.app.opentsdb.http.client.params</param-name>
-		<param-value>{"max.con":50,"max.tot.con":200,"sock.time.out":10000,"con.time.out":10000,"req.time.out":10000}</param-value>
-	</context-param>
+	
 	<!--configure end-->
 	<session-config>
 		<session-timeout>30</session-timeout>
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/db.css b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/db.css
deleted file mode 100644
index 0d26635f..00000000
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/db.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.editor-input {
-  height: 23px;
-  border: 1px solid #ddd;
-  padding-left: 10px;
-  font-size: 13px;
-  border-radius: 3px;
-  width: 200px;
-}
-.editor-label {
-  width: 120px;
-  font-size: 14px;
-  line-height: 30px;
-  display: inline-block;
-  text-align: right;
-}
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/uav.opentsdb.css b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/uav.agent.opentsdb.css
similarity index 51%
rename from com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/uav.opentsdb.css
rename to com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/uav.agent.opentsdb.css
index 5712019d..4e09dcd8 100644
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/uav.opentsdb.css
+++ b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/css/uav.agent.opentsdb.css
@@ -3,7 +3,6 @@
 html {
 	height: 100%;
 }
-
 body {
 	font-size: 14px;
 	font-family: "微软雅黑";
@@ -14,41 +13,23 @@ body {
 	text-align: center;
 	height: 100%;
 }
-
 .ListBG {
 	background: white;
 	color: black;
 	font-size: 14px;
 }
-
 .ObjectBG {
 	font-size: 16px;
 	color: #333333;
 	background: white;
 }
 
-.AppHubMVCSearchBarInputText {
-	width: 207px;
-	text-align: left;
-}
-
 .icon-myout {
 	float: right;
 	margin-top: -3px;
 	margin-right: 15px;
 	font-size: 2em;
 }
-
-.icon-myout:hover {
-	border-radius: 3px;
-	box-shadow: 0 0 4px 4px #fff;
-}
-
-
-
-
-/*详情页面布局 BEGIN*/
-
 .ObjectBG span{
 	word-break:break-all; 
 	white-space:normal ;
@@ -61,11 +42,15 @@ body {
 	word-wrap : break-word ;
 	display:inline-block;
 }
-.colon{
-	color: #000000;
-	font-weight:bold;
+.ObjectBG ul {
+	margin: 0 10px 0 10px;
+	text-align: left;
+	padding: 0px;
 }
 
+.ObjectBG li {
+	list-style-type: none;
+}
 .title-head {
 	font-size: 16px;
 	color: #ffffff;
@@ -74,73 +59,56 @@ body {
 	padding-bottom:12px;
 }
 
-.titleH {
-	font-weight: bold;
-	color: #008040;
+.editor-input {
+  height: 23px;
+  border: 1px solid #ddd;
+  padding-left: 10px;
+  font-size: 13px;
+  border-radius: 3px;
+  width: 90%;
+  resize:none;
 }
-
-.timeLH{
-	font-weight: bold;
-	color: #ff0000;
-}
-
-
-.listBody li{
-	color:  #959595;
-	font-size: 14px;
-}
-
-.listBdesc{
-	color:  #000000;
-	margin-left:10px;
-}
-
-.ObjectBG ul {
-	margin: 0 10px 0 10px;
+.title
+{
 	text-align: left;
-	padding: 0px;
-}
-
-.ObjectBG li {
-	list-style-type: none;
+	width: 15%;
 }
-
-.publicheadDiv {
-	color: #777;
-}
-
-.publicheadDiv .tValue{
-	color: #DC143C;
+.userinput
+{
+	text-align: left;
+	width: 85%;
 }
-
-.listDiv {
-	margin-top:3px;
-	box-shadow: 0 0 0px 1px #009ad6;
-	font-size: 14px;
-	background: #FFFFE0;
-	margin-bottom:5px;
+.icon-myout:hover {
+	border-radius: 3px;
+	box-shadow: 0 0 4px 4px #fff;
 }
-
-.listDiv .title {
-	font-size: 16px;
-	color:#fff;
-	padding-top:2px;
-	padding-bottom:2px;
-	background:#87CEEB;
+.modal-header
+{
+    padding: 2px 2px;
+    padding-top: 2px;
+    padding-right: 15px;
+    padding-bottom: 2px;
+    padding-left: 15px;
+    border-bottom: 1px solid #eee;
+    text-align: left;
+    background-color: #337ab7;	
 }
-
-.listDiv .argsTitle{
-	margin-left:0px;	
-	color: #DC143C;
-	!font-weight:bold;
+.modal-footer {
+    padding: 2px 2px;
 }
 
-.listDiv .argsSubTitle{
-	margin-left:10px;
-	color: #6B8E23;
+.modal-body {
+    position: relative;
+    max-height: 400px;
+    padding: 5px;
+    overflow-y: auto;
 }
 
-.listDiv .argsSubValue {
-	color:#333;
+.errorMsg
+{
+	color: red;
+	margin-right: 10px;
 }
-/*详情页面布局 END*/
\ No newline at end of file
+.pointer {
+	cursor : pointer;
+}
\ No newline at end of file
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/index.html b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/index.html
index dd41b960..f7b1d0b6 100644
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/index.html
+++ b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/index.html
@@ -12,8 +12,7 @@
     <link rel="stylesheet" type="text/css" href="../../apphub/css/comp.mvc.css">
     
     <link rel="stylesheet" type="text/css" href="../../apphub/css/crud.css">
-    <link rel="stylesheet" type="text/css" href="css/db.css">
-    <link rel="stylesheet" type="text/css" href="css/uav.opentsdb.css">
+    <link rel="stylesheet" type="text/css" href="css/uav.agent.opentsdb.css">
     
 	
 	<!--third party-->
@@ -36,9 +35,96 @@
 		
 </head>
 <body>
+	<div class="modal fade" id="OpenTSDBAddModal" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+		        <div class="modal-header">
+		             <h5>添加</h5>
+		        </div>
+		        <div class="modal-body">
+		           <form id="OpenTSDBAddForm">
+		           		<table>
+		           			<tr>
+		           				<td class="title">实例名称：</td>
+		           				<td class="userinput"><input type='text' class='editor-input' id='OpenTSDBAddName'></td>
+		           			</tr>
+		           			<tr>
+		           				<td class="title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;URL：</td>
+		           				<td class="userinput"><input type='text' class='editor-input' id='OpenTSDBAddURL'></td>
+		           			</tr>
+		           			<tr>
+		           				<td class="title">版本编号：</td>
+		           				<td class="userinput"><input type='text' class='editor-input' id='OpenTSDBAddVersion'></td>
+		           			</tr>
+		           		</table>
+				   </form>
+		        </div>
+		        <div class="modal-footer">
+		        	<span class="errorMsg" id="errorAddMsg" style="display:none"></span>
+		        	<button id="AddOpenTSDBSavaBTN" class="btn btn-primary" onclick="clickSureCallback_add()">保存</button>
+		            <button class="btn" onclick="closeModal('add')">关闭</button>
+		        </div>
+	        </div>
+	    </div>
+	</div>
+	
+	<div class="modal fade" id="OpenTSDBModifyModal" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+		        <div class="modal-header">
+		             <h5>修改</h5>
+		        </div>
+		        <div class="modal-body">
+		           <form id="OpenTSDBModifyForm">
+		           		<table>
+		           			<tr>
+		           				<td class="title">实例名称：</td>
+		           				<td class="userinput"><input type='text' id="OpenTSDBModifyName" class="editor-input" value="" disabled="disabled"></td>		           						           			</tr>
+		           			<tr>
+		           				<td class="title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;URL：</td>
+		           				<td class="userinput"><input type='text' class='editor-input' id='OpenTSDBModifyURL' value=""></td>
+		           			</tr>
+		           			<tr>
+		           				<td class="title">版本编号：</td>
+		           				<td class="userinput"><input type='text' class='editor-input' id='OpenTSDBModifyVersion' value=""></td>
+		           			</tr>
+		           		</table>
+				   </form>
+		        </div>
+		        <div class="modal-footer">
+		        	<span class="errorMsg" id="errorModifyMsg" style="display:none"></span>
+		        	<button id="ModifyOpenTSDBBTN" class="btn btn-primary" onclick="clickSureCallback_modify()">修改</button>
+		            <button class="btn" onclick="closeModal('modify')">关闭</button>
+		        </div>
+	        </div>
+	    </div>
+	</div>
+	
+	<div class="modal fade" id="OpenTSDBDelModal" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+		        <div class="modal-header">
+		             <h5>删除</h5>
+		        </div>
+		        <div class="modal-body">
+		           <form id="OpenTSDBModifyForm">
+		           		<table>
+		           			<tr>
+		           				<td>是否确定删除[<span style='color: red' id='OpenTSDBDelName'></span>]</td>
+		           			</tr>
+		           		</table>
+				   </form>
+		        </div>
+		        <div class="modal-footer">
+		        	<span class="errorMsg" id="errorDelMsg" style="display:none"></span>
+		        	<button id="ModifyOpenTSDBBTN" class="btn btn-primary" onclick="clickSureCallback_del()">删除</button>
+		            <button class="btn" onclick="closeModal('del')">关闭</button>
+		        </div>
+	        </div>
+	    </div>
+	</div>
 </body>
 <!--app lib-->
-<script type="text/javascript" src="js/uav.opentsdb.js"></script>
-<script type="text/javascript" src="js/table.js"></script>
-<script type="text/javascript" src="js/db_manage.js"></script>
+<script type="text/javascript" src="js/list_manage.js"></script>
+<script type="text/javascript" src="js/opentsdb_agent.js"></script>
 </html>
\ No newline at end of file
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/confirm.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/confirm.js
deleted file mode 100644
index e44fa7c7..00000000
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/confirm.js
+++ /dev/null
@@ -1,17 +0,0 @@
-
-var modalConfig = {
-	head:"用户输入标题",
-	content:"用户输入验证信息",
-	callback:"clickSureCallback()"
-};
-
-function clickSureCallback(){
-	console.log('adfadfadf');
-};
-
-$("document").ready(function(){
-	showConfirm(modalConfig);
-});
-	
-	
-	
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/db_manage.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/db_manage.js
deleted file mode 100644
index 340b2b11..00000000
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/db_manage.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var delmodalConfig = {
-    id          :0,
-    head        :"提示",
-    content     :"",
-    callback    :"clickSureCallback()"
-}
-
-var addmodalConfig = {
-	id          :0,
-	head        :"添加",
-	content     :"",
-	callback    :"clickSureCallback_add()"
-}
-
-var modifymodalConfig = {
-		id       :0,
-		head     :"修改",
-		content  :"",
-		callback :"clickSureCallback_modify()"
-	}
-
-var opentsdb = {
-		name     :'0',
-		url      :'0',
-		version  :'0'
-}
-
-function clickSureCallback(){
-	deleteDb_RESTClient(delmodalConfig.id);
-}
-
-function userDelete(id,trObj){
-    delmodalConfig.id=id;
-    delmodalConfig.content="是否确定删除[<span style='color: red'>"+trObj.getElementsByTagName("td")[0].id+"</span>]";
-    showConfirm(delmodalConfig);
-}
-
-function userClickRow(v) {
-	queryDbById_RESTClient(v);
-}
-
-function showDbById(data) {
-	modifymodalConfig.id = data[0].name;
-	modifymodalConfig.content="<label class='editor-label'>实例名称</label>: <input type='text' class='editor-input' id='opentsdb_name' disabled='true' value='"+data[0].name+"'><br>";
-	modifymodalConfig.content+="<label class='editor-label'>URL</label>: <input type='text' class='editor-input' id='opentsdb_url' value='"+data[0].url+"'><br>";
-	modifymodalConfig.content+="<label class='editor-label'>版本号</label>: <input type='text' class='editor-input' id='opentsdb_version' value='"+data[0].version+"'><br>";
-	showConfirm(modifymodalConfig);
-}
-
-function clickSureCallback_modify() {
-	opentsdb.name = document.getElementById("opentsdb_name").value;
-	opentsdb.url = document.getElementById("opentsdb_url").value;
-	opentsdb.version = document.getElementById("opentsdb_version").value;
-	modifyDb_RESTClient(opentsdb);
-}
-
-function ajaxGetdatas() {
-	loadDbs_RESTClient();
-}
-
-function addOpenTSDB() {
-	addmodalConfig.content="<label class='editor-label'>实例名称</label>: <input type='text' class='editor-input' id='opentsdb_name'><br>";
-	addmodalConfig.content+="<label class='editor-label'>URL</label>: <input type='text' class='editor-input' id='opentsdb_url'><br>";
-	addmodalConfig.content+="<label class='editor-label'>版本号</label>: <input type='text' class='editor-input' id='opentsdb_version'><br>";
-	showConfirm(addmodalConfig);
-}
-
-
-function clickSureCallback_add(){
-	opentsdb.name = document.getElementById("opentsdb_name").value;
-	opentsdb.url = document.getElementById("opentsdb_url").value;
-	opentsdb.version = document.getElementById("opentsdb_version").value;
-	addDb_RESTClient(opentsdb);
-}
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/dialog.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/dialog.js
deleted file mode 100644
index 47f65a96..00000000
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/dialog.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-var modalConfig = {
-	head:"用户输入标题",
-	content:"用户输入提示信息"
-};
-
-$("document").ready(function(){	
-	showDialog(modalConfig);
-});
-	
-	
-	
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/list_manage.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/list_manage.js
new file mode 100644
index 00000000..0f784387
--- /dev/null
+++ b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/list_manage.js
@@ -0,0 +1,268 @@
+var url = "../../rs/db/";
+var list = null;
+
+var delmodalConfig = {
+    head     :"提示",
+    content  :"",
+    callback :"clickSureCallback_del()"
+};
+
+var addmodalConfig = {
+	head     :"添加",
+	content  :"",
+	callback :"clickSureCallback_add()"
+};
+
+var modifymodalConfig = {
+	head     :"修改",
+	content  :"",
+	callback :"clickSureCallback_modify()"
+};
+
+var opentsdbmodalConfig = {
+	name     :'0',
+	url      :'0',
+	version  :'0'
+};
+
+function ListManage() {
+	
+	var pageNum;
+	var pageSize;
+	
+	this.deleteDb_RESTClient = function(name) {
+		
+		var data={"name":name};
+		var subUrl = "delDb";
+		lm.invokeAjaxFunction(subUrl, JSON.stringify(data), "POST", lm.delSuccessFunc, lm.delErrorFunc);
+    }
+	
+	this.modifyDb_RESTClient = function(data) {
+		
+		//验证
+		var name = data.name;
+		var url_modify = data.url;
+		var version_modify = data.version;
+		
+		var matchString = "(https?)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
+		if(url_modify.match(matchString) == null) {
+			showErrMsg("请输入正确格式的URL","modify", data);
+			return;
+		}
+		
+		var datas = {
+			"name"     : name,
+			"url"      : url_modify,
+			"version"  : version_modify
+		};
+		
+		var subUrl = "modifyDb";
+		lm.invokeAjaxFunction(subUrl, JSON.stringify(datas), "POST", lm.modifySuccessFunc, lm.modifyErrorFunc);
+	}
+	
+	this.addDb_RESTClient = function(data) {
+		
+		//验证
+		var name_add = data.name;
+		var url_add = data.url;
+		var version_add = data.version;
+		
+		if(null == name_add || name_add == "") {
+			showErrMsg("请输入名称", "add", data);
+			return;
+		}
+		
+		var matchString = "(https?)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
+		if(url_add.match(matchString) == null) {
+			showErrMsg("请输入正确格式的URL", "add", data);
+			return;
+		}
+		
+		var datas = {
+			"name"      : name_add,
+			"url"       : url_add,
+			"version"   : version_add
+		};
+		
+		var subUrl = 'addDb';
+		lm.invokeAjaxFunction(subUrl, JSON.stringify(datas), "POST", lm.addSuccessFunc, lm.addErrorFunc);
+	}
+	
+	this.queryDbById_RESTClient = function(db_name) {
+		
+		var subUrl = "queryDb";
+		var data = { "name" : db_name };
+		lm.invokeAjaxFunction(subUrl, data, "GET", lm.querySuccessFunc, lm.queryErrorFunc);
+	}
+	
+	this.loadDbs_RESTClient = function() {
+		
+		var subUrl = "loadDbs";
+		lm.invokeAjaxFunction(subUrl, null, "GET", lm.loadSuccessFunc, lm.loadErrorFunc);
+	}
+	
+	this.showOpenTSDBById = function(data) {
+		
+		document.getElementById("OpenTSDBModifyName").value = data[0].name;
+		document.getElementById("OpenTSDBModifyURL").value = data[0].url;
+		document.getElementById("OpenTSDBModifyVersion").value = data[0].version;
+		$('#OpenTSDBModifyModal').modal({
+			backdrop : 'static',
+			keyboard : false});
+		 
+	}
+	
+	this.showOpenTSDBList = function(data, list) {
+		
+		list = new Array();
+		var href = location.href;
+		href = href.substring(0, href.indexOf("uavapp_baseclassmgt"));
+		for(var i=0; i<data.length; i++) {
+			var row={
+				id       :data[i].name,
+				dburl    :"<a onclick=loadDescDiv('"+href+"','"+data[i].url+"') class='pointer'>"+data[i].url+"</a>",
+				version  :data[i].version,
+			};
+			list.push(row);
+		}
+		
+		var count = list.length;
+
+		//清空数据
+		table.clearTable();
+		//必须先显示分页
+		table.setTotalRow(count);
+		lm.getPageParam();
+		//然后添加数据
+		$.each(list, function(index, obj) {
+			if(index >=(pageNum-1)*pageSize && index<pageNum*pageSize) {
+				table.add(obj);
+			}
+			
+		});
+	}
+	
+	this.getPageParam = function() {
+		
+		var getPagingInfo = table.getPagingInfo();
+		pageNum = getPagingInfo.pageNum;   
+		pageSize = getPagingInfo.pageSize
+	}
+	
+	this.searchDbs_RESTClient = function(input) {
+		
+		
+		var subUrl = "searchDbs";
+		var data = { "url" : input};
+		lm.invokeAjaxFunction(subUrl, data, "GET", lm.loadSuccessFunc, lm.searchErrorFunc);
+	}
+	
+	this.delSuccessFunc = function(data) {
+		var result = eval(data);
+		//当前页数据为空 自动退一页
+		if(result.length == (pageNum-1)*pageSize) {
+			table.setPageNum(pageNum-1);
+		}
+		lm.showOpenTSDBList(result,list);
+		closeModal("del");
+	}
+	
+	this.delErrorFunc = function(data) {
+		showErrMsg("删除OpenTSDB实例"+name+"失败","del", data);
+	}
+	
+	this.modifySuccessFunc = function(data) {
+		var result = eval(data);
+		lm.showOpenTSDBList(result,list);
+		closeModal("modify");
+	}
+	
+	this.modifyErrorFunc = function(data) {
+		showErrMsg("修改OpenTSDB实例"+name+"失败","modify", data);
+	}
+	
+	this.addSuccessFunc = function(data) {
+		var result = eval(data);
+		if(result.error == "conflict_name") {
+			showErrMsg("此名称已存在", "add", result);
+			return;
+		}
+		if(parseInt(pageNum) == 0) {
+			table.setPageNum(1);
+			pageNum = table.getPagingInfo().pageNum;
+		}
+		
+		lm.showOpenTSDBList(result,list);
+		closeModal("add");
+	}
+	
+	this.addErrorFunc = function(data) {
+		showErrMsg("添加OpenTSDB实例失败", "add", data);
+	}
+	
+	this.queryErrorFunc = function(data) {
+		showErrMsg("加载OpenTSDB实例失败", null, data);
+	}
+	
+	this.loadErrorFunc = function(data) {
+		showErrMsg("加载OpenTSDB实例列表失败", null, data);
+	}
+	
+	this.querySuccessFunc = function(data) {
+		var result = eval(data);
+		lm.showOpenTSDBById(result);
+	}
+	
+	this.loadSuccessFunc = function(data) {
+		var result = eval(data);
+		lm.showOpenTSDBList(result);
+	}
+	
+	this.searchErrorFunc = function(data) {
+		showErrMsg("查询失败", null, data);
+	}
+	
+	this.invokeAjaxFunction = function(subUrl, data, type, successFunc, errorFunc) {
+		AjaxHelper.call({
+			url         : url + subUrl,
+			data        : data,
+			async       : true,
+			cache       : false,
+			type        : type,
+			contentType : "application/json; charset=utf-8",
+			success : function(data) {
+				successFunc(data);
+			},
+			error : function(data) {
+				errorFunc(data);
+			},
+		});
+	}
+	
+};
+
+var lm = new ListManage();
+
+function clickSureCallback_del(){
+	
+	var id = document.getElementById("OpenTSDBDelName").innerHTML;
+	lm.deleteDb_RESTClient(id);
+};
+
+function clickSureCallback_modify() {
+	
+	opentsdbmodalConfig.name = document.getElementById("OpenTSDBModifyName").value;
+	opentsdbmodalConfig.url = document.getElementById("OpenTSDBModifyURL").value;
+	opentsdbmodalConfig.version = document.getElementById("OpenTSDBModifyVersion").value;
+	lm.modifyDb_RESTClient(opentsdbmodalConfig);
+	
+};
+
+function clickSureCallback_add(){
+	
+	opentsdbmodalConfig.name = document.getElementById("OpenTSDBAddName").value;
+	opentsdbmodalConfig.url = document.getElementById("OpenTSDBAddURL").value;
+	opentsdbmodalConfig.version = document.getElementById("OpenTSDBAddVersion").value;
+	lm.addDb_RESTClient(opentsdbmodalConfig);
+	
+};
\ No newline at end of file
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/opentsdb_agent.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/opentsdb_agent.js
new file mode 100644
index 00000000..1357af01
--- /dev/null
+++ b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/opentsdb_agent.js
@@ -0,0 +1,254 @@
+/**
+ * TODO 窗体初始化,必须在body后面加载,因为窗口容器会追加到body
+ */
+window.winmgr.build({
+	id           : "notifyList",
+	height       : "auto",
+	"overflow-y" : "auto",
+	order        : 999,
+	theme        : "ListBG"
+});
+
+window.winmgr.build({
+	id           : "descDiv",
+	height       : "auto",
+	"overflow-y" : "auto",
+	order        : 999,
+	theme        : "ObjectBG"
+});
+
+window.winmgr.show("notifyList");
+
+function initBody() {
+	
+	var div = new StringBuffer();
+	
+	div.append("<div class=\"AppHubMVCSearchBar\" >");
+	div.append('<button id="AppManagerAdd" class="btn btn-default" type="button" onclick="addOpenTSDBInfo()">');
+	div.append('<span class="glyphicon glyphicon-plus"></span>');
+	div.append('</button>');
+	
+	div.append('<input id="AppManagerSearchBar_keyword_Hidden" type="hidden">');
+	div.append('<input id="AppManagerSearchBar_keyword" class="form-control AppHubMVCSearchBarInputText" type="text" placeholder="可输入URL检索" value="">');
+	div.append('</input>');
+	
+	div.append('<div class="btn-group">');
+	div.append('<button id="AppManagerSearchBar_searchbtn" type="button" class="btn btn-default" onclick="searchEvent()">');
+	div.append('<span class="glyphicon glyphicon-search"></span>');
+	div.append('</button>');
+
+	div.append('<button id="AppManagerSearchBar_searchAllbtn" type="button" class="btn btn-default" onclick="searchAllEvent()">');
+	div.append('<span class="glyphicon glyphicon-th"></span>');
+	div.append('</button>');
+	div.append('</div>');
+	div.append('</div>');
+	
+	HtmlHelper.id("notifyList").innerHTML += div.toString();
+	
+};
+
+function loadDescDiv(href, ip) {
+	
+	var url = href+"db2?url="+ip;
+	var sb=new StringBuffer();
+	sb.append("<div class=\"title-head\" id='opentsdb_head' style='width:100%'>");
+	sb.append("<span>"+ip+"</span>");
+	sb.append("<div class=\"icon-signout icon-myout\" onclick=\"javascript:showNotifyList()\"></div>");
+	sb.append("</div>");
+	sb.append("<iframe src='"+url+"',frameborder='0' scrolling='no' height='100%' width='100%' onload='changeFrameHeightAndWidth()' id='opentsdb_frame'></iframe>");
+	$('#descDiv').html(sb.toString());
+	showDescDiv();
+};
+
+function showDescDiv() {
+	
+	window.winmgr.show("descDiv");
+	window.winmgr.hide("notifyList");
+};
+
+function showNotifyList() {
+	
+	window.winmgr.hide("descDiv");
+	window.winmgr.show("notifyList");
+};
+
+function showErrMsg(val,id,data) {
+	
+	var v;
+	console.log(val);
+	if (id == "add") {
+		v = document.getElementById("errorAddMsg");
+	} else if(id == "modify") {
+		v = document.getElementById("errorModifyMsg");
+	} else if(id == "del"){
+		v = document.getElementById("errorDelMsg");
+	} else if(id == null){
+		alert(val);
+		return;
+	} else {
+		return;
+	}
+	v.style.display="";
+	v.innerText = val;
+};
+
+function initErrMsg(id) {
+	
+	var v;
+	if (id == "add") {
+		v = document.getElementById("errorAddMsg");
+	} else if(id == "modify") {
+		v = document.getElementById("errorModifyMsg");
+	} else if(id == "del"){
+		v = document.getElementById("errorDelMsg");
+	} else {
+		return;
+	}
+	v.style.display="none";
+	v.innerText = "";
+};
+
+function closeModal(id) {
+	
+	initErrMsg(id);
+	if(id == "add") {
+		$('#OpenTSDBAddModal').modal('hide');
+		document.getElementById("OpenTSDBAddName").value = "";
+		document.getElementById("OpenTSDBAddURL").value = "";
+		document.getElementById("OpenTSDBAddVersion").value = "";
+	} else if(id == "modify") {
+		$('#OpenTSDBModifyModal').modal('hide');
+	} else if(id == "del") {
+		$('#OpenTSDBDelModal').modal('hide');
+	}
+};
+
+var index_id;
+
+var listConfig = {
+		
+		id:"list",
+		pid:"notifyList",
+		openDelete:true,
+		key:"id",
+		pagerSwitchThreshold:600,
+		pagesize : 5,
+		head:{
+			id         : ['实例名称', '25%'],
+			dburl      : ['URL'],
+			version    : ['版本编号', '25%']
+		},
+		cloHideStrategy:{
+			1000  :[0,1,2],
+			500   :[0,1],
+			400   :[0,1]
+		},
+		events:{
+			onRow : function(index, value) {
+						switch(index) {
+							case 0:
+								index_id = value;
+							case 2:
+								return clickTab(index_id, value);
+							case 1:
+								return value;
+						}
+					
+					}
+			
+		}
+};
+
+function clickTab(id, value) {
+	
+	if(null == value || value == "") {
+		value = "NULL";
+	}
+	var res = "<div onclick=\"clickTabForQuery('"+id+"')\">"+value+"</div>";
+	return res;
+};
+
+function changeFrameHeight() {
+
+	 var ifm= document.getElementById("opentsdb_frame"); 
+	 try{
+		 var bHeight = ifm.contentWindow.document.body.scrollHeight;
+		 var dHeight = ifm.contentWindow.document.documentElement.scrollHeight;
+		 var height = Math.max(bHeight, dHeight);
+		 ifm.height = height;
+	 }catch (ex){
+		 
+	 }
+	 window.setInterval("changeFrameHeight()", 100);
+	 
+	 window.onresize=function(){
+	     changeFrameWidth();  
+	} 
+	 
+};
+
+function changeFrameWidth() {
+	
+	var ifm= document.getElementById("opentsdb_frame");
+	try{
+		var bWidth = ifm.contentWindow.document.body.scrollWidth;
+		var dWidth = ifm.contentWindow.document.documentElement.scrollWidth;
+		var width = Math.max(bWidth, dWidth);
+		ifm.width = width;
+	 }catch (ex){
+		 
+	 }
+};
+
+function changeFrameHeightAndWidth() {
+	
+	changeFrameHeight();
+	changeFrameWidth();
+};
+
+function deleteOpenTSDBById(id,trObj){
+	
+	document.getElementById("OpenTSDBDelName").innerText = trObj.getElementsByTagName("td")[0].id;
+	$('#OpenTSDBDelModal').modal({
+		backdrop : 'static',
+		keyboard : false});
+};
+
+function loadOpenTSDBList() {
+	lm.loadDbs_RESTClient();
+};
+
+function clickTabForQuery(v) {
+	lm.queryDbById_RESTClient(v);
+};
+
+function addOpenTSDBInfo() {
+	
+	$('#OpenTSDBAddModal').modal({
+		backdrop : 'static',
+		keyboard : false});
+};
+
+function searchEvent(){
+	
+	table.setPageNum(1);
+	var input = $("#AppManagerSearchBar_keyword").val();
+	lm.searchDbs_RESTClient(input);
+};
+
+function searchAllEvent(){
+	
+	table.setPageNum(1);
+	var input = "";
+	lm.searchDbs_RESTClient(input);
+};
+
+var table= new AppHubTable(listConfig);
+
+$(document).ready(function() {
+	
+	initBody();
+	table.delRowUser = deleteOpenTSDBById;						
+	table.sendRequest = loadOpenTSDBList;
+	table.initTable();
+});
\ No newline at end of file
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/table.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/table.js
deleted file mode 100644
index 0f378a5b..00000000
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/table.js
+++ /dev/null
@@ -1,260 +0,0 @@
-var url = "../../db/";
-
-var nameConfig = {
-		head:"验证失败",
-		content:"请输入名称"
-};
-var nameMultiConfig = {
-		head:"添加失败",
-		content:"此名称已存在"
-};
-var urlConfig = {
-		head:"验证失败",
-		content:"请输入正确格式的URL"
-};
-function deleteDb_RESTClient(id) {
-	var getPagingInfo = table.getPagingInfo();
-	var pageNum = getPagingInfo.pageNum;
-	var pageSize = getPagingInfo.pageSize;
-	var data = {
-			"name" : id
-		};
-		AjaxHelper.call({
-			url : url + "delDb",
-			data : JSON.stringify(data),
-			async : true,
-			cache : false,
-			type : "POST",
-			contentType : "application/json; charset=utf-8",
-			success : function(data) {
-				if (data) {
-					data = eval(data);
-					//当前页数据为空 自动退一页
-					if(data.length == (pageNum-1)*pageSize) {
-						table.setPageNum(pageNum-1);
-					}
-					ajaxGetdatas();
-					
-				} else {
-					alert("删除OpenTSDB实例"+id+"返回值为空");
-				}
-			},
-			error : function(data) {
-				alert("删除OpenTSDB实例"+id+"失败:"+data);
-			},
-		});
-}
-
-function modifyDb_RESTClient(data) {
-	
-	var data = {
-			"name" : data.name,
-			"url": data.url,
-			"version": data.version
-		};
-		AjaxHelper.call({
-			url : url + "modifyDb",
-			data : JSON.stringify(data),
-			async : true,
-			cache : false,
-			type : "POST",
-			contentType : "application/json; charset=utf-8",
-			success : function(data) {
-				if (data) {
-					ajaxGetdatas();
-				} else {
-					alert("修改OpenTSDB实例"+data.name+"返回值为空");
-				}
-			},
-			error : function(data) {
-				alert("修改OpenTSDB实例"+data.name+"失败:"+data);
-			},
-		});
-}
-
-function addDb_RESTClient(data) {
-	
-	//验证
-	var name = data.name;
-	var url_add = data.url;
-	var version = data.version;
-	
-	if(null == name || name == "") {
-		showDialog(nameConfig);
-		return;
-	}
-	
-	var matchString = "(https?)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
-	if(url_add.match(matchString) == null) {
-		showDialog(urlConfig);
-		return;
-	}
-
-	var datas = {
-			"name" : name,
-			"url": url_add,
-			"version": version
-		};
-		AjaxHelper.call({
-			url : url + "addDb",
-			data : JSON.stringify(datas),
-			async : true,
-			cache : false,
-			type : "POST",
-			contentType : "application/json; charset=utf-8",
-			success : function(data) {
-				
-				if(data == "multi_name") {
-					showDialog(nameMultiConfig);
-					return;
-				}
-				
-				data = eval(data);
-				if (data) {
-					ajaxGetdatas();
-				} else {
-					alert("添加OpenTSDB实例"+name+"返回值为空");
-				}
-			},
-			error : function(data) {
-				alert("添加OpenTSDB实例"+name+"失败:"+data);
-			},
-		});
-}
-
-function queryDbById_RESTClient(db_name) {
-	
-	var data = {
-			"name" : db_name
-		};
-		AjaxHelper.call({
-			url : url + "queryDb",
-			data : JSON.stringify(data),
-			async : true,
-			cache : false,
-			type : "POST",
-			contentType : "application/json; charset=utf-8",
-			success : function(data) {
-				data = eval(data);
-				if (data) {
-					showDbById(data);
-				} else {
-					alert("加载OpenTSDB实例"+db_name+"为空");
-				}
-			},
-			error : function(data) {
-			},
-		});
-}
-
-function loadDbs_RESTClient() {
-	
-	var datas = new Array(),number=10;
-	AjaxHelper.call({
-		url : url + "loadDbs",
-		async : true,
-		cache : false,
-		type : "GET",
-		contentType : "application/json; charset=utf-8",
-		success : function(data) {
-		
-			data = eval(data);
-			showDb(data,datas);
-		},
-		error : function(data) {
-			alert("加载OpenTSDB实例列表失败: "+data);
-		},
-	});
-}
-	
-function searchDbs_RESTClient(input) {
-
-	var getPagingInfo = table.getPagingInfo();
-	var datas = new Array(),number=10;
-	
-	var data = {
-		"url" : input,
-		"pageindex" : getPagingInfo.pageNum,
-		"pagesize" : getPagingInfo.pageSize
-	};
-	AjaxHelper.call({
-		url : url + "searchDbs",
-		data : JSON.stringify(data),
-		async : true,
-		cache : false,
-		type : "POST",
-		contentType : "application/json; charset=utf-8",
-		success : function(data) {
-			data = eval(data);
-			showDb(data,datas);
-		},
-		error : function(data) {
-			alert("查询失败："+data);
-		},
-	});
-};
-
-function userClickRow(key){
-	showDialog(modalConfig);
-};
-var pageNum;
-var pageSize;
-function getPageParam(){
-	var getPagingInfo = table.getPagingInfo();
-	pageNum = getPagingInfo.pageNum;   
-	pageSize = getPagingInfo.pageSize
-	console.log("pageNum:"+pageNum);
-	console.log("pageSize:"+pageSize);
-}
-
-function showDb(data,datas) {
-	var href = location.href;
-	href = href.substring(0, href.indexOf("uavapp_baseclassmgt"));
-	for(var i=0; i<data.length; i++) {
-		var row={
-			id:data[i].name,
-			dburl:"<a onclick=loadDescDiv('"+href+"','"+data[i].url+"')>"+data[i].url+"</a>",
-			type:data[i].type, 
-			access:data[i].access,
-			version:data[i].version,
-	};
-	datas.push(row);
-	}
-	
-	var count = datas.length;
-	
-	//清空数据
-	table.clearTable();
-	//必须先显示分页
-	table.setTotalRow(count);
-	getPageParam();
-	//然后添加数据
-	$.each(datas, function(index, obj) {
-		if(index >=(pageNum-1)*pageSize && index<pageNum*pageSize) {
-			table.add(obj);
-		}
-		
-	});
-}
-
-function loadDescDiv(href, ip) {
-	var url = href+"db2?url="+ip;
-	var sb=new StringBuffer();
-	sb.append("<div class=\"title-head\" id='opentsdb_head' style='width:100%'>");
-	sb.append("<span>"+ip+"</span>");
-	sb.append("<div class=\"icon-signout icon-myout\" onclick=\"javascript:showNotifyList()\"></div>");
-	sb.append("</div>");
-	sb.append("<iframe src='"+url+"',frameborder='0' scrolling='no' height='100%' width='100%' onload='changeFrameHeightAndWidth()' id='opentsdb_frame'></iframe>");
-	$('#descDiv').html(sb.toString());
-	showDescDiv();
-}
-
-function showDescDiv() {
-	window.winmgr.show("descDiv");
-	window.winmgr.hide("notifyList");
-}
-
-function showNotifyList() {
-	window.winmgr.hide("descDiv");
-	window.winmgr.show("notifyList");
-}
\ No newline at end of file
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/uav.opentsdb.js b/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/uav.opentsdb.js
deleted file mode 100644
index b454f795..00000000
--- a/com.creditease.uav.console/src/main/webapp/uavapp_baseclassmgt/dbhead/js/uav.opentsdb.js
+++ /dev/null
@@ -1,143 +0,0 @@
-
-/**
- * TODO 窗体初始化,必须在body后面加载,因为窗口容器会追加到body
- */
-window.winmgr.build({
-	id : "notifyList",
-	height : "auto",
-	"overflow-y" : "auto",
-	order : 999,
-	theme : "ListBG"
-});
-window.winmgr.build({
-	id : "descDiv",
-	height : "auto",
-	"overflow-y" : "auto",
-	order : 999,
-	theme : "ObjectBG"
-});
-window.winmgr.show("notifyList");
-
-function initBody() {
-	var div = new StringBuffer();
-	
-	div.append("<div class=\"AppHubMVCSearchBar\" >");
-	div.append('<button id="AppManagerAdd" class="btn btn-default" type="button" onclick="addOpenTSDB()">');
-	div.append('<span class="glyphicon glyphicon-plus"></span>');
-	div.append('</button>');
-	
-	div.append('<input id="AppManagerSearchBar_keyword_Hidden" type="hidden">');
-	div.append('<input id="AppManagerSearchBar_keyword" class="form-control AppHubMVCSearchBarInputText" type="text" placeholder="可输入URL检索" value="">');
-	div.append('</input>');
-	
-	div.append('<div class="btn-group">');
-	div.append('<button id="AppManagerSearchBar_searchbtn" type="button" class="btn btn-default" onclick="searchEvent()">');
-	div.append('<span class="glyphicon glyphicon-search"></span>');
-	div.append('</button>');
-
-	div.append('<button id="AppManagerSearchBar_searchAllbtn" type="button" class="btn btn-default" onclick="searchAllEvent()">');
-	div.append('<span class="glyphicon glyphicon-th"></span>');
-	div.append('</button>');
-	div.append('</div>');
-	div.append('</div>');
-	
-	HtmlHelper.id("notifyList").innerHTML += div.toString();
-}
-
-function searchEvent(){
-	table.setPageNum(1);
-	var input = $("#AppManagerSearchBar_keyword").val();
-	searchDbs_RESTClient(input);
-};
-
-function searchAllEvent(){
-	table.setPageNum(1);
-	var input = "";
-	searchDbs_RESTClient(input);
-};
-
-/**
- * 列表配置
- */
-var index_id;
-var listConfig = {
-		
-		id:"list",
-		pid:"notifyList",
-		openDelete:true,
-		key:"id",
-		pagerSwitchThreshold:600,
-		pagesize : 5,
-		head:{
-				id         : ['实例名称', '15%'],
-				dburl      : ['URL'],
-				version    : ['版本号', '15%']
-		    },
-		cloHideStrategy:{
-			1000:[0,1,2],
-			500:[0,1],
-			400:[1]
-		},
-		events:{
-			onRow : function(index, value) {
-					switch(index) {
-					case 0:
-						index_id = value;
-					case 2:
-						return setOnClick(index_id, value);
-						break;
-					case 1:
-						return value;
-					}
-					
-				}
-			
-		}
-};
-function setOnClick(id, value) {
-	if(null == value || value == "") {
-		value = "NULL";
-	}
-	var res = "<div onclick=\"userClickRow('"+id+"')\">"+value+"</div>";
-	return res;
-}
-
-function changeFrameHeight() {
-
-	 var ifm= document.getElementById("opentsdb_frame"); 
-	 try{
-	 var bHeight = ifm.contentWindow.document.body.scrollHeight;
-	 var dHeight = ifm.contentWindow.document.documentElement.scrollHeight;
-	 var height = Math.max(bHeight, dHeight);
-	 ifm.height = height;
-	 }catch (ex){}
-	 window.setInterval("changeFrameHeight()", 100);
-	 window.onresize=function(){
-	     changeFrameWidth();  
-
-	} 
-}
-
-function changeFrameWidth() {
-	var ifm= document.getElementById("opentsdb_frame");
-	var head = document.getElementById("opentsdb_head");
-	 try{
-	 var wWidth = window.document.body.offsetWidth;
-	 var bWidth = ifm.contentWindow.document.body.scrollWidth;
-	 var dWidth = ifm.contentWindow.document.documentElement.scrollWidth;
-	 var width = Math.max(bWidth, dWidth, wWidth);
-	 ifm.width = width;
-	 }catch (ex){}
-}
-
-function changeFrameHeightAndWidth() {
-	changeFrameHeight();
-	changeFrameWidth();
-}
-var table= new AppHubTable(listConfig);
-$(document).ready(function() {
-	initBody();
-	table.delRowUser = userDelete;						//Config the delete function of user
-	table.sendRequest = ajaxGetdatas;
-	table.initTable();
-});
diff --git a/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java b/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java
index 90e811fc..6802f694 100644
--- a/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java
+++ b/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java
@@ -165,7 +165,8 @@ public void preProcess(Channel t, Object proxy, Method method, Object[] args) {
                     ivcContextParams = (Map<String, Object>) UAVServer.instance().runSupporter(
                             "com.creditease.uav.apm.supporters.InvokeChainSupporter", "runCap",
                             InvokeChainConstants.CHAIN_APP_CLIENT, InvokeChainConstants.CapturePhase.PRECAP, params,
-                            RabbitmqProducerAdapter.class, new Object[] { (BasicProperties) args[2], args[3] });
+                            RabbitmqProducerAdapter.class,
+                            new Object[] { (BasicProperties) args[args.length - 2], args[args.length - 1] });
                     if (ivcContextParams != null
                             && ivcContextParams.containsKey(InvokeChainConstants.PARAM_MQHEAD_INFO)) {
                         args[2] = ivcContextParams.get(InvokeChainConstants.PARAM_MQHEAD_INFO);
diff --git a/com.creditease.uav.monitorframework.agent/src/main/java/com/creditease/uav/monitorframework/adaptors/SpringBootTomcatAdaptor.java b/com.creditease.uav.monitorframework.agent/src/main/java/com/creditease/uav/monitorframework/adaptors/SpringBootTomcatAdaptor.java
index 2a6632de..cc2dac9e 100644
--- a/com.creditease.uav.monitorframework.agent/src/main/java/com/creditease/uav/monitorframework/adaptors/SpringBootTomcatAdaptor.java
+++ b/com.creditease.uav.monitorframework.agent/src/main/java/com/creditease/uav/monitorframework/adaptors/SpringBootTomcatAdaptor.java
@@ -104,7 +104,7 @@ public void process(CtMethod m) throws Exception {
 
                             aa.addLocalVar(m, "mObj", "com.creditease.tomcat.plus.interceptor.SpringBootTomcatPlusIT");
                             m.insertBefore(
-                                    "{mObj=new SpringBootTomcatPlusIT();mObj.startServer(this.getEnvironment().getProperty(\"server.port\"),this.getEnvironment().getProperty(\"server.context-path\"));}");
+                                    "{mObj=new SpringBootTomcatPlusIT();mObj.startServer(this.getEnvironment().getProperty(\"server.port\"),this.getEnvironment().getProperty(\"server.context-path\"),this);}");
                         }
 
                         @Override
diff --git a/com.creditease.uav.tomcat.plus.core/src/main/java/com/creditease/tomcat/plus/interceptor/SpringBootTomcatPlusIT.java b/com.creditease.uav.tomcat.plus.core/src/main/java/com/creditease/tomcat/plus/interceptor/SpringBootTomcatPlusIT.java
index 8b5a4337..a34181af 100644
--- a/com.creditease.uav.tomcat.plus.core/src/main/java/com/creditease/tomcat/plus/interceptor/SpringBootTomcatPlusIT.java
+++ b/com.creditease.uav.tomcat.plus.core/src/main/java/com/creditease/tomcat/plus/interceptor/SpringBootTomcatPlusIT.java
@@ -43,8 +43,11 @@ public class SpringBootTomcatPlusIT extends TomcatPlusIT {
     /**
      * startUAVServer
      */
-    public void startServer(String port, String contextPath) {
+    public void startServer(String port, String contextPath, Object arg) {
 
+        if (!"AnnotationConfigEmbeddedWebApplicationContext".equals(arg.getClass().getSimpleName())) {
+            return;
+        }
         // integrate Tomcat log
         UAVServer.instance().setLog(new TomcatLog("MonitorServer"));
         // start Monitor Server when server starts
@@ -313,10 +316,10 @@ public void onAppStop(Object... args) {
         }
 
         /**
-         * NOTE: spring boot rewrite the tomcat webappclassloader, makes the addURL for nothing, then we can't do
-         * anything on this we may use its webappclassloader's parent as the classloader
+         * NOTE: spring boot will reset tomcat webappclassloader to null when shutdown, we may use the currentThread's
+         * classloader as the classloader
          */
-        context.put(InterceptConstants.WEBAPPLOADER, sc.getLoader().getClassLoader().getParent());
+        context.put(InterceptConstants.WEBAPPLOADER, Thread.currentThread().getContextClassLoader());
         context.put(InterceptConstants.WEBWORKDIR, sc.getWorkPath());
 
         String contextPath = (String) ReflectHelper.getField(StandardContext.class, sc, "encodedPath", true);
@@ -383,6 +386,9 @@ public void onServletStop(Object... args) {
      */
     public void onSpringBeanRegist(String contextPath) {
 
+        if (contextPath == null) {
+            contextPath = "";
+        }
         InterceptSupport iSupport = InterceptSupport.instance();
         InterceptContext context = iSupport.createInterceptContext(Event.SPRING_BEAN_REGIST);
         context.put(InterceptConstants.WEBAPPLOADER, Thread.currentThread().getContextClassLoader());