两个修改 (#1886)

* fix: 修改评论插件处理时的并发量，确保不会超过 3 个

* feat: 评论插件增加 release 记录

每个数据中心在发布文档时都会在评论插件里增加一条 release 记录。
该记录关联本次发布的文档 id，用来感知当前那些文档和片段是有效的，
这样可以将过时的评论筛选出来移除掉。每个数据中心在构建时会增加
环境变量 `DOC_ENV`，通过这个区别不同数据中心的 release 记录。

Author: sdjcw

Diff for: Gruntfile.js

@@ -431,10 +431,9 @@ grunt.registerMultiTask('docmeta', '增加 Title、文档修改日期、设置
     var cheerio = require('cheerio');
     var crypto = require('crypto');
     var _ = require('underscore');
-    var AV = require('avoscloud-sdk').AV;
-    AV.initialize("749rqx18p5866h0ajv0etnq4kbadodokp9t0apusq98oedbb", "axxq0621v6pxkya9qm74lspo00ef2gq204m5egn7askjcbib");
-    // test project
-    //AV.initialize("0siycem2w0l2zem2z5crxl7602zkf1r2a8qsooigq2my1al1", "4ipiwns1939nw2cgist4s49li89dvadrlrgthfvqmgzcaax5");
+    var Promise = require('bluebird');
+    var AV = require('leancloud-storage');
+    AV.init({appId: "749rqx18p5866h0ajv0etnq4kbadodokp9t0apusq98oedbb", appKey: "axxq0621v6pxkya9qm74lspo00ef2gq204m5egn7askjcbib"});
     var Doc = AV.Object.extend('Doc');
     var Snippet = AV.Object.extend('Snippet');
     var commentDoms = ['p','pre'];
@@ -447,14 +446,13 @@ grunt.registerMultiTask('docmeta', '增加 Title、文档修改日期、设置
       var docVersion = crypto.createHash('md5').update($('#content').text()).digest('hex');
       // console.log(docVersion)
       $('html').first().attr('version', docVersion);
-
       //以 docversion 为唯一标识，当文档内容发生变化，docversion 相应变化，
       var query = new AV.Query(Doc);
       query.equalTo('version', docVersion);
       return query.first().then(function(doc) {
         if (doc) {
           // 如果 doc 已经存在，则直接返回
-          return AV.Promise.as();
+          return doc;
         }
         doc = new Doc();
         doc.set('version', docVersion);
@@ -472,7 +470,7 @@ grunt.registerMultiTask('docmeta', '增加 Title、文档修改日期、设置
         doc.set('file', file.split('/').pop());
         grunt.log.writeln('save new Doc: %s', file);
         return doc.save();
-      }).then(function() {
+      }).then(function(doc) {
         // 在文档中添加 version 标记
         commentDoms.forEach(function(dom) {
           $('#content ' + dom).each(function() {
@@ -484,52 +482,71 @@ grunt.registerMultiTask('docmeta', '增加 Title、文档修改日期、设置
           });
         });
         grunt.file.write(filepath, $.html());
-        return AV.Promise.as();
-      }).then(function() {
-        var promises = [];
+
         // 保存 snippet version 和 content 的关联
-        commentDoms.forEach(function(dom) {
-          $('#content ' + dom).each(function() {
-            var version = crypto.createHash('md5').update($(this).text()).digest('hex');
+        return Promise.each(commentDoms, function(dom) {
+          var promises = [];
+          $('#content ' + dom).each(function(i, elem) {
+            promises.push(Promise.resolve(elem))
+          })
+          return Promise.map(promises, function(elem) {
+            var version = crypto.createHash('md5').update($(elem).text()).digest('hex');
             if(_.contains(allSnippetsVersion, version)) {
               return;
             }
-            if($(this).text().trim().length === 0) {
+            if($(elem).text().trim().length === 0) {
               return;
             }
-            grunt.log.writeln('save new Snippet: %s', $(this).text().substr(0, 20) + '...');
-            promises.push(new Snippet().save({
+            grunt.log.writeln('save new Snippet: %s', $(elem).text().substr(0, 20) + '...');
+            return new Snippet().save({
               snippetVersion: version,
-              content: $(this).text(),
+              content: $(elem).text(),
               file: filepath.split('/').pop()
-            }));
-          });
+            });
+          }, {concurrency: 3});
+        }).then(function() {
+          return doc;
         });
-        return AV.Promise.all(promises);
       });
     }
     var self = this;
     // 查询所有已存在的 snippet version，
     // 用来判断哪些是新的 snippet，然后将其 version 和 content 添加到数据库
     var snippetsVersion = [];
-    var getSnippetsVersion = function(skip) {
-      return AV.Query.doCloudQuery('select snippetVersion from Snippet limit ?, ?', [skip, 1000]).then(function(result) {
-        if(result.results.length === 0) {
-          return AV.Promise.as();
+    var getSnippetsVersion = function(createdAt) {
+      return new AV.Query('Snippet')
+      .select('snippetVersion')
+      .greaterThan('createdAt', createdAt)
+      .limit(1000)
+      .ascending('createdAt')
+      .find()
+      .then(function(result) {
+        if(result.length === 0) {
+          return [];
         }
-        _.each(result.results, function(snippet) {
+        _.each(result, function(snippet) {
           snippetsVersion.push(snippet.get('snippetVersion'));
         });
-        return getSnippetsVersion(snippetsVersion.length);
+        return getSnippetsVersion(_.last(result).get('createdAt'));
       });
     };
-    getSnippetsVersion(0).then(function() {
+    var docEnv = process.env.DOC_ENV || 'default';
+    grunt.log.writeln('Doc ENV: ', docEnv);
+    getSnippetsVersion(new Date(0)).then(function() {
       grunt.log.writeln('current snippets count:', snippetsVersion.length);
-      var allPromise = [];
-      self.filesSrc.forEach(function(filepath) {
-        allPromise.push(initDocVersion(filepath, snippetsVersion));
-      });
-      return AV.Promise.all(allPromise);
+      return Promise.map(self.filesSrc, function(filepath) {
+        return initDocVersion(filepath, snippetsVersion);
+      }, {concurrency: 1})
+    }).then(function(docs) {
+      return new AV.Object('Release').save({
+        env: docEnv,
+      }).then(function(release) {
+        return AV.Object.saveAll(docs.map(function(doc) {
+          return new AV.Object('Release_Doc')
+          .set('release', release)
+          .set('doc', doc)
+        }))
+      })
     }).then(function() {
       //保证所有文档都处理完再进行任务完成回调
       grunt.log.writeln('version build allcompleted');

Diff for: fabfile.py

@@ -43,11 +43,11 @@ def _prepare_local_docs(target):
     ##local("ruby render.rb")
     local("npm install -d");
     if target == 'qcloud':
-      local("grunt build --theme=qcloud");
+      local("DOC_ENV=qcloud grunt build --theme=qcloud");
     elif target == 'us':
-      local("grunt build --theme=us --no-comments");
+      local("DOC_ENV=us grunt build --theme=us --no-comments");
     else:
-      local("grunt build ");
+      local("DOC_ENV=%s grunt build " % target);
 #    local("mkdir dist/api")
 #    local("cp -rfv api/* dist/api/");
 #    local("cd dist ; tar zcvf leancloud-docs.tar.gz ./* ; cd ..")

Diff for: md/README

@@ -23,8 +23,8 @@
     "assemble": "~0.4.33",
     "assemble-swig": "~0.1.0",
     "autoprefixer": "^6.3.4",
-    "avoscloud-sdk": "^1.0.0-rc3",
     "axios": "^0.15.3",
+    "bluebird": "^3.4.7",
     "body-parser": "^1.14.1",
     "cheerio": "^0.20.0",
     "coffee-script": "^1.10.0",
@@ -52,6 +52,7 @@
     "grunt-postcss": "^0.8.0",
     "grunt-usemin": "~3.1.1",
     "jit-grunt": "^0.10.0",
+    "leancloud-storage": "^2.1.2",
     "moment": "^2.10.6",
     "nunjucks": "^2.4.1",
     "serve-static": "^1.10.0",