From 2278ac8f78f1a6645b4fa9eb665588f0b1795eeb Mon Sep 17 00:00:00 2001
From: hezhuofan <hezhuofan@zbj.com>
Date: Thu, 13 Oct 2016 16:29:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E7=BD=B2sentine?=
 =?UTF-8?q?l=20=E7=AB=AF=E5=8F=A3=E7=94=9F=E6=88=90=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E6=80=A7=E9=97=AE=E9=A2=98=EF=BC=88=E5=9C=A8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E5=8F=B0=E6=9C=BA=E5=99=A8=E4=B8=8A=E9=83=A8=E7=BD=B2master?=
 =?UTF-8?q?=E3=80=81slave=E3=80=81sentinel=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redis/impl/RedisDeployCenterImpl.java     | 103 +++++++++---------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisDeployCenterImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisDeployCenterImpl.java
index 500a070b..23ce56ac 100644
--- a/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisDeployCenterImpl.java
+++ b/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisDeployCenterImpl.java
@@ -36,6 +36,7 @@
 
 /**
  * Created by yijunzhang on 14-8-25.
+ * @author Hezf
  */
 public class RedisDeployCenterImpl implements RedisDeployCenter {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -274,56 +275,58 @@ private String getClusterNodeId(Jedis jedis) {
 
     @Override
     public boolean deploySentinelInstance(long appId, String masterHost, String slaveHost, int maxMemory, List<String> sentinelList) {
-        if (!isExist(appId)) {
-            return false;
-        }
-        //获取端口
-        Integer masterPort = machineCenter.getAvailablePort(masterHost, ConstUtils.CACHE_REDIS_STANDALONE);
-        if (masterPort == null) {
-            logger.error("masterHost={} getAvailablePort is null", masterHost);
-            return false;
-        }
-        Integer slavePort = machineCenter.getAvailablePort(slaveHost, ConstUtils.CACHE_REDIS_STANDALONE);
-        if (slavePort == null) {
-            logger.error("slaveHost={} getAvailablePort is null", slavePort);
-            return false;
-        }
-        //运行实例
-        boolean isMasterRun = runInstance(masterHost, masterPort, maxMemory, false);
-        if (!isMasterRun) {
-            return false;
-        }
-        boolean isSlaveRun = runInstance(slaveHost, slavePort, maxMemory, false);
-        if (!isSlaveRun) {
-            return false;
-        }
-        //添加slaveof配置
-        boolean isSlave = slaveOf(masterHost, masterPort, slaveHost, slavePort);
-        if (!isSlave) {
-            return false;
-        }
-
-        //运行sentinel实例组
-        boolean isRunSentinel = runSentinelGroup(sentinelList, masterHost, masterPort, appId);
-        if (!isRunSentinel) {
-            return false;
-        }
-
-        //写入instanceInfo 信息
-        saveInstance(appId, masterHost, masterPort, maxMemory,
-                ConstUtils.CACHE_REDIS_STANDALONE, "");
-        saveInstance(appId, slaveHost, slavePort, maxMemory, ConstUtils.CACHE_REDIS_STANDALONE, "");
-
-        //启动监控trigger
-        boolean isMasterDeploy = redisCenter.deployRedisCollection(appId, masterHost, masterPort);
-        boolean isSlaveDeploy = redisCenter.deployRedisCollection(appId, slaveHost, slavePort);
-        if (!isMasterDeploy) {
-            logger.warn("host={},port={},isMasterDeploy=false", masterHost, masterPort);
-        }
-        if (!isSlaveDeploy) {
-            logger.warn("host={},port={},isSlaveDeploy=false", slaveHost, slavePort);
-        }
-        return true;
+    	 if (!isExist(appId)) {
+             return false;
+         }
+    	 //master
+         Integer masterPort = machineCenter.getAvailablePort(masterHost, ConstUtils.CACHE_REDIS_STANDALONE);
+         if (masterPort == null) {
+             logger.error("masterHost={} getAvailablePort is null", masterHost);
+             return false;
+         }
+         boolean isMasterRun = runInstance(masterHost, masterPort, maxMemory, false);
+         if (!isMasterRun) {
+             return false;
+         }
+         saveInstance(appId, masterHost, masterPort, maxMemory,
+                 ConstUtils.CACHE_REDIS_STANDALONE, "");
+         
+         //slave
+         Integer slavePort = machineCenter.getAvailablePort(slaveHost, ConstUtils.CACHE_REDIS_STANDALONE);
+         if (slavePort == null) {
+             logger.error("slaveHost={} getAvailablePort is null", slavePort);
+             return false;
+         }
+         boolean isSlaveRun = runInstance(slaveHost, slavePort, maxMemory, false);
+         if (!isSlaveRun) {
+             return false;
+         }
+         saveInstance(appId, slaveHost, slavePort, maxMemory, ConstUtils.CACHE_REDIS_STANDALONE, "");
+
+         //添加slaveof配置
+         boolean isSlave = slaveOf(masterHost, masterPort, slaveHost, slavePort);
+         if (!isSlave) {
+             return false;
+         }
+
+         //运行sentinel实例组
+         boolean isRunSentinel = runSentinelGroup(sentinelList, masterHost, masterPort, appId);
+         if (!isRunSentinel) {
+             return false;
+         }
+
+         
+        
+         //启动监控trigger
+         boolean isMasterDeploy = redisCenter.deployRedisCollection(appId, masterHost, masterPort);
+         boolean isSlaveDeploy = redisCenter.deployRedisCollection(appId, slaveHost, slavePort);
+         if (!isMasterDeploy) {
+             logger.warn("host={},port={},isMasterDeploy=false", masterHost, masterPort);
+         }
+         if (!isSlaveDeploy) {
+             logger.warn("host={},port={},isSlaveDeploy=false", slaveHost, slavePort);
+         }
+         return true;
     }
 
     @Override

From fc19e8dcbc366ebb18f946acbe7ff6f54207c57c Mon Sep 17 00:00:00 2001
From: hezhuofan <hezhuofan@zbj.com>
Date: Fri, 14 Oct 2016 09:58:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E9=AA=8C=E8=AF=81=EF=BC=8C=E6=94=AF=E6=8C=81177?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A14*=E5=BC=80=E5=A4=B4=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/jsp/user/userRegister.jsp           | 2 +-
 .../src/main/webapp/WEB-INF/resources/js/appDetail.js           | 2 +-
 .../main/webapp/WEB-INF/resources/manage/manage/userManage.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/user/userRegister.jsp b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/user/userRegister.jsp
index 6dc371c7..8c1cceef 100644
--- a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/user/userRegister.jsp
+++ b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/user/userRegister.jsp
@@ -6,7 +6,7 @@
     <title>CacheCloud用户申请</title>
     <script type="text/javascript">
   	//验证手机号格式
-    var valPhones=/^(1[3|5|7|8][0-9]\d{4,8};){0,6}(1[3|5|8][0-9]\d{4,8})$/; 
+    var valPhones=/(^1[3|4|5|7|8][0-9]{9}$)/;
     //验证邮箱格式
     var valEmails=/^(([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3};){0,6}([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
     function checkUser(){
diff --git a/cachecloud-open-web/src/main/webapp/WEB-INF/resources/js/appDetail.js b/cachecloud-open-web/src/main/webapp/WEB-INF/resources/js/appDetail.js
index 33379383..158b0e42 100644
--- a/cachecloud-open-web/src/main/webapp/WEB-INF/resources/js/appDetail.js
+++ b/cachecloud-open-web/src/main/webapp/WEB-INF/resources/js/appDetail.js
@@ -80,7 +80,7 @@ function appAddUser(appId){
 }
 
 //验证手机号格式
-var valPhones=/^(1[3|5|8][0-9]\d{4,8};){0,6}(1[3|5|8][0-9]\d{4,8})$/; 
+var valPhones=/(^1[3|4|5|7|8][0-9]{9}$)/;
 //验证邮箱格式
 var valEmails=/^(([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3};){0,6}([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
 function saveOrUpdateUser(userId){
diff --git a/cachecloud-open-web/src/main/webapp/WEB-INF/resources/manage/manage/userManage.js b/cachecloud-open-web/src/main/webapp/WEB-INF/resources/manage/manage/userManage.js
index 09757b8c..28c9e854 100644
--- a/cachecloud-open-web/src/main/webapp/WEB-INF/resources/manage/manage/userManage.js
+++ b/cachecloud-open-web/src/main/webapp/WEB-INF/resources/manage/manage/userManage.js
@@ -1,5 +1,5 @@
 //验证手机号格式
-var valPhones=/^(1[3|5|8][0-9]\d{4,8};){0,6}(1[3|5|8][0-9]\d{4,8})$/; 
+var valPhones=/(^1[3|4|5|7|8][0-9]{9}$)/;
 //验证邮箱格式
 var valEmails=/^(([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3};){0,6}([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
 function saveOrUpdateUser(userId){

From 412416635a08e61eae11ed65dddfa535fcf577e0 Mon Sep 17 00:00:00 2001
From: hezhuofan <hezhuofan@zbj.com>
Date: Fri, 14 Oct 2016 10:24:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dobject=E8=BD=ACmap?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AE=89=E5=85=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sohu/cache/redis/impl/RedisCenterImpl.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisCenterImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisCenterImpl.java
index 5b696726..f887c579 100644
--- a/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisCenterImpl.java
+++ b/cachecloud-open-web/src/main/java/com/sohu/cache/redis/impl/RedisCenterImpl.java
@@ -458,17 +458,23 @@ private Table<RedisConstant, String, Long> getAccumulationDiff(
      */
     private Table<RedisConstant, String, Long> getCommandsDiff(Map<RedisConstant, Map<String, Object>> currentInfoMap,
             Map<String, Object> lastInfoMap) {
-        //没有上一次统计快照，忽略差值统计
+    	 //没有上一次统计快照，忽略差值统计
         if (lastInfoMap == null || lastInfoMap.isEmpty()) {
             return HashBasedTable.create();
         }
         Map<String, Object> map = currentInfoMap.get(RedisConstant.Commandstats);
         Map<String, Long> currentMap = transferLongMap(map);
-        Map<String, Object> lastObjectMap;
+        Map<String, Object> lastObjectMap=null;
         if (lastInfoMap.get(RedisConstant.Commandstats.getValue()) == null) {
             lastObjectMap = new HashMap<String, Object>();
         } else {
-            lastObjectMap = (Map<String, Object>) lastInfoMap.get(RedisConstant.Commandstats.getValue());
+        	Object lastObj=lastInfoMap.get(RedisConstant.Commandstats.getValue());
+        	if(lastObj instanceof Map<?, ?>){
+        		 lastObjectMap = (Map<String, Object>) lastObj;
+        	}else{
+        		logger.error("can't cast (Object)lastObj:{} to Map<String, Object>",lastObj.toString());
+        		throw new RuntimeException("can't cast (Object)lastObj to Map<String, Object>");
+        	}
         }
         Map<String, Long> lastMap = transferLongMap(lastObjectMap);
 

From 9d5e9c8e6c0be6dc061efc3a54844f38da06785b Mon Sep 17 00:00:00 2001
From: importsource <hezhuofan24@126.com>
Date: Thu, 20 Oct 2016 17:37:52 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2$=E7=9A=84sql=E6=B3=A8=E5=85=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/AppClientValueStatDao.xml          |   4 +
 .../src/main/resources/mapper/AppDao.xml      |  19 ++-
 .../mapper/AppDataMigrateStatusDao.xml        |  78 +++++++++++
 .../src/main/resources/mapper/AppStatsDao.xml |  97 ++++++++++++-
 .../src/main/resources/mapper/AppUserDao.xml  |  11 +-
 .../resources/mapper/InstanceConfigDao.xml    |  42 ++++++
 .../resources/mapper/InstanceSlowLogDao.xml   |   5 +
 .../resources/mapper/InstanceStatsDao.xml     |  13 +-
 .../src/main/resources/mapper/MachineDao.xml  | 129 ++++++++++--------
 .../main/resources/mapper/MachineStatsDao.xml |   2 +-
 .../main/resources/mapper/ServerStatusDao.xml |  90 ++++++++++++
 11 files changed, 409 insertions(+), 81 deletions(-)
 create mode 100644 cachecloud-open-web/src/main/resources/mapper/AppDataMigrateStatusDao.xml
 create mode 100644 cachecloud-open-web/src/main/resources/mapper/InstanceConfigDao.xml
 create mode 100644 cachecloud-open-web/src/main/resources/mapper/ServerStatusDao.xml

diff --git a/cachecloud-open-web/src/main/resources/mapper/AppClientValueStatDao.xml b/cachecloud-open-web/src/main/resources/mapper/AppClientValueStatDao.xml
index b43122f5..63a6f0b1 100644
--- a/cachecloud-open-web/src/main/resources/mapper/AppClientValueStatDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/AppClientValueStatDao.xml
@@ -30,5 +30,9 @@
         group by distribute_type order by distribute_type
     </select>
     
+    <delete id="deleteBeforeCollectTime">
+    	delete from app_client_value_minute_stats where collect_time &lt;#{collectTime}
+    </delete>
+    
 
 </mapper>
\ No newline at end of file
diff --git a/cachecloud-open-web/src/main/resources/mapper/AppDao.xml b/cachecloud-open-web/src/main/resources/mapper/AppDao.xml
index d7402a01..78f1d01e 100644
--- a/cachecloud-open-web/src/main/resources/mapper/AppDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/AppDao.xml
@@ -6,7 +6,7 @@
     <sql id="app_desc_fields">
         app_id,name,user_id,status,intro,create_time,passed_time,type,officer,
         ver_id,is_test,has_back_store,need_persistence,need_hot_back_up,forecase_qps,
-        forecast_obj_num,mem_alert_value,client_machine_room
+        forecast_obj_num,mem_alert_value,client_machine_room,app_key,client_conn_alert_value
     </sql>
     <!--通过appId查询app的信息-->
     <select id="getAppDescById" resultType="AppDesc" parameterType="long">
@@ -31,19 +31,19 @@
 		values
 			(#{appId},#{name},#{userId},#{status},#{intro},#{createTime},#{passedTime},
 			#{type},#{officer},#{verId},#{isTest},#{hasBackStore},#{needPersistence},
-			#{needHotBackUp},#{forecaseQps},#{forecastObjNum},#{memAlertValue},#{clientMachineRoom})    	
+			#{needHotBackUp},#{forecaseQps},#{forecastObjNum},#{memAlertValue},#{clientMachineRoom},#{appKey},#{clientConnAlertValue})    	
     </insert>
     
     <update id="update" parameterType="AppDesc">
     	update app_desc 
     		set name=#{name}, user_id=#{userId}, status=#{status}, intro=#{intro}, create_time=#{createTime},
     			passed_time=#{passedTime},type=#{type},
-    			officer=#{officer},ver_id=#{verId}
+    			officer=#{officer},ver_id=#{verId},mem_alert_value=#{memAlertValue},client_conn_alert_value=#{clientConnAlertValue}
     	where app_id=#{appId}
     </update>
     
     <sql id="app_desc_select_column">
-    	app_desc.app_id,name,app_desc.user_id,status,intro,create_time,passed_time,type,officer,ver_id
+    	app_desc.app_id,name,app_desc.user_id,status,intro,create_time,passed_time,type,officer,ver_id,app_key
     </sql>
     <select id="getAppDescList" resultType="AppDesc" parameterType="long">
     	select           
@@ -59,7 +59,7 @@
     	select count(app_id) from app_desc where 1=1
         <choose>
             <when test="appName != null and appName != ''">
-            	and name like '${appName}%'
+            	and name like CONCAT(SUBSTR(#{appName}, 1, LENGTH(#{appName})),'%')
        	 	</when>
         </choose>
         <choose>
@@ -85,7 +85,7 @@
         from app_desc where 1=1
         <choose>
             <when test="appName != null and appName != ''">
-            	and name like '${appName}%'
+            	and name like CONCAT(SUBSTR(#{appName}, 1, LENGTH(#{appName})),'%')
        	 	</when>
         </choose>
         <choose>
@@ -115,13 +115,12 @@
 		        </choose>
         	</when>
         </choose>
-        
     </select>
     
-    
- 	<update id="updateMemAlertValue" parameterType="AppDesc">
-    	update app_desc set mem_alert_value=#{memAlertValue} where app_id=#{appId}
+    <update id="updateAppKey">
+    	update app_desc set app_key=#{appKey} where app_id=#{appId}
     </update>
+    
 </mapper>
 
 
diff --git a/cachecloud-open-web/src/main/resources/mapper/AppDataMigrateStatusDao.xml b/cachecloud-open-web/src/main/resources/mapper/AppDataMigrateStatusDao.xml
new file mode 100644
index 00000000..d3867064
--- /dev/null
+++ b/cachecloud-open-web/src/main/resources/mapper/AppDataMigrateStatusDao.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.sohu.cache.dao.AppDataMigrateStatusDao">
+    <sql id="migrate_data_status_fields">
+        migrate_machine_ip,migrate_machine_port,source_migrate_type,source_servers,target_migrate_type,target_servers,
+        source_app_id,target_app_id,user_id,status,start_time,end_time,log_path,config_path
+    </sql>
+    
+    <insert id="save" parameterType="AppDataMigrateStatus" keyProperty="id" useGeneratedKeys="true" >
+    	insert into app_data_migrate_status
+    		(<include refid="migrate_data_status_fields"/>)
+		values
+			(#{migrateMachineIp},#{migrateMachinePort},#{sourceMigrateType},#{sourceServers},#{targetMigrateType},#{targetServers},
+			#{sourceAppId},#{targetAppId},#{userId},#{status},#{startTime},#{endTime},#{logPath},#{configPath})    	
+    </insert>
+    
+    
+    <select id="search" resultType="AppDataMigrateStatus">
+    	select id,<include refid="migrate_data_status_fields"/>
+        from app_data_migrate_status where 1=1
+        <choose>
+            <when test="appDataMigrateSearch.sourceAppId != null and appDataMigrateSearch.sourceAppId > 0">
+            	and source_app_id = #{appDataMigrateSearch.sourceAppId}
+       	 	</when>
+        </choose>
+        <choose>
+            <when test="appDataMigrateSearch.targetAppId != null and appDataMigrateSearch.targetAppId > 0">
+            	and target_app_id = #{appDataMigrateSearch.targetAppId}
+       	 	</when>
+        </choose>
+        
+        <choose>
+            <when test="appDataMigrateSearch.sourceInstanceIp != null and appDataMigrateSearch.sourceInstanceIp != ''">
+            	and source_servers like CONCAT('%',SUBSTR(#{appDataMigrateSearch.sourceInstanceIp}, 1, LENGTH(#{appDataMigrateSearch.sourceInstanceIp})),'%')
+       	 	</when>
+        </choose>
+        <choose>
+            <when test="appDataMigrateSearch.targetInstanceIp != null and appDataMigrateSearch.targetInstanceIp != ''">
+            	and target_servers like CONCAT('%',SUBSTR(#{appDataMigrateSearch.targetInstanceIp}, 1, LENGTH(#{appDataMigrateSearch.targetInstanceIp})),'%')
+       	 	</when>
+        </choose>
+        
+        <choose>
+            <when test="appDataMigrateSearch.startDate != null and appDataMigrateSearch.startDate != ''">
+            	and start_time > #{appDataMigrateSearch.startDate} 
+       	 	</when>
+        </choose>
+        <choose>
+            <when test="appDataMigrateSearch.endDate != null and appDataMigrateSearch.endDate != ''">
+            	and end_time &lt;#{appDataMigrateSearch.endDate} 
+       	 	</when>
+        </choose>
+        <choose>
+            <when test="appDataMigrateSearch.status >= 0">
+            	and status = #{appDataMigrateSearch.status} 
+       	 	</when>
+        </choose>
+    </select>
+    
+    <select id="getMigrateMachineStatCount" resultType="int">
+    	select count(*)
+        from app_data_migrate_status where migrate_machine_ip=#{migrateMachineIp} and status = #{status}
+    </select>
+    
+    <select id="get" resultType="AppDataMigrateStatus">
+    	select id,<include refid="migrate_data_status_fields"/>
+        from app_data_migrate_status where id = #{id}
+    </select>
+    
+    <update id="updateStatus">
+    	update app_data_migrate_status set status = #{status}, end_time=now() where id = #{id}
+    </update>
+    
+</mapper>
+
+
diff --git a/cachecloud-open-web/src/main/resources/mapper/AppStatsDao.xml b/cachecloud-open-web/src/main/resources/mapper/AppStatsDao.xml
index 079d7ab5..62de2d5d 100644
--- a/cachecloud-open-web/src/main/resources/mapper/AppStatsDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/AppStatsDao.xml
@@ -113,14 +113,32 @@
         command_count = command_count + #{commandCount},
         modify_time = #{modifyTime}
     </insert>
-
-    <select id="getAppStatsList" resultType="AppStats">
+    
+     <select id="getAppStatsList" resultType="AppStats">
         select
           <include refid="app_minute_statistics_columns"/> , create_time
         from <include refid="select_stat_table"/>
         where
           app_id = #{appId} and collect_time between #{td.begin} and #{td.end}
     </select>
+
+    <select id="getAppStatsByMinute" resultType="AppStats">
+        select
+          <include refid="app_minute_statistics_columns"/> , create_time
+        from app_minute_statistics
+        where
+          app_id = #{appId} and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
+    
+    <select id="getAppStatsByHour" resultType="AppStats">
+        select
+          <include refid="app_minute_statistics_columns"/> , create_time
+        from app_hour_statistics
+        where
+          app_id = #{appId} and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
     
     <select id="getAppCommandStatsList" resultType="AppCommandStats">
         select
@@ -131,6 +149,57 @@
           and command_name = #{commandName}
           and collect_time between #{td.begin} and #{td.end}
     </select>
+    
+    <select id="getAppAllCommandStatsListByMinute" resultType="AppCommandStats">
+        select
+        app_id,
+        collect_time,
+        'commands' command_name,
+        command_count,
+        create_time,
+        modify_time
+        from app_minute_statistics
+        where
+          app_id = #{appId}
+          and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
+    
+    <select id="getAppAllCommandStatsListByHour" resultType="AppCommandStats">
+        select
+        app_id,
+        collect_time,
+        'commands' command_name,
+        command_count,
+        create_time,
+        modify_time
+        from app_hour_statistics
+        where
+          app_id = #{appId}
+          and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
+    <select id="getAppCommandStatsListByMinuteWithCommand" resultType="AppCommandStats">
+        select
+          <include refid="app_minute_command_statistics_columns"/> , create_time
+        from app_minute_command_statistics
+        where
+          app_id = #{appId}
+          and command_name = #{commandName}
+          and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
+    
+    <select id="getAppCommandStatsListByHourWithCommand" resultType="AppCommandStats">
+        select
+          <include refid="app_minute_command_statistics_columns"/> , create_time
+        from app_hour_command_statistics
+        where
+          app_id = #{appId}
+          and command_name = #{commandName}
+          and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
 
     <select id="getAppAllCommandStatsList" resultType="AppCommandStats">
         select
@@ -198,5 +267,29 @@
         and t2.collect_time between #{td.begin} and #{td.end}
         limit 1;
     </select>
+    
+    <select id="getAppMinuteStat" resultType="hashmap">
+        select 
+        	avg(connected_clients) as avgClientCount,
+        	max(connected_clients) as maxClientCount,
+        	avg(command_count) as avgCommandCount, 
+        	max(command_count) as maxCommandCount,
+            sum(hits)/sum(command_count) as avgHitRatio,
+	        max(hits/command_count) as maxHitRatio,
+	        min(hits/command_count) as minHitRatio,
+	        avg(used_memory) as avgUsedMemory,
+	        max(used_memory) as maxUsedMemory,
+	        sum(expired_keys) as expiredKeys,
+	        sum(evicted_keys) as evictedKeys,
+	        avg(net_input_byte) as avgNetInputByte,
+	        max(net_input_byte) as maxNetInputByte,
+	        avg(net_output_byte) as avgNetOutputByte,
+	        max(net_output_byte) as maxNetOutputByte,
+	        avg(object_size) as avgObjectSize,
+	        max(object_size) as maxObjectSize
+        from app_minute_statistics
+        where app_id = #{appId} and collect_time between #{beginTime} and #{endTime}
+    </select>
+    
 
 </mapper>
\ No newline at end of file
diff --git a/cachecloud-open-web/src/main/resources/mapper/AppUserDao.xml b/cachecloud-open-web/src/main/resources/mapper/AppUserDao.xml
index 0407c925..d6423b1b 100644
--- a/cachecloud-open-web/src/main/resources/mapper/AppUserDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/AppUserDao.xml
@@ -14,7 +14,7 @@
             table_schema = 'cache-cloud' and table_name = @tn;
 	-->
 	<sql id="user_column">
-		id,name,ch_name,email,mobile,type
+		id,name,ch_name,email,mobile,type,avatar,nick_name,show_name,boss_id
     </sql>
     
     <select id="get" resultType="AppUser" parameterType="long">
@@ -24,6 +24,13 @@
         where id = #{id};
     </select>
     
+    <select id="getByBossId" resultType="AppUser" parameterType="long">
+        select           
+        	<include refid="user_column"/>
+        from app_user
+        where boss_id = #{bossId};
+    </select>
+    
     <select id="getByName" resultType="AppUser" parameterType="string">
         select           
         	<include refid="user_column"/>
@@ -35,7 +42,7 @@
     	insert into app_user
     		(<include refid="user_column"/>)
 		values
-			(#{id},#{name},#{chName},#{email},#{mobile},#{type})    	
+			(#{id},#{name},#{chName},#{email},#{mobile},#{type},#{avatar},#{nickName},#{showName},#{bossId})    	
     </insert>
     
     <delete id="delete" parameterType="long">
diff --git a/cachecloud-open-web/src/main/resources/mapper/InstanceConfigDao.xml b/cachecloud-open-web/src/main/resources/mapper/InstanceConfigDao.xml
new file mode 100644
index 00000000..b69e9c6b
--- /dev/null
+++ b/cachecloud-open-web/src/main/resources/mapper/InstanceConfigDao.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sohu.cache.dao.InstanceConfigDao">
+    <sql id="columns">
+    	config_key, config_value, info, update_time, type, status
+    </sql>
+
+    <select id="getByType" resultType="com.sohu.cache.entity.InstanceConfig">
+        select id,<include refid="columns"/> from instance_config where type = #{type}
+    </select>
+    
+    <select id="getById" resultType="com.sohu.cache.entity.InstanceConfig">
+        select id,<include refid="columns"/> from instance_config where id = #{id}
+    </select>
+    
+    <select id="getByConfigKeyAndType" resultType="com.sohu.cache.entity.InstanceConfig">
+        select id,<include refid="columns"/> from instance_config where config_key = #{configKey} and type = #{type}
+    </select>
+    
+    <select id="getAllInstanceConfig" resultType="com.sohu.cache.entity.InstanceConfig">
+        select id,<include refid="columns"/> from instance_config
+    </select>
+    
+    
+    <insert id="saveOrUpdate">
+		insert into instance_config(<include refid="columns" />)
+		values(#{configKey},#{configValue},#{info},now(),#{type},#{status})
+	    on duplicate key update
+	    config_value = #{configValue}, info = #{info}, 
+	    update_time = now(),status = #{status} 
+	</insert>
+	
+	<update id="updateStatus">
+		update instance_config set status = #{status} where id = #{id}
+	</update>
+	
+	<delete id="remove">
+		delete from instance_config where id = #{id}
+	</delete>
+
+</mapper>
\ No newline at end of file
diff --git a/cachecloud-open-web/src/main/resources/mapper/InstanceSlowLogDao.xml b/cachecloud-open-web/src/main/resources/mapper/InstanceSlowLogDao.xml
index 95365711..0f594dd0 100644
--- a/cachecloud-open-web/src/main/resources/mapper/InstanceSlowLogDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/InstanceSlowLogDao.xml
@@ -30,5 +30,10 @@
         select concat(ip,":",port) as hostPort,count(*) as count
         from instance_slow_log where app_id = #{appId} and create_time between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d') group by hostPort order by count desc
     </select>
+    
+    <select id="getAppSlowLogCount" resultType="int">
+        select count(*) as count
+        from instance_slow_log where app_id = #{appId} and create_time between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/cachecloud-open-web/src/main/resources/mapper/InstanceStatsDao.xml b/cachecloud-open-web/src/main/resources/mapper/InstanceStatsDao.xml
index 3ff27917..9d9042f9 100644
--- a/cachecloud-open-web/src/main/resources/mapper/InstanceStatsDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/InstanceStatsDao.xml
@@ -4,19 +4,14 @@
 <mapper namespace="com.sohu.cache.dao.InstanceStatsDao">
 
     <sql id="instance_statistics_columns">
-        inst_id,app_id,host_id,ip,port,role,max_memory,used_memory,curr_items,curr_connections,misses,hits,modify_time
+        inst_id,app_id,host_id,ip,port,role,max_memory,used_memory,curr_items,curr_connections,misses,hits,modify_time,mem_fragmentation_ratio,aof_delayed_fsync
     </sql>
 
-    <!--更新实例的最新统计信息
-     无法写入 why ???
-       UNIQUE KEY `ip` (`ip`,`port`),
-       UNIQUE KEY `idx_inst_id` (`inst_id`),
-    -->
     <insert id="updateInstanceStats" parameterType="InstanceStats">
         INSERT INTO instance_statistics
           (<include refid="instance_statistics_columns"/>)
         VALUES (#{instId},#{appId},#{hostId},#{ip},#{port},#{role},#{maxMemory},#{usedMemory},#{currItems},#{currConnections},#{misses},#{hits},
-                  #{modifyTime} )
+                  #{modifyTime},#{memFragmentationRatio},#{aofDelayedFsync})
         ON DUPLICATE KEY UPDATE
           inst_id = #{instId},
           host_id = #{hostId},
@@ -27,7 +22,9 @@
           curr_connections = #{currConnections},
           misses = #{misses},
           hits = #{hits},
-          modify_time = #{modifyTime}
+          modify_time = #{modifyTime},
+          mem_fragmentation_ratio = #{memFragmentationRatio},
+          aof_delayed_fsync = #{aofDelayedFsync}
     </insert>
 
     <select id="getInstanceStatsByHost" resultType="InstanceStats">
diff --git a/cachecloud-open-web/src/main/resources/mapper/MachineDao.xml b/cachecloud-open-web/src/main/resources/mapper/MachineDao.xml
index 14ff5dd0..696c258a 100644
--- a/cachecloud-open-web/src/main/resources/mapper/MachineDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/MachineDao.xml
@@ -1,59 +1,72 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sohu.cache.dao.MachineDao">
-    <sql id="machine_info_columns">
-        ssh_user,ssh_passwd,ip,room,mem,cpu,`virtual`,real_ip,service_time,fault_count,warn,available,type,groupId,extra_desc
-    </sql>
-
-    <sql id="machine_info_fields">
-        #{sshUser},#{sshPasswd},#{ip},#{room},#{mem},#{cpu},#{virtual},#{realIp},#{serviceTime},
-        #{faultCount},#{warn},#{available},#{type},#{groupId},#{extraDesc}
-    </sql>
-
-    <!--返回所有可用的机器资源-->
-    <select id="getAllMachines" resultType="MachineInfo">
-        select
-        id, modify_time, <include refid="machine_info_columns"/>
-        from machine_info
-        where available = 1
-    </select>
-
-    <!--通过ip查找机器-->
-    <select id="getMachineInfoByIp" resultType="MachineInfo">
-        select
-          id, modify_time, <include refid="machine_info_columns"/>
-        from machine_info
-        where ip = #{ip};
-    </select>
-    
-    <!--通过ip查找机器-->
-    <select id="getMachineInfoByLikeIp" resultType="MachineInfo">
-        select
-          id, modify_time, <include refid="machine_info_columns"/>
-        from machine_info
-        <choose>
-            <when test="ipLike != '' and ipLike != null">
-                where ip like '%${ipLike}%'
-            </when>
-        </choose>
-    </select>
-
-    <!--保存机器信息-->
-    <select id="saveMachineInfo" parameterType="MachineInfo">
-        insert into machine_info
-          (<include refid="machine_info_columns"/>)
-        values
-          (<include refid="machine_info_fields"/>)
-        on duplicate key 
-        update ssh_user=#{sshUser},ssh_passwd=#{sshPasswd},room=#{room},mem=#{mem},cpu=#{cpu},
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sohu.cache.dao.MachineDao">
+    <sql id="machine_info_columns">
+        ssh_user,ssh_passwd,ip,room,mem,cpu,`virtual`,real_ip,service_time,fault_count,warn,available,type,groupId,extra_desc,collect
+    </sql>
+
+    <sql id="machine_info_fields">
+        #{sshUser},#{sshPasswd},#{ip},#{room},#{mem},#{cpu},#{virtual},#{realIp},#{serviceTime},
+        #{faultCount},#{warn},#{available},#{type},#{groupId},#{extraDesc},#{collect}
+    </sql>
+
+    <!--返回所有可用的机器资源-->
+    <select id="getAllMachines" resultType="MachineInfo">
+        select
+        id, modify_time, <include refid="machine_info_columns"/>
+        from machine_info
+        where available = 1
+    </select>
+
+    <!--通过ip查找机器-->
+    <select id="getMachineInfoByIp" resultType="MachineInfo">
+        select
+          id, modify_time, <include refid="machine_info_columns"/>
+        from machine_info
+        where ip = #{ip};
+    </select>
+    
+    <!--通过ip查找机器-->
+    <!-- 防止sql注入 author:hezf 但concat函数不具备跨数据库能力。 -->
+    <select id="getMachineInfoByLikeIp" resultType="MachineInfo">
+        select
+          id, modify_time, <include refid="machine_info_columns"/>
+        from machine_info where available = 1
+        <choose>
+            <when test="ipLike != '' and ipLike != null">
+                and ip like CONCAT('%',SUBSTR(#{ipLike}, 1, LENGTH(#{ipLike})),'%')
+            </when>
+        </choose>
+    </select>
+
+    <!--保存机器信息-->
+    <insert id="saveMachineInfo" parameterType="MachineInfo">
+        insert into machine_info
+          (<include refid="machine_info_columns"/>)
+        values
+          (<include refid="machine_info_fields"/>)
+        on duplicate key 
+        update ssh_user=#{sshUser},ssh_passwd=#{sshPasswd},room=#{room},mem=#{mem},cpu=#{cpu},
         `virtual`=#{virtual},real_ip=#{realIp},service_time=#{serviceTime},fault_count=#{faultCount},
-        warn=#{warn},available=#{available},type=#{type},groupId=#{groupId},extra_desc=#{extraDesc}
-    </select>
-    
-    <!--根据ip删除一台机器的信息-->
-    <delete id="removeMachineInfoByIp" parameterType="string">
-        DELETE FROM machine_info
-        WHERE ip = #{ip}
-    </delete>
-</mapper>
\ No newline at end of file
+        warn=#{warn},available=#{available},type=#{type},groupId=#{groupId},extra_desc=#{extraDesc},collect=#{collect}
+    </insert>
+    
+    <!--根据ip删除一台机器的信息:置无效-->
+    <update id="removeMachineInfoByIp" parameterType="string">
+        update machine_info set available = 0 WHERE ip = #{ip}
+    </update>
+    
+    <!--通过type查找机器-->
+    <select id="getMachineInfoByType" resultType="MachineInfo">
+        select
+          id, modify_time, <include refid="machine_info_columns"/>
+        from machine_info where type = #{type} and available = 1
+    </select>
+    
+    <!-- 更新机器类型 -->
+    <update id="updateMachineType">
+    	update machine_info set type = #{type} where id = #{id}
+    </update>
+    
+</mapper>
diff --git a/cachecloud-open-web/src/main/resources/mapper/MachineStatsDao.xml b/cachecloud-open-web/src/main/resources/mapper/MachineStatsDao.xml
index 1d4612ed..fbeaa4b3 100644
--- a/cachecloud-open-web/src/main/resources/mapper/MachineStatsDao.xml
+++ b/cachecloud-open-web/src/main/resources/mapper/MachineStatsDao.xml
@@ -64,7 +64,7 @@
         from machine_statistics
         <choose>
             <when test="ipLike != '' and ipLike != null">
-                where ip like '%${ipLike}%'
+                where ip like CONCAT('%',SUBSTR(#{ipLike}, 1, LENGTH(#{ipLike})),'%')
             </when>
         </choose>
     </select>
diff --git a/cachecloud-open-web/src/main/resources/mapper/ServerStatusDao.xml b/cachecloud-open-web/src/main/resources/mapper/ServerStatusDao.xml
new file mode 100644
index 00000000..1ea54c50
--- /dev/null
+++ b/cachecloud-open-web/src/main/resources/mapper/ServerStatusDao.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.sohu.cache.dao.ServerStatusDao">
+	
+	<!-- 获取服务器信息 -->
+    <select id="queryServerInfo" resultType="ServerInfo">
+    	select ip,host,nmon,cpus,cpu_model cpuModel,dist,kernel,ulimit
+        from server where ip=#{ip}
+    </select>
+    
+    <!-- 保存服务器发行版信息 -->
+    <insert id="saveServerInfo">
+    	insert ignore into server(ip,dist) values (#{ip},#{dist})
+    </insert>
+    
+    <!-- 删除服务器信息 -->
+    <select id="deleteServerInfo">
+    	delete from server where ip=#{ip}
+    </select>
+    
+    <!-- 保存/更新服务器信息 -->
+    <insert id="saveAndUpdateServerInfo">
+    	insert into server (ip,host,nmon,cpus,cpu_model,kernel,ulimit) 
+		values (#{server.ip},#{server.host},#{server.nmon},#{server.cpus},#{server.cpuModel},#{server.kernel},#{server.ulimit})
+		on duplicate key update host=values(host), nmon=values(nmon), cpus=values(cpus),
+		cpu_model=values(cpu_model), kernel=values(kernel), ulimit=values(ulimit)
+    </insert>
+    
+    <!-- 获取服务器状态 -->
+    <select id="queryServerOverview" resultType="ServerStatus">
+    	select ip,cdate,ctime,cuser,csys,cwio,cload1,cload5,cload15,
+			   mtotal,mfree,mcache,mbuffer,mswap,mswap_free mswapFree,
+			   nin,nout,tuse,torphan,twait,
+			   dread,dwrite,diops,dbusy
+		from server_stat
+		where ip=#{ip} and cdate=#{cdate}
+    </select>
+    
+    <!-- 获取服务器cpu状态 -->
+    <select id="queryServerCpu" resultType="ServerStatus">
+    	select ctime, c_ext cExt
+		from server_stat
+		where ip=#{ip} and cdate=#{cdate}
+    </select>
+    
+    <!-- 获取服务器net状态 -->
+    <select id="queryServerNet" resultType="ServerStatus">
+    	select ctime, nin_ext ninExt,nout_ext noutExt
+		from server_stat
+		where ip=#{ip} and cdate=#{cdate}
+    </select>
+    
+    <!-- 获取服务器disk状态 -->
+    <select id="queryServerDisk" resultType="ServerStatus">
+    	select ctime, d_ext dExt,dspace
+		from server_stat
+		where ip=#{ip} and cdate=#{cdate}
+    </select>
+    
+    <!-- 获取服务器状态 -->
+    <select id="queryServerStat" resultType="ServerStatus">
+    	select ip,cdate,ctime,cuser,csys,cwio,c_ext cExt,cload1,cload5,cload15,
+			   mtotal,mfree,mcache,mbuffer,mswap,mswap_free mswapFree,
+			   nin,nout,nin_ext ninExt,nout_ext noutExt,tuse,torphan,twait,
+			   dread,dwrite,diops,dbusy,d_ext dExt,dspace"
+		from server_stat
+		where ip=#{ip} and cdate=#{cdate}
+    </select>
+    
+    <!-- 保存服务器状态-->
+    <insert id="saveServerStat">
+    	insert ignore into server_stat(ip,cdate,ctime,cuser,csys,cwio,c_ext,
+    		   cload1,cload5,cload15,
+    		   mtotal,mfree,mcache,mbuffer,mswap,mswap_free,
+    		   nin,nout,nin_ext,nout_ext,
+    		   tuse,torphan,twait,
+    		   dread,dwrite,diops,dbusy,d_ext,dspace)
+     	values(#{server.ip},#{server.collectTime},#{server.time},
+     		   #{server.cpu.user},#{server.cpu.sys},#{server.cpu.wait},#{server.cpu.ext},
+     		   #{server.load.load1},#{server.load.load5},#{server.load.load15},
+     		   #{server.mem.total},#{server.mem.totalFree},#{server.mem.cache},
+     		   #{server.mem.buffer},#{server.mem.swap},#{server.mem.swapFree},
+     		   #{server.net.nin},#{server.net.nout},#{server.net.ninDetail},#{server.net.noutDetail},
+     		   #{server.connection.established},#{server.connection.orphan},#{server.connection.timeWait},
+     		   #{server.disk.read},#{server.disk.write},#{server.disk.iops},#{server.disk.busy},
+     		   #{server.disk.ext},#{server.disk.space})
+    </insert>
+</mapper>
\ No newline at end of file