fix config

Author: lisong

README.md

@@ -17,6 +17,9 @@ $ npm install
 $ vim config/config.json
 ```
 
+read [config.md](https://github.com/lisong/code-push-server/blob/master/docs/config.md)
+
+
 ## Storage mode [local/qiniu]
 
 ## RUN
@@ -31,6 +34,8 @@ or point config file and ENV
 $ CONFIG_FILE=/path/to/config.json NODE_ENV=production node ./bin/www
 ```
 
+notice. you have to change `loginSecret` in config
+
 ## Default listen Host/Port  127.0.0.1/3000 
 you can change like this.
 
@@ -100,6 +105,21 @@ $ vim /path/to/production/process.yml #configure your env.
 $ pm2 start /path/to/production/process.yml
 ```
 
+## Use [CodePush Web](https://github.com/lisong/code-push-web) manage apps
+
+add codePushWebUrl config in ./config/config.json
+
+eg.
+
+```json
+...
+"common": {
+    "loginSecret": "CodePushServer",
+    "codePushWebUrl": "Your CodePush Web address",
+}
+...
+```
+
 ## License
 MIT License [read](https://github.com/lisong/code-push-server/blob/master/LICENSE)
 

config/config.json

@@ -19,9 +19,10 @@
     },
     "common": {
       "loginSecret": "CodePushServer",
+      "codePushWebUrl": "",
       "diffNums": 3,
       "dataDir": "",
-      "storageType": "qiniu"
+      "storageType": "local",
     }
   },
   "production": {
@@ -44,9 +45,10 @@
     },
     "common": {
       "loginSecret": "CodePushServer",
+      "codePushWebUrl": "",
       "diffNums": 3,
       "dataDir": "",
-      "storageType": "qiniu"
+      "storageType": "local"
     }
   }
 }

docs/config.md

@@ -0,0 +1,39 @@
+# Config 解析
+
+```json
+{
+  "development": {
+    ＃数据库配置
+    "db": {
+      "username": "root",  
+      "password": null,
+      "database": "codepush",
+      "host": "127.0.0.1",
+      "dialect": "mysql" ＃目前只支持mysql
+    },
+    ＃七牛云存储配置 当storageType为qiniu时需要配置
+    "qiniu": {
+      "accessKey": "",
+      "secretKey": "",
+      "bucketName": "",
+      "downloadUrl": "" #文件下载域名地址
+    },
+    #文件存储在本地配置 当storageType为local时需要配置
+    "local": {
+      "storageDir": "/Users/tablee/workspaces/storage", ＃文件存储目录
+      ＃文件下载地址 CodePush Server 地址 + '/download' download对应app.js里面的地址
+      "downloadUrl": "http://localhost:3000/download"  
+    },
+    "common": {
+      "loginSecret": "CodePushServer", ＃登录jwt签名密钥，必须更改，否则有安全隐患，可以随机生成字符串
+      "codePushWebUrl": "", ＃CodePush Web部署地址，也可以配置成CodePush登录地址
+      "diffNums": 3, #差异化更新版本生成数目 默认为3
+      "dataDir": "", ＃数据目录，优化选项
+      "storageType": "local", #选择存储类型，目前支持local和qiniu配置
+    }
+  },
+  "production": {
+    # 生产环境 和 development类似
+  }
+}
+```

routes/auth.js

@@ -5,7 +5,20 @@ var security = require('../core/utils/security');
 var accountManager = require('../core/services/account-manager')();
 
 router.get('/login', function(req, res, next) {
-  res.render('auth/login', { title: 'CodePushServer' });
+  var config = require('../core/config');
+  var codePushWebUrl = _.get(config, 'common.codePushWebUrl');
+  var isRedirect = false;
+  if (codePushWebUrl) {
+    var validator = require('validator');
+    if (validator.isUrl(codePushWebUrl)){
+      isRedirect = true;
+    }
+  }
+  if (isRedirect) {
+    res.redirect(codePushWebUrl);
+  } else {
+    res.render('auth/login', { title: 'CodePushServer' });
+  }
 });
 
 router.post('/logout', function (req, res, next) {