feat: suppurt redis cluster, closes #11 (#12)

Author: PowerDos

.travis.yml

@@ -1,18 +1,27 @@
-sudo: false
+sudo: required
 language: node_js
 services:
-- redis-server
+  - redis-server
 node_js:
-- '8'
+  - '8'
+
 install:
-- npm i npminstall && npminstall
+  - npm i npminstall && npminstall
+
 script:
-- npm run ci
+  - npm run ci
+
+before_script:
+  - chmod +x test/travis/redis_setup.sh
+  - test/travis/redis_setup.sh
+
 after_script:
-- npminstall codecov && codecov
+  - npminstall codecov && codecov
+
 env:
   global:
   # WECHAT_API_APP_ID
   - secure: V/eQAaNWHxx2rJ/pLxJgFqB1K1RuzaoxPmidwLuD2Bnmg1DLJbOjYv126st4qCXyJgntppzzT4CA6F1HeSLzMYgDQJ7uOcLo8c9dpAtKUc55ZSYjfLZTn70WADC4ZBPcRpStDvRW91wFtC+MoMrrol2+p71wA1n3Y3belBC8Ios2KPIEDmhovk0TlGVOkiYEvuLSPNXUrSUeeJx+8NXGYUihmdBX4deCXRPz08YhPEVoTx8KPMRSnplso56XFIDj/RBbJ/GcGWEiEa7cUc+MRd06YUAnuvWEtO8o41BWgcLMBDPqbbkgo3Vob0gCmrk28P78osR/8kRCiZ9gUAXjSYKZq94Yej0QGtNnOrhlddtVsiep2AtAa+trOY63cfTAdUeSDxJZbtO8/+p/dgH+Mk0Y6Qak9KKgUMfbTaOTwD2/bZpKRT32CULNa1R3NRpto2LUcQCtelqVCDT+xAIRQIXYUh4P1Mxy8bgqNXCUTF0VDcQN4Rw9J9ozztucnL720ddTJ8swHI7KmSjNQp+DjA9xWmXBwk8Tf+/bJbh0v0XPTxHJpiSdrCsEJCqoDuoFRdecfuwk3QQtSUnlaabClMnD6Gaxnu4VphSrrpsR+jzF6mtd1vet9FVqiCQKcJ0PbtrgCEHZJt92Df4ekmzjcT8BDRJtFTZmLbU39R1Bd8Y=
   # WECHAT_API_APP_SECRET
   - secure: L1zBUlb8TOwI4jgYKaGnMQ91cKFCpl5MPu0HTMP23CaxUgI4dVrTo0CWUUte6sGMJ8s3cXYb2N7HztF/TzlyPkmMURnIlAbgGrYeLucK48b1GxyLSACvCqVLlU9avS1c8YH6e6cBQCF/1lK4LsV4LIV7VCH4gyOJdSFAi6mNIVBdWAgALXtrJeWH0dN/XMaRz/Lngk1oI6fcm0R7bjTFo5bjoNovx+oDulPtHzQfQX8fuIIoK9UeibOgjsGr/bLiDmK5H3SWKa0I757NLD5XH36ven0CYdEOygtE49OspUbSEwcwF7Oki3bxydRNgft1A89AvXpf3qK/axkvDUb/mpjYiSyik9fdV8MPqAbYmLfDofvFv68SeudsDQ8Faip8kYezN33pL8GntTGst8WjmyXvYCTneKL/yXttyWEpINHm0uBHau1Q9ZTpr9Y00smGWzCX3/PKKhjuWIFQ3LbdXV0B2QcaBNbtf4LXkHc7Nj7JsgQbAWIWUfc49X5aC4DFg5y9bYBS6H0Ww5uqj3Wyfm8f6vpSZlThUBhSH2IykZXRMph30H9dnyTrOnM4h49WoJXwq3ajcuvChySBxrusDxhmDrkjJpWSYZzxlnyq4785EPh5URr8cUpjhg+XhoSCDw04B98KU79I4r3Mk+XkTMUgvpl8VeKQRbRoW7WZhyY=
+  - REDIS_INSTANCE=foo

README.md

@@ -56,6 +56,7 @@ exports.wechatApi = {
   package: 'egg-wechat-api',
 };
 ```
+> if redis is single client
 
 ```js
 // {app_root}/config/config.default.js
@@ -64,6 +65,16 @@ exports.wechatApi = {
   appSecret: '',
 };
 ```
+> if redis is multi clients
+
+```js
+// {app_root}/config/config.default.js
+exports.wechatApi = {
+  appId: '',
+  appSecret: '',
+  redisInstance: '', // select instance of redis
+};
+```
 
 > __Redis is required !__
 

config/config.default.js

@@ -14,4 +14,5 @@ exports.wechatApi = {
   // wechat
   appId: '',
   appSecret: '',
+  redisInstance: '',
 };

lib/wechat-api.js

@@ -5,8 +5,13 @@ const WechatApi = require('co-wechat-api');
 
 module.exports = app => {
 
-  const { redis } = app;
-  const { appId, appSecret } = app.config.wechatApi || {};
+  let redis = app.redis;
+  const { appId, appSecret, redisInstance } = app.config.wechatApi || {};
+
+  // select redis instance
+  if (redisInstance) {
+    redis = app.redis.get(redisInstance);
+  }
 
   // check key & secret
   assert(appId && appSecret,

test/fixtures/apps/wechat-api-test/app/router.js renamed to test/fixtures/apps/wechat-api-test-redis-multi-clients/app/router.js

@@ -0,0 +1,32 @@
+'use strict';
+
+exports.keys = '123456';
+
+exports.redis = {
+  clients: {
+    foo: {
+      port: 6379,
+      host: '127.0.0.1',
+      password: null,
+      db: 0,
+    },
+    bar: {
+      port: 6380,
+      host: '127.0.0.1',
+      password: null,
+      db: 1,
+    },
+  },
+};
+
+exports.wechatApi = {
+  default: {
+  },
+  app: true,
+  agent: false,
+
+  // wechat
+  appId: process.env.WECHAT_API_APP_ID,
+  appSecret: process.env.WECHAT_API_APP_SECRET,
+  redisInstance: process.env.REDIS_INSTANCE,
+};

test/fixtures/apps/wechat-api-test-redis-multi-clients/config/config.unittest.js

@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = app => {
+
+  app.get('/', function* () {
+    const { wechatApi } = app;
+
+    try {
+      const ticket = yield wechatApi.getTicket();
+      this.status = 200;
+      this.body = ticket;
+
+    } catch (error) {
+      this.status = 500;
+      this.body = error;
+    }
+  });
+};