Merge branch 'develop' into release/1.0

@@ -8,6 +8,7 @@ module.exports = app => {
 
     // 公共服务
     app.use('/partial', require('./apps/partial')); // 组件demo
+    app.use('/api', require('./doraemon/router')); // API
 
     // 业务模块
     app.use('/passport', require('./apps/passport'));
@@ -18,5 +19,4 @@ module.exports = app => {
     app.use('/editorial', require('./apps/editorial')); // 资讯
     app.use('/product', require('./apps/product'));
     app.use('/brand', require('./apps/brand')); // 品牌
-    app.use('/api', require('./doraemon/api')); // API
 };

-/**
- * router of sub app shopping
- * @author: jinhu.dong<jinhu.dong@yoho.cn>
- * @date: 2016/07/04
- */
-
-'use strict';
-
-const router = require('express').Router(); // eslint-disable-line
-
-const uploadApi = require('./upload/upload.js');
-
-router.post('/uploadImg', uploadApi.uploadImg);
-
-module.exports = router;

@@ -6,12 +6,13 @@
 
 'use strict';
 
-var request = require('request');
-var fs = require('fs');
+const request = require('request');
+const fs = require('fs');
 
-const getImgHost = function(url) {
-    let urlArr = url.split('/'),
-        domain = 'static.yhbimg.com/goodsimg',
+// 获取图片绝对地址
+const getImgHost = (url) => {
+    let domain = 'static.yhbimg.com/goodsimg',
+        urlArr = url.split('/'),
         num = urlArr[urlArr.length - 1].substr(1, 1),
         url1 = domain + url;
 
@@ -22,27 +23,24 @@ const getImgHost = function(url) {
     }
 };
 
+// 上传图片
 const uploadImg = (req, res) => {
-    let files, fileIndex;
-    let imgs, datas;
-    let flag;
     let i = 0;
+    let files;
+    let imgs, datas;
 
     if (req.user.uid) {
         files = [req.files.filename];
 
-        // 判断是单张传还是多张传
-        flag = Object.prototype.toString.call(files) === '[object Array]';
-
         // 如果是单张，则数组化
-        if (!flag) {
+        if (Object.prototype.toString.call(files) !== '[object Array]') {
             files = [req.files.filename];
         }
 
         req.body.files = [];
         req.body.fileNames = [];
 
-        for (fileIndex = 0; fileIndex < files.length; fileIndex++) {
+        for (let fileIndex = 0; fileIndex < files.length; fileIndex++) {
             req.body.files[fileIndex] = fs.createReadStream(files[fileIndex].path);
             req.body.fileNames[fileIndex] = files[fileIndex].name;
         }

 /**
- * sub app shopping
- * @author: jinhu.dong<jinhu.dong@yoho.cn>
- * @date: 2016/07/04
+ * sub app partial
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2016/06/30
  */
 
 var express = require('express');
 var app = express();
 
-app.on('mount', function(parent) {
-    delete parent.locals.settings; // 不继承父 App 的设置
-    Object.assign(app.locals, parent.locals);
-});
-
 // router
 app.use(require('./router'));
 

@@ -7,11 +7,8 @@
 'use strict';
 
 const router = require('express').Router(); // eslint-disable-line
-const cRoot = './controllers';
-
-const apiCtrl = require(`${cRoot}/api`);
-
-router.post('/uploadImg', apiCtrl.uploadImg);
+const uploadApi = require('./api/upload');
 
+router.post('/uploadImg', uploadApi.uploadImg);
 
 module.exports = router;