diff --git a/README.md b/README.md
index df1ce247c128623cd366220136f87227e9cad427..89ee3a7272f77bb51af2e0e29a05d583ee3cd1e0 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Quick Start
### 安装CAT集群大致步骤
-1. 初始化Mysql数据库,一套CAT集群部署一个数据库,初始化脚本在script下的Cat.sql
+1. 初始化Mysql数据库,一套CAT集群部署一个数据库,初始化脚本在script下的CatApplication.sql
2. 准备三台CAT服务器,IP比如为10.1.1.1,10.1.1.2,10.1.1.3,下面的例子会以这个IP为例子
3. 初始化/data/目录,配置几个配置文件/data/appdatas/cat/*.xml 几个配置文件,具体下面有详细说明
4. 打包cat.war 放入tomcat容器
@@ -130,7 +130,7 @@ CATALINA_OPTS="$CATALINA_OPTS -server -Djava.awt.headless=true -Xms25G -Xmx25G -
```
### 4、安装CAT的数据库
-- 数据库的脚本文件 script/Cat.sql
+- 数据库的脚本文件 script/CatApplication.sql
- MySQL的一个系统参数:max_allowed_packet,其默认值为1048576(1M),修改为1000M,修改完需要重启mysql
- 注意:一套独立的CAT集群只需要一个数据库(之前碰到过个别同学在每台cat的服务端节点都安装了一个数据库)
diff --git a/cat-doc/posts/ch4-server/README.md b/cat-doc/posts/ch4-server/README.md
index c93ee24a723cd429bc50df7d13a8aef891a49a1e..d2d49021efd38da30de69734397c24214b1b6759 100644
--- a/cat-doc/posts/ch4-server/README.md
+++ b/cat-doc/posts/ch4-server/README.md
@@ -26,7 +26,7 @@ cat主要由以下组件组成:
### 安装CAT集群大致步骤
-1. 初始化Mysql数据库,一套CAT集群部署一个数据库,初始化脚本在script下的Cat.sql
+1. 初始化Mysql数据库,一套CAT集群部署一个数据库,初始化脚本在script下的CatApplication.sql
2. 准备三台CAT服务器,IP比如为10.1.1.1,10.1.1.2,10.1.1.3,下面的例子会以这个IP为例子
3. 初始化/data/目录,配置几个配置文件/data/appdatas/cat/*.xml 几个配置文件,具体下面有详细说明
4. 打包cat.war 放入tomcat容器
@@ -85,7 +85,7 @@ CATALINA_OPTS="$CATALINA_OPTS -server -Djava.awt.headless=true -Xms25G -Xmx25G -
```
### 4、安装CAT的数据库
-- 数据库的脚本文件 script/Cat.sql
+- 数据库的脚本文件 script/CatApplication.sql
- MySQL的一个系统参数:max_allowed_packet,其默认值为1048576(1M),修改为1000M,修改完需要重启mysql
- 注意:一套独立的CAT集群只需要一个数据库(之前碰到过个别同学在每台cat的服务端节点都安装了一个数据库)
diff --git a/cat-home/src/main/webapp/jsp/report/home/deploy.jsp b/cat-home/src/main/webapp/jsp/report/home/deploy.jsp
index 0b008ab1476bac77eb2a2fe1b8221e48a52e4940..c44243c326d5675baad2c938ca46185bf2db74a0 100644
--- a/cat-home/src/main/webapp/jsp/report/home/deploy.jsp
+++ b/cat-home/src/main/webapp/jsp/report/home/deploy.jsp
@@ -1,6 +1,6 @@
<%@ page session="false" language="java" pageEncoding="UTF-8" %>
生产环境部署
-1、配置生产环境数据库,数据库脚本在资源文件 scrip/Cat.sql。
+1、配置生产环境数据库,数据库脚本在资源文件 scrip/CatApplication.sql。
2、准备N台cat服务器,比如3台,ip为10.1.1.1,10.1.1.2,10.1.1.3。
3、在所有cat服务器上安装tomcat,启动端口默认设定为8080。
tomcat启动参数参考:-Xms20288m -Xmx20288m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:NewSize=10144m -XX:MaxNewSize=10144m -XX:SurvivorRatio=10
diff --git "a/integration/springMVC-AOP/CAT\351\203\250\347\275\262.txt" "b/integration/springMVC-AOP/CAT\351\203\250\347\275\262.txt"
index a28e80b53f811a1796d8b019df36f38755439663..885ce0603e621128c575de06bb372a325eb9dbb8 100644
--- "a/integration/springMVC-AOP/CAT\351\203\250\347\275\262.txt"
+++ "b/integration/springMVC-AOP/CAT\351\203\250\347\275\262.txt"
@@ -3,7 +3,7 @@
在CAT目录下,用maven构建项目
mvn clean install –DskipTests
2. 创建CAT库表
- 新建cat数据库并执行源码/source/cat/script/Cat.sql脚本完成表结构的创建。
+ 新建cat数据库并执行源码/source/cat/script/CatApplication.sql脚本完成表结构的创建。
3. 配置文件:
拷贝client.xml、server.xml、datasources.xml文件到/data/appdatas/cat/目录中
Cat服务端配置
diff --git "a/script/Cat\346\212\200\346\234\257\345\205\245\351\227\250\346\200\273\347\273\223-0.1.0.doc" "b/script/Cat\346\212\200\346\234\257\345\205\245\351\227\250\346\200\273\347\273\223-0.1.0.doc"
deleted file mode 100644
index 23ee6a00853bace5ba303aad063b1af8b5a0b234..0000000000000000000000000000000000000000
Binary files "a/script/Cat\346\212\200\346\234\257\345\205\245\351\227\250\346\200\273\347\273\223-0.1.0.doc" and /dev/null differ
diff --git "a/script/Dianping CAT \345\256\211\350\243\205\350\257\264\346\230\216\346\226\207\346\241\243.md" "b/script/Dianping CAT \345\256\211\350\243\205\350\257\264\346\230\216\346\226\207\346\241\243.md"
deleted file mode 100644
index 5d0faa639599a0c2ca4ec79a9a031a914501686e..0000000000000000000000000000000000000000
--- "a/script/Dianping CAT \345\256\211\350\243\205\350\257\264\346\230\216\346\226\207\346\241\243.md"
+++ /dev/null
@@ -1,303 +0,0 @@
-# Dianping CAT 安装说明文档
-
-## 一、系统要求
-
-### 1. 操作系统及硬件环境
-
-监听端:
-
-* 根据业务系统需求确定
-
-服务端:
-
-* 内存 4G 以上
-* 硬盘 100G 以上
-* 操作系统 Windows或Linux操作系统(建议选用Linux操作系统)
-
-### 2. 运行环境
-
-* Java 6 以上
-* Web 应用服务器,如:Apache Tomcat、JBoss Application Server、WebSphere Application Server、WebLogic Application Server(可选项,内置Netty应用服务器)
-* MySQL 数据库
-* Maven 3 以上(只编译和安装时需要)
-
-注意:安装时需要拥有计算机管理员权限。
-
-### 3. 网络环境
-
-要求连接到互联网或通过代理上网。
-
-## 二、安装包文件清单
-
-* [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html)
-
- * jdk-7u79-linux-i586.tar.gz (linux 32位系统)
- * jdk-7u79-linux-x64.tar.gz (linux 64位系统)
- * jdk-7u79-windows-i586.exe (windows 32位系统)
- * jdk-7u79-windows-x64.exe (windows 32位系统)
-
-* [Apache Tomcat](http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.57/bin/)
-
- * apache-tomcat-7.0.57.tar.gz (linux 系统)
- * apache-tomcat-7.0.57-windows-x86.zip (windows 32位系统)
- * apache-tomcat-7.0.57-windows-x64.zip (windows 32位系统)
-
-* [MySQL](http://www.mysql.com/downloads/)
-
- * MySQL Server 5.1
-
-* [Maven](http://maven.apache.org/download.cgi)
-
- * apache-maven-3.1.1-bin.tar.gz (linux 系统)
- * apache-maven-3.1.1-bin.zip (windows 系统)
-
-* [dianping CAT]
-
- * [Cat source code](https://github.com/dianping/cat/archive/master.zip) (直接下载)
- `https://github.com/dianping/cat/archive/master.zip`
- * 通过 Git Clone
- `https://github.com/dianping/cat.git`
-
-## 三、安装操作
-
-### 1、 编译源码,构建war包
-
-* 前提条件
-
- 1. 已安装、配置JDK;
- 2. 已安装、配置MAVEN;
- 3. 已下载CAT源码;
-
-* 操作步骤
-
- 1. 进入监控系统源码的cat目录
-
- cd /source/cat
-
- 2. 显示确认目录结构
-
- dir
-
- ![目录结构](http://upload-images.jianshu.io/upload_images/424045-e9fad099e5c4c8f5.jpg)
-
- 3. 运行 MAVEN 打包安装命令
-
- mvn clean install -DskipTests
-
- 4. 执行完成后,
-
- * 编译构造好的 war 安装到 Maven 仓库中。
-
-### 2、自动创建库表、配置文件
-
-* 前提条件
-
- 1. CAT 安装包已构建
- 2. /data/appdatas/cat/ 目录有读写权限
-
-* 操作步骤
-
- 1. 运行 CAT 安装插件命令
-
- maven cat:install
-
- 2. 按提示输入数据库配置参数
-
- ![数据库配置](http://upload-images.jianshu.io/upload_images/424045-7e5de138226fe347.jpg)
-
- (_红线标识输入的配置信息_)
-
- 3. 执行完成后,
-
- * 数据库中创建cat表空间,并创建所有表结构;
-
- * 在/data/appdatas/cat/目录中,生成三个配置文件:client.xml、server.xml、datasources.xml(windows系统中,/data目录与源码目录在一个系统盘)
-
- 4. 补充说明
-
- 此部分操作,可手工完成,安装MySQL好数据库后,
-
- * 登录MySQL,创建cat表空间
-
- create database cat
-
- * 执行监控系统源码/source/cat/script/Cat.sql脚本完成表结构的创建
-
- source /source/cat/script/Cat.sql
-
- * 拷贝监控系统源码/source/cat/script/目录下的client.xml、server.xml、datasources.xml到/data/appdatas/cat/目录中
-
- cp /source/cat/script/*.xml /data/appdatas/cat/
-
-### 3、修改监控系统CAT服务配置
-
-安装创建的配置信息都是默认值,需要按实际情况修改,整个系统才可正常运行。
-
-几项假设
-
- * cat.war 包部署在10.8.40.26、10.8.40.27、10.8.40.28三台机器上,10.8.40.26为三台机器中的主服务器,TCP端口只能局域网内访问;
- * web应用服务器采用 Tomcat 7;
- * 数据库采用 MySQL 5.1 ,安装在10.8.40.147上;
- * 暂不启用HDFS存储服务;
- * 暂不启用LDAP服务;
-
-* 前提条件
-
- 1. CAT 安装包已构建
- 2. 数据库和表结构已创建
- 3. /data/appdatas/cat/ 目录下的配置文件已生成
-
-* 操作步骤
-
- 1. 修改客户端配置文件
-
- 打开/data/appdatas/cat/client.xml客户端配置文件,
-
-
-
-
-
-
-
-
-
- 配置说明:
-
- * mode : 定义配置模式,固定值为client;--暂未使用
- * servers : 定义多个服务端信息;
- * server : 定义某个服务端信息;
- * ip : 配置服务端(cat-home)对外IP地址
- * port : 配置服务端(cat-home)对外TCP协议开启端口,固定值为2280;
- * http-port : 配置服务端(cat-home)对外HTTP协议开启端口, 如:tomcat默认是8080端口,若未指定,默认为8080端口;
-
- 2. 修改数据库配置
-
- 打开/data/appdatas/cat/datasources.xml数据库配置文件,
-
-
-
- 3
- 1s
- 10m
- 1000
-
- com.mysql.jdbc.Driver
-
- root
- mysql
-
-
-
-
-
-
- 3
- 1s
- 10m
- 1000
-
- com.mysql.jdbc.Driver
-
- root
- mysql
-
-
-
-
-
-
-
- 配置说明:
-
- * 生成配置文件时,输入的数据库连接信息已写入此文件,如不换数据库,不用做任何修改
- * 主要修改项为:url(数据库连接地址)、user(数据库用户名)、password(数据用户登录密码)
-
- 3. 修改服务端服务配置
-
- 打开/data/appdatas/cat/server.xml服务端服务配置文件,
-
-
-
-
-
-
-
-
- 10.8.40.26:8080,10.8.40.27:8080,10.8.40.28:8080
-
-
-
-
- 配置说明:
-
- * local-mode : 定义服务是否为本地模式(开发模式),在生产环境时,设置为false,启动远程监听模式。默认为 false;
- * hdfs-machine : 定义是否启用HDFS存储方式,默认为 false;
- * job-machine : 定义当前服务是否为报告工作机(开启生成汇总报告和统计报告的任务,只需要一台服务机开启此功能),默认为 false;
- * alert-machine : 定义当前服务是否为报警机(开启各类报警监听,只需要一台服务机开启此功能),默认为 false;
- * storage : 定义数据存储配置信息
- * local-report-storage-time : 定义本地报告存放时长,单位为(天)
- * local-logivew-storage-time : 定义本地日志存放时长,单位为(天)
- * local-base-dir : 定义本地数据存储目录
- * hdfs : 定义HDFS配置信息,便于直接登录系统
- * server-uri : 定义HDFS服务地址
- * console : 定义服务控制台信息
- * remote-servers : 定义HTTP服务列表,(远程监听端同步更新服务端信息即取此值)
- * ldap : 定义LDAP配置信息
- * ldapUrl : 定义LDAP服务地址
-
-
- 4. 发布启动 cat-home 服务
-
- 1. 拷贝监控系统源码/source/cat/cat-home/target/目录下的cat-alpha-1.3.3.war到web应用服务器的发布目录(如:$TOMCAT_HOME$/webapps/),并修改war包名称为cat.war
-
- `cp /source/cat/cat-home/cat-alpha-1.3.3.war /usr/local/tomcat7/webapps/cat.war`
-
- 2. 启动应用服务器
-
- cd /usr/local/tomcat7/bin/
- ./startup.sh
-
- 5. 登入 cat-home 系统,修改路由配置
-
- 打开浏览器,输入[http://10.8.40.26:8080/cat/](http://10.8.40.26:8080/cat/)
-
- ![cat-route.jpg](http://upload-images.jianshu.io/upload_images/424045-e07ca5912a562d16.jpg)
-
- 选择 配置-->全局警告配置-->客户端路由,或者在浏览器地址栏中直接输入http:/10.8.40.26:8080/cat/s/config?op=routerConfigUpdate,打开客户端路由配置界面。
-
- * 把backup-server设置为当前服务器对外IP地址,端口固定为2280;
- * default-server定义可跳转的路由地址,可以设置多个。default-server的id属性配置可路由的cat-home服务IP地址,端口固定为2280;若需要禁用路由地址,可把enable设置为false。
- * 点击“提交”按钮,保存修改的路由配置
-
- 6. 复制配置到27、28两机器
-
- * 拷贝 10.8.40.26机器/data/appdatas/cat/目录中client.xml、server.xml、datasources.xml三个配置文件到27、28两机器相同目录中
- * 修改server.xml配置中的 job-machine 和 alert-machine属性,都设置为false,禁用生成报告和报警功能,只开启监听功能
- * 启动27、28上的Tomcat,开启cat服务,完成服务端的配置及启动
-
- (*若服务端只分配一台服务器,按10.8.40.26完成安装配置即可*)
-
-
-
-## 附注
-
-如果在linux操作系统上安装cat-home,并且有联网权限,可以选择一键安装CAT:
-
-* 获取监控系统源码/source/cat/script/目录全部脚本,
-* 拷贝到linux操作系统机器上任意目录
-* 执行/source/cat/script/install-shell/installAll.sh脚本,
-
-执行结果:
-
-* 下载、安装、配置 jdk1.6.0_45
-* 下载、安装、配置 apache-maven-3.2.5
-* 下载、安装、配置 MySQL
-* 下载、安装 apache-tomcat-7.0.57
-* 在线安装 Git
-* 通过Git下载CAT,并编译、安装、配置CAT
-
-启动CAT后,按"修改监控系统CAT服务配置"说明进行后继配置
-
-
diff --git "a/script/Dianping CAT \351\205\215\347\275\256\345\212\240\350\275\275\350\257\264\346\230\216.md" "b/script/Dianping CAT \351\205\215\347\275\256\345\212\240\350\275\275\350\257\264\346\230\216.md"
deleted file mode 100644
index fec762bf217fbf6a3eac5e97f68edd80362c531c..0000000000000000000000000000000000000000
--- "a/script/Dianping CAT \351\205\215\347\275\256\345\212\240\350\275\275\350\257\264\346\230\216.md"
+++ /dev/null
@@ -1,74 +0,0 @@
-__CAT__ 配置文件加载说明
-===
-
-## 背景说明
-
-__CAT__监控系统由多个组件组成
-
-![cat 组件关系图](img/cat-cmp.jpg)
-
-* cat-home.war : 服务端组件,负责收集监控信息,分析处理生成报告、作出警告
-* cat-client.jar : 客户端组件,负责与服务端进行连接通信,
-* cat-core.jar : 核心处理组件,负责具体的与客户端通信服务,解析数据、输出报告
-* cat-consumer.jar : 消费处理组件,负责实际的监控数据分析,处理工作
-* cat-hadoop.jar : HDFS存储组件
-* broker-service.war : 监控服务代理组件
-
-
-## 配置文件清单说明
-
-### cat-home.war 外部配置文件
-
-cat-home.war 有三个外部配置文件,分别是:
-
-* /data/appdatas/cat/client.xml,
-
- * 配置连接(其它)服务端的信息,如IP地址、tcp端口、http端口
-
-* /data/appdatas/cat/server.xml,
-
- * 定义服务端启用服务;
- * 数据存储方式、策略及存储配置信息;
- * 服务端服务群信息(如服务器的IP地址、tcp端口、http端口、服务的权重、服务配置状态)
-
-* /data/appdatas/cat/datasources.xml,
-
- * 配置服务端连接数据库的信息
-
-### cat-home.war 内置配置文件
-* cat-home.war!/WEB-INF/web.xml
- * web应用默认配置文件
-
-* cat-home.war!/WEB-INF/classes/META-INF/app.properties
- * 首选的应用特征信息配置文件,默认内容为:app.name=cat
-
-* cat-home.war!/WEB-INF/classes/META-INF/cat/client.xml
- * 次选的应用特征信息配置文件
-
-* cat-home.war!/WEB-INF/classes/META-INF/plexus/components.xml
- * plexus类容器加载类定义的配置文件,
-
-
-## 配置文件加载流程
-
-### cat-home.war配置文件加载
-
-* Web容器加载web.xml;
-
- ```cat-home.war!/WEB-INF/web.xml```
-
-* plexus类容器加载components.xml;
-
- ```cat-home.war!/WEB-INF/classes/META-INF/plexus/components.xml```
-
-* 在CatHomeModule类中,ServerConfigManager加载server.xml
-
- ```/data/appdatas/cat/server.xml```
-
-
-### 运行期内同步服务端的配置信息
-
-在ChannelManager类中,
-
-* 每10秒钟会检测一次服务端对外服务配置信息是否变化(获取服务端的路由信息);
-* 若配置信息有变化,重新创建与服务端的通信通道
\ No newline at end of file
diff --git a/script/archiveHarJob.sh b/script/archiveHarJob.sh
deleted file mode 100644
index 30348529f9ed0f9e619455aa47dc43ffbdb1094b..0000000000000000000000000000000000000000
--- a/script/archiveHarJob.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-HADOOP_PATH=/usr/local/hadoop/hadoop-release/bin
-
-#Archive hdfs to har
-DATE_DIR=`date --date='yesterday' +'%Y%m%d'`
-DATE_HOUR_DIR=`date +'%H'`
-TARGET_PATH=/user/cat/dump/${DATE_DIR}
-ARCHIVE_PATH=${TARGET_PATH}/${DATE_HOUR_DIR}
-
-#Prune history data
-DELETE_DURATION=15
-PRUNE_DATE=`date --date="${DELETE_DURATION} days ago" +%Y%m%d`
-
-echo "PRINT> Deleting files ${DELETE_DURATION} days ago: ${PRUNE_DATE}*"
-${HADOOP_PATH}/hadoop fs -rm -R /user/cat/dump/${PRUNE_DATE}*
-
-echo "PRINT> Archiving ${ARCHIVE_PATH} ..."
-${HADOOP_PATH}/hadoop archive -archiveName ${DATE_HOUR_DIR}.har -p ${ARCHIVE_PATH} ${TARGET_PATH}
-
-if [ $? -eq 0 ];then
- ${HADOOP_PATH}/hadoop fs -ls ${ARCHIVE_PATH}.har/part*
- if [ $? -eq 0 ];then
- echo "PRINT> Deleting source path ${ARCHIVE_PATH} ..."
- ${HADOOP_PATH}/hadoop fs -rm -R ${ARCHIVE_PATH}
- fi
-else
- echo "PRINT> Faild to archive ${ARCHIVE_PATH}"
-fi
-
diff --git a/script/client.xml b/script/client.xml
deleted file mode 100644
index 4b5a203d6e7c4ce3285ee95599200cdfbd18545c..0000000000000000000000000000000000000000
--- a/script/client.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/script/datasources.xml b/script/datasources.xml
deleted file mode 100644
index 9c6024c81f4f28d8ddfe7665b5cde2d4e827e1da..0000000000000000000000000000000000000000
--- a/script/datasources.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- 3
- 1s
- 10m
- 1000
-
- com.mysql.jdbc.Driver
-
- ${jdbc.user}
- ${jdbc.password}
-
-
-
-
- 3
- 1s
- 10m
- 1000
-
- com.mysql.jdbc.Driver
-
- ${jdbc.user}
- ${jdbc.password}
-
-
-
-
diff --git a/script/install-shell/installAll.sh b/script/install-shell/installAll.sh
deleted file mode 100644
index 50216f3db67e0cac908290d9f2a6056d55e73111..0000000000000000000000000000000000000000
--- a/script/install-shell/installAll.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-chmod +x installJDK.sh
-chmod +x installMaven.sh
-chmod +x installMySql.sh
-chmod +x installTomcat.sh
-chmod +x installCat.sh
-chmod +x startCat.sh
-./installJDK.sh
-./installMaven.sh
-./installMySql.sh
-./installTomcat.sh
-./installCat.sh
-./startCat.sh
\ No newline at end of file
diff --git a/script/install-shell/installCat.sh b/script/install-shell/installCat.sh
deleted file mode 100644
index 8eab2c6d0433a48513f3e0315041117eb4590292..0000000000000000000000000000000000000000
--- a/script/install-shell/installCat.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-yum -y install git
-git clone https://github.com/dianping/cat.git
-chmod -R 777 /cat/
-cd cat/
-mvn clean install -DskipTests
-
-mkdir -p /data/appdatas/cat
-mkdir -p /data/applogs/cat
-chmod -R 777 /data/
-
-
-echo "mysql_jdbcUrl=jdbc:mysql://127.0.0.1:3306" | tee -a /etc/environment
-echo "mysql_username=root" | tee -a /etc/environment
-echo "mysql_password=123456" | tee -a /etc/environment
- #update environment
-source /etc/environment
-
-cd /home/$LOGNAME
-cd cat/
-mvn cat:install
-
-#cd cat-home/
-#mvn jetty:run
-
-
-
-
-
-
-
-
diff --git a/script/install-shell/installJDK.sh b/script/install-shell/installJDK.sh
deleted file mode 100644
index d0487413e07bd43083186eba219fb77edf375a48..0000000000000000000000000000000000000000
--- a/script/install-shell/installJDK.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-mkdir /usr/local/java
-cd /usr/local/java
-
-#download jdk 1.7.67
-#wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u67-b01/jdk-7u67-linux-x64.tar.gz
-wget --no-check-certificate --no-cookies --header "Cookie: s_nr=1392900709523; ORA_WWW_PERSONALIZE=v:1~i:6~r:6~g:APAC~l:en~cs:NOT_FOUND~cn:scut; ORASSO_AUTH_HINT=v1.0~20140322121132; ORA_UCM_INFO=3~xxxx21212xxxx~xxxx~xxxx~xxxx@163.com; s_cc=true; oraclelicense=accept-securebackup-cookie; gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjava-archive-downloads-javase6-419409.html%23jdk-6u45-oth-JPR; s_sq=%5B%5BB%5D%5D;" http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin
-
-#extract jdk
-#tar -xvf jdk-7u67-linux-x64.tar.gz
-mv jdk-6u45-linux-* jdk-6u45-linux-x64.bin
-chmod +x jdk-6u45-linux-x64.bin
-./jdk-6u45-linux-x64.bin
-
-#set environment
-export JAVA_HOME="/usr/local/java/jdk1.6.0_45"
-if ! grep "JAVA_HOME=/usr/local/java/jdk1.6.0_45" /etc/environment
-then
- echo "JAVA_HOME=/usr/local/java/jdk1.6.0_45" | tee -a /etc/environment
- echo "PATH=$PATH:$JAVA_HOME/bin" | tee -a /etc/environment
- echo "CLASSPATH=.:$JAVA_HOME/lib" | tee -a /etc/environment
-fi
-
-#update environment
-source /etc/environment
-echo "jdk is installed !"
diff --git a/script/install-shell/installMaven.sh b/script/install-shell/installMaven.sh
deleted file mode 100644
index 1df33e728a17b2757893a796a47efe21f943036b..0000000000000000000000000000000000000000
--- a/script/install-shell/installMaven.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-mkdir /usr/local/maven
-cd /usr/local/maven
-
-wget http://mirror.bit.edu.cn/apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-
-tar -xvf apache-maven-3.2.5-bin.tar.gz
-
-#set environment
-export M2_HOME="/usr/local/maven/apache-maven-3.2.5"
-if ! grep "M2_HOME=/usr/local/maven/apache-maven-3.2.5" /etc/environment
-then
- echo "M2_HOME=/usr/local/maven/apache-maven-3.2.5" |tee -a /etc/environment
- echo "PATH=$PATH:$M2_HOME/bin" | tee -a /etc/environment
-fi
-
-#update environment
-source /etc/environment
-echo "maven is installed !"
diff --git a/script/install-shell/installMySql.sh b/script/install-shell/installMySql.sh
deleted file mode 100644
index 4c7928afdf4855ef94e0c4482064874cd96feaff..0000000000000000000000000000000000000000
--- a/script/install-shell/installMySql.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-yum -y install mysql-server
-/etc/rc.d/init.d/mysqld restart
-/usr/bin/mysqladmin -u root password '123456'
-#chmod -R 777 /etc/mysql/my.cnf
-cp /usr/share/mysql/my-medium.cnf /etc/my.cnf
-
-echo "
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - '/etc/mysql/my.cnf' to set global options,
-# - '~/.my.cnf' to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain '#' chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-default-character-set=utf8
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# * Basic Settings
-#
-user = mysql
-pid-file = /var/run/mysqld/mysqld.pid
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-collation-server=utf8_general_ci
-tmpdir = /tmp
-lc-messages-dir = /usr/share/mysql
-skip-external-locking
-character-set-server=utf8
-collation-server=utf8_general_ci
-
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address = 127.0.0.1
-#
-# * Fine Tuning
-#
-key_buffer = 16M
-max_allowed_packet = 16M
-thread_stack = 192K
-thread_cache_size = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# * Query Cache Configuration
-#
-query_cache_limit = 1M
-query_cache_size = 16M
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-#
-# Error log - should be very few entries.
-#
-log_error = /var/log/mysql/error.log
-#
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/log/mysql/mysql-bin.log
-expire_logs_days = 10
-max_binlog_size = 100M
-#binlog_do_db = include_database_name
-#binlog_ignore_db = inetc/mysql/my.cnfclude_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI 'tinyca'.
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer = 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
-" > /etc/my.cnf
-
-
-
-
-
-
diff --git a/script/install-shell/installTomcat.sh b/script/install-shell/installTomcat.sh
deleted file mode 100644
index e4b5ea9708e82150631d07f12ee808947342b637..0000000000000000000000000000000000000000
--- a/script/install-shell/installTomcat.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#install tomcat
-
-mkdir /usr/local/tomcat
-cd /usr/local/tomcat
-wget http://mirrors.cnnic.cn/apache/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.tar.gz
-tar -xvf apache-tomcat-7.0.57.tar.gz
-#startup
-#nohup ./apache-tomcat-7.0.57/bin/startup.sh
diff --git a/script/install-shell/readMe.txt b/script/install-shell/readMe.txt
deleted file mode 100644
index 116cddb16d3e184153136062e1b594bb84b11dce..0000000000000000000000000000000000000000
--- a/script/install-shell/readMe.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-1нűļƵûļ£/home/username/
-2նˣ룺
-#su
-#adduser cat
-½catûcatû
-
-3նˣ룺
-#su
-#룺****˴뵱ǰû
-#./installAll.sh
\ No newline at end of file
diff --git a/script/install-shell/startCat.sh b/script/install-shell/startCat.sh
deleted file mode 100644
index 361bd8d7b83381edad3412671d90b2f437af514c..0000000000000000000000000000000000000000
--- a/script/install-shell/startCat.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-mv cat/cat-home/target/cat-alpha-1.2.2.war /usr/local/tomcat/apache-tomcat-7.0.57/webapps/cat.war
-chown cat:cat /usr/local/tomcat/
-su cat
-nohup /usr/local/tomcat/apache-tomcat-7.0.57/bin/startup.sh
-
diff --git a/script/server.xml b/script/server.xml
deleted file mode 100644
index 852a6aa11b35d61f6e18fad88209d6b57bd30f0d..0000000000000000000000000000000000000000
--- a/script/server.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 127.0.0.1:2281
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file