diff --git a/README.md b/README.md index 2799a379..8f7a7fd1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -### CacheCloud团队于2017年3月出版实体书《Redis开发与运维》，[更多详情请见](#cc10) +### CacheCloud团队写作《Redis开发与运维》实体书，[详情见](#cc10) -## 目录  (具体细节[wiki文档](https://github.com/sohutv/cachecloud/wiki "Cachecloud Wiki")、[博客](http://cachecloud.github.io/ "Cachecloud page")、[相关交流群（微信、QQ）](#cc11)) +## 目录  (具体细节[wiki文档](https://github.com/sohutv/cachecloud/wiki "Cachecloud Wiki")、[博客](http://cachecloud.github.io/ "Cachecloud page")、[相关交流群](#cc11)) * [一、CacheCloud是做什么的](#cc1) * [二、CacheCloud提供哪些功能](#cc2) * [三、CacheCloud解决什么问题](#cc3) @@ -13,9 +13,8 @@ * [3.开发计划](#cc7) * [4.已存在Redis接入CacheCloud](#cc7) * [5.迁移工具](#cc7) -* [八、CacheCloud开发计划TODO LIST](#cc8) -* [九、CacheCloud已知用户](#cc9) -* [十、Redis开发与运维图书](#cc10) +* [八、CacheCloud已知用户](#cc8) +* [九、Redis开发与运维图书](#cc9) @@ -115,26 +114,20 @@ -## 八、开发计划-TODO LIST - -[后期开发计划](http://cachecloud.github.io/2016/04/17/v2%E8%AE%A1%E5%88%92/) - - - -## 九、已知用户 +## 八、已知用户 ![](http://i0.itc.cn/20170315/3084_f3e50a44_c732_9ac2_e117_90759d8e406b_1.png)        除此之外，还有天津联怡科技有限公司、瑞友科技、厦门美好出行物联网技术有限公司、北京九瑞网络科技有限公司、深圳市深软信息技术有限公司、欧乐在线科技有限公司、慧科教育、上海仁画信息股份有限公司等。 - + -## 十、图书 +## 九、图书 由CacheCloud团队撰写的实体书《Redis开发与运维》(机械工业出版)已在各大网店售卖，本书包含了CacheCloud团队在Redis规模化开发运维大量经验，以及Cachecloud更为系统的介绍，[目录介绍和购买地址](https://cachecloud.github.io/2016/10/24/Redis3%E5%BC%80%E5%8F%91%E8%BF%90%E7%BB%B4%E6%9C%80%E4%BD%B3%E5%AE%9E%E8%B7%B5-%E7%9B%AE%E5%BD%95/)，欢迎大家指教和购买。 ### 相关样章 -1.[Redis架构之防雪崩设计：网站不宕机背后的兵法](https://mp.weixin.qq.com/s/TBCEwLVAXdsTszRVpXhVug) +1.[Redis架构之防雪崩设计](https://mp.weixin.qq.com/s/TBCEwLVAXdsTszRVpXhVug) 2.[Redis的内存优化](https://cachecloud.github.io/2017/02/16/Redis%E5%86%85%E5%AD%98%E4%BC%98%E5%8C%96/) diff --git a/cachecloud-open-client/cachecloud-open-client-redis/pom.xml b/cachecloud-open-client/cachecloud-open-client-redis/pom.xml index 4906e010..4329a263 100644 --- a/cachecloud-open-client/cachecloud-open-client-redis/pom.xml +++ b/cachecloud-open-client/cachecloud-open-client-redis/pom.xml @@ -38,41 +38,6 @@ - - - leifu - leifu@sohu-inc.com - sohu-tv - - developer - - - - yongfeigao - yongfeigao@sohu-inc.com - sohu-tv - - developer - - - - haibogu - haibogu@sohu-inc.com - sohu-tv - - developer - - - - yijunzhang - yijunzhang@sohu-inc.com - sohu-tv - - developer - - - - diff --git a/cachecloud-open-common/src/main/java/com/sohu/cache/util/ConstUtils.java b/cachecloud-open-common/src/main/java/com/sohu/cache/util/ConstUtils.java index e8c7257b..3d17a17c 100644 --- a/cachecloud-open-common/src/main/java/com/sohu/cache/util/ConstUtils.java +++ b/cachecloud-open-common/src/main/java/com/sohu/cache/util/ConstUtils.java @@ -148,7 +148,7 @@ public class ConstUtils { /** * 报警相关 */ - public static String DEFAULT_EMAILS = "xx@sohu.com,yy@qq.com"; + public static String DEFAULT_EMAILS = "xx@xx.com,yy@qq.com"; public static String EMAILS = DEFAULT_EMAILS; public static String DEFAULT_PHONES = "13812345678,13787654321"; diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/alert/strategy/MasterSlaveOffsetAlertStrategy.java b/cachecloud-open-web/src/main/java/com/sohu/cache/alert/strategy/MasterSlaveOffsetAlertStrategy.java index e8013731..5d3c8618 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/alert/strategy/MasterSlaveOffsetAlertStrategy.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/alert/strategy/MasterSlaveOffsetAlertStrategy.java @@ -22,8 +22,8 @@ public class MasterSlaveOffsetAlertStrategy extends AlertConfigStrategy { /** * 格式： * connected_slaves:2 - * slave0:ip=10.10.76.151,port=6380,state=online,offset=33119690469561,lag=1 - * slave1:ip=10.10.76.160,port=6380,state=online,offset=33119690513578,lag=0 + * slave0:ip=127.0.0.1,port=6380,state=online,offset=33119690469561,lag=1 + * slave1:ip=127.0.0.1,port=6380,state=online,offset=33119690513578,lag=0 * master_repl_offset:33119653194425 */ @Override diff --git a/cachecloud-open-web/src/test/java/com/sohu/cache/dao/MachineDaoTest.java b/cachecloud-open-web/src/test/java/com/sohu/cache/dao/MachineDaoTest.java index f1bc05b0..c8f0e87f 100644 --- a/cachecloud-open-web/src/test/java/com/sohu/cache/dao/MachineDaoTest.java +++ b/cachecloud-open-web/src/test/java/com/sohu/cache/dao/MachineDaoTest.java @@ -26,7 +26,7 @@ public void testSaveMachine() throws Exception { MachineInfo machineInfo = new MachineInfo(); machineInfo.setCpu(16); - machineInfo.setIp("10.10.53.181"); + machineInfo.setIp("127.0.0.1"); machineInfo.setMem(96); machineInfo.setModifyTime(new Date()); machineInfo.setRealIp(""); diff --git a/cachecloud-open-web/src/test/java/com/sohu/cache/stats/app/ImportAppCenterTest.java b/cachecloud-open-web/src/test/java/com/sohu/cache/stats/app/ImportAppCenterTest.java index eb7f930a..8f36d0f2 100644 --- a/cachecloud-open-web/src/test/java/com/sohu/cache/stats/app/ImportAppCenterTest.java +++ b/cachecloud-open-web/src/test/java/com/sohu/cache/stats/app/ImportAppCenterTest.java @@ -41,11 +41,11 @@ public void testImport() { // 实例信息 String appInstanceInfo = - "10.10.53.159:7000:512\n" + - "10.10.53.159:7001:512\n" + - "10.10.53.159:26379:mymaster\n" + - "10.10.53.159:26380:mymaster\n" + - "10.10.53.159:26381:mymaster"; + "127.0.0.1:7000:512\n" + + "127.0.0.1:7001:512\n" + + "127.0.0.1:26379:mymaster\n" + + "127.0.0.1:26380:mymaster\n" + + "127.0.0.1:26381:mymaster"; boolean result = importAppCenter.importAppAndInstance(appDesc, appInstanceInfo); logger.info("result: {}", result); } @@ -87,7 +87,7 @@ public void testCheckWrongFormatAppInstanceInfo2() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu2"); // 实例信息 - String appInstanceInfo = "\n10.10.53.159:6379:1024"; + String appInstanceInfo = "\n127.0.0.1:6379:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -101,7 +101,7 @@ public void testCheckWrongFormatAppInstanceInfo3() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu3"); // 实例信息 - String appInstanceInfo = "10.10.53.159:6379"; + String appInstanceInfo = "127.0.0.1:6379"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -115,7 +115,7 @@ public void testCheckWrongFormatAppInstanceInfo4() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu4"); // 实例信息 - String appInstanceInfo = "10.10.10.10:6379:1024"; + String appInstanceInfo = "127.0.0.1:6379:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -129,7 +129,7 @@ public void testCheckWrongFormatAppInstanceInfo5() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu5"); // 实例信息 - String appInstanceInfo = "10.10.53.162:ab:1024"; + String appInstanceInfo = "127.0.0.1:ab:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -143,7 +143,7 @@ public void testCheckExistInstanceInfo() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu6"); // 实例信息 - String appInstanceInfo = "10.10.53.162:6379:1024"; + String appInstanceInfo = "127.0.0.1:6379:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -157,7 +157,7 @@ public void testCheckNotRunInstance() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu7"); // 实例信息 - String appInstanceInfo = "10.10.53.162:6399:1024"; + String appInstanceInfo = "127.0.0.1:6399:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -171,7 +171,7 @@ public void testCheckWrongMaxMemory() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu8"); // 实例信息 - String appInstanceInfo = "10.10.53.159:6379:aa"; + String appInstanceInfo = "127.0.0.1:6379:aa"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -184,7 +184,7 @@ public void testCheckDataNode() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu9"); // 实例信息 - String appInstanceInfo = "10.10.53.159:6379:1024"; + String appInstanceInfo = "127.0.0.1:6379:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -198,7 +198,7 @@ public void testCheckSentinelNodeMasterName() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu10"); // 实例信息 - String appInstanceInfo = "10.10.53.159:26379:1024"; + String appInstanceInfo = "127.0.0.1:26379:1024"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -212,7 +212,7 @@ public void testCheckSentinelNode() { AppDesc appDesc = new AppDesc(); appDesc.setName("carlosfu11"); // 实例信息 - String appInstanceInfo = "10.10.53.159:26379:mymaster"; + String appInstanceInfo = "127.0.0.1:26379:mymaster"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -227,11 +227,11 @@ public void testCheckSentinelAllNodes() { appDesc.setName("carlosfu12"); // 实例信息 String appInstanceInfo = - "10.10.53.159:7000:512\n" + - "10.10.53.159:7001:512\n" + - "10.10.53.159:26379:mymaster\n" + - "10.10.53.159:26380:mymaster\n" + - "10.10.53.159:26381:mymaster"; + "127.0.0.1:7000:512\n" + + "127.0.0.1:7001:512\n" + + "127.0.0.1:26379:mymaster\n" + + "127.0.0.1:26380:mymaster\n" + + "127.0.0.1:26381:mymaster"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } @@ -243,12 +243,12 @@ public void testCheckClusterNodes() { appDesc.setName("carlosfu13"); // 实例信息 String appInstanceInfo = - "10.10.53.159:8000:512\n" + - "10.10.53.159:8001:512\n" + - "10.10.53.159:8002:512\n" + - "10.10.53.159:8003:512\n" + - "10.10.53.159:8004:512\n" + - "10.10.53.159:8005:512\n"; + "127.0.0.1:8000:512\n" + + "127.0.0.1:8001:512\n" + + "127.0.0.1:8002:512\n" + + "127.0.0.1:8003:512\n" + + "127.0.0.1:8004:512\n" + + "127.0.0.1:8005:512\n"; ImportAppResult importAppResult = importAppCenter.check(appDesc, appInstanceInfo); logger.info("importAppResult: {}", importAppResult); } diff --git a/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppClientReportDataSizeDaoTest.java b/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppClientReportDataSizeDaoTest.java index 0b03442f..202bcf18 100644 --- a/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppClientReportDataSizeDaoTest.java +++ b/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppClientReportDataSizeDaoTest.java @@ -24,7 +24,7 @@ public class AppClientReportDataSizeDaoTest extends BaseTest { @Test public void testSave() { AppClientDataSizeStat stat = new AppClientDataSizeStat(); - stat.setClientIp("10.7.40.201"); + stat.setClientIp("127.0.0.1"); stat.setReportTime(new Date()); stat.setCollectTime(20150120135000L); stat.setCreateTime(new Date()); diff --git a/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppDataMigrateStatusDaoTest.java b/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppDataMigrateStatusDaoTest.java index d58c344e..83ccef74 100644 --- a/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppDataMigrateStatusDaoTest.java +++ b/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppDataMigrateStatusDaoTest.java @@ -28,17 +28,17 @@ public class AppDataMigrateStatusDaoTest extends BaseTest { public void testSave() { AppDataMigrateStatus appDataMigrateStatus = new AppDataMigrateStatus(); appDataMigrateStatus.setEndTime(new Date()); - appDataMigrateStatus.setMigrateMachineIp("10.10.53.159"); + appDataMigrateStatus.setMigrateMachineIp("127.0.0.1"); appDataMigrateStatus.setMigrateMachinePort(8888); appDataMigrateStatus.setStartTime(new Date()); appDataMigrateStatus.setStatus(1); appDataMigrateStatus.setUserId(10244); appDataMigrateStatus.setSourceAppId(10023); appDataMigrateStatus.setSourceMigrateType(1); - appDataMigrateStatus.setSourceServers("10.10.53.159:6379"); + appDataMigrateStatus.setSourceServers("127.0.0.1:6379"); appDataMigrateStatus.setTargetAppId(0); appDataMigrateStatus.setTargetMigrateType(2); - appDataMigrateStatus.setTargetServers("10.10.52.136:6385"); + appDataMigrateStatus.setTargetServers("127.0.0.1:6385"); appDataMigrateStatus.setLogPath("/opt/redis-migrate-tool/rmt-20160609144601.log"); appDataMigrateStatus.setConfigPath("/opt/redis-migrate-tool/rmt-20160609144601.conf"); appDataMigrateStatusDao.save(appDataMigrateStatus); diff --git a/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppUserDaoTest.java b/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppUserDaoTest.java index 39e910c6..37821be9 100644 --- a/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppUserDaoTest.java +++ b/cachecloud-open-web/src/test/java/com/sohu/test/dao/AppUserDaoTest.java @@ -16,14 +16,4 @@ public class AppUserDaoTest extends BaseTest{ @Resource private AppUserDao appUserDao; - - @Test - public void testAppDao() { - AppUser appUser = AppUser.buildFrom(null, "11", "fff", "leifu@sohu-inc.com", "13820794024", -1); - appUserDao.save(appUser); - logger.info("{}", appUser); - } - - - } diff --git a/pom.xml b/pom.xml index 93932931..8101b1d2 100644 --- a/pom.xml +++ b/pom.xml @@ -16,18 +16,18 @@ UTF-8 4.2.4.RELEASE - 2.2.1 + 2.3.2 1.1.1 - 5.1.29 - 4.11 + 8.0.16 + 4.13.1 3.1 9.2.3.v20140905 1.2.3 3.2.8 2.8.0 - 2.9.10.1 - 4.3.2 - 4.0 + 2.9.10.5 + 4.3.6 + 4.1 3.1 1.7 2.4 @@ -36,7 +36,7 @@ build210 3.2.1 2.4 - 15.0 + 24.1.1-jre 2.3 2.2.1 1.7.6 @@ -44,7 +44,7 @@ 1.7 2.0 2.1.0-SNAPSHOT - 1.2.28 + 1.2.70 2.8.1 2.2.1 2.6 @@ -143,7 +143,7 @@ commons-collections4 ${apache.commons.collections} - + commons-io commons-io @@ -155,13 +155,13 @@ guava ${guava.version} - + commons-lang commons-lang ${commons-lang.version} - + net.sf.json-lib json-lib @@ -201,40 +201,10 @@ fastjson ${fastjson.version} - + - - - - yijunzhang - yijunzhang@sohu-inc.com - sohu-tv - - developer - - - - - leifu - leifu@sohu-inc.com - sohu-tv - - developer - - - - - lingguo - lingguo@sohu-inc.com - sohu-tv - - developer - - - - @@ -285,13 +255,13 @@ - + org.apache.maven.plugins maven-deploy-plugin ${maven.deloy.plugin} - + org.apache.maven.plugins maven-source-plugin @@ -308,7 +278,7 @@ - + org.apache.maven.plugins maven-resources-plugin @@ -317,15 +287,15 @@ UTF-8 - + - + central - http://repo1.maven.org/maven2 + https://repo1.maven.org/maven2 false @@ -333,7 +303,7 @@ com.springsource.repository.maven.release - http://repo.springsource.org/release/ + https://repo.springsource.org/release/ false @@ -341,7 +311,7 @@ nexus local private nexus - http://maven.oschina.net/content/groups/public/ + https://maven.oschina.net/content/groups/public/ true @@ -350,7 +320,7 @@ - - + + - \ No newline at end of file + diff --git a/script/cachecloud.sql b/script/cachecloud.sql index 798dcc80..4031015b 100644 --- a/script/cachecloud.sql +++ b/script/cachecloud.sql @@ -1,6 +1,6 @@ -- MySQL dump 10.13 Distrib 5.5.16, for Linux (x86_64) -- --- Host: 10.10.19.167 Database: cache-cloud +-- Host: 127.0.0.1 Database: cache-cloud -- ------------------------------------------------------ -- Server version 5.5.34-32.0-log @@ -866,7 +866,7 @@ insert into system_config(config_key,config_value,info,status,order_id) values(' insert into system_config(config_key,config_value,info,status,order_id) values('machine.mem.alert.ratio','80.0','机器内存报警阀值',1,10); insert into system_config(config_key,config_value,info,status,order_id) values('machine.load.alert.ratio','8.0','机器负载报警阀值',1,11); insert into system_config(config_key,config_value,info,status,order_id) values('cachecloud.documentUrl','http://cachecloud.github.io','文档地址',1,12); -insert into system_config(config_key,config_value,info,status,order_id) values('cachecloud.owner.email','xx@sohu.com,yy@qq.com','邮件报警(逗号隔开)',1,13); +insert into system_config(config_key,config_value,info,status,order_id) values('cachecloud.owner.email','xx@xx.com,yy@qq.com','邮件报警(逗号隔开)',1,13); insert into system_config(config_key,config_value,info,status,order_id) values('cachecloud.owner.phone','13812345678,13787654321','手机号报警(逗号隔开)',1,14); insert into system_config(config_key,config_value,info,status,order_id) values('cachecloud.mavenWareHouse','http://your_maven_house','maven仓库地址(客户端)',1,15); insert into system_config(config_key,config_value,info,status,order_id) values('cachecloud.contact','user1:(xx@zz.com, user1:135xxxxxxxx)
user2: (user2@zz.com, user2:138xxxxxxxx)','值班联系人信息',1,16); @@ -911,7 +911,7 @@ CREATE TABLE `app_data_migrate_status` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='迁移状态'; -insert into app_user(name,ch_name,email,mobile,type) values('admin','admin','admin@sohu-inc.com','13500000000',0); +insert into app_user(name,ch_name,email,mobile,type) values('admin','admin','admin@xxx.com','13500000000',0); DROP TABLE IF EXISTS `instance_config`; CREATE TABLE `instance_config` (