Merge pull request #96 from jysperm/fetch-appkey

重构 AV 对象初始化、查询并记录 appKey、运行时向程序发送 appKey

bin/avoscloud

@@ -117,7 +117,6 @@ if(CMD) {
       break;
 
     case "upload":
-      run.initAVOSCloudSDK();
       run.logProjectHome();
       if (!program.args[1]) {
         console.log("请使用：avoscloud upload <文件或目录>");
@@ -223,14 +222,14 @@ if(CMD) {
         console.log('[INFO] 因为文件变更而项目重启：', files);
     });
     if (runtimeInfo.runtime != 'cloudcode') {
-      run.initMasterKey(function(masterKey) {
+      run.initAVOSCloudSDK(function(AV) {
         var app = run.getAppSync();
         var testServerPort = parseInt(run.getPort()) + 1;
         testServer.set('leanenginePort', run.getPort());
         testServer.set('port', testServerPort);
         testServer.set('appId', app.appId);
-        testServer.set('appKey', masterKey);
-        testServer.set('masterKey', masterKey);
+        testServer.set('appKey', AV.applicationKey);
+        testServer.set('masterKey', AV.masterKey);
         console.log(color.green('提示：您可以使用 http://localhost:' + testServerPort + ' 测试 Cloud 函数'));
         testServer.listen(testServerPort);
       });

bin/cloudcodeRun.js

@@ -1,6 +1,6 @@
+'use strict';
 var fs = require('fs');
 var path = require('path');
-var AV = require('avoscloud-sdk').AV;
 var run = require('./run');
 var commander = require('./commander');
 var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
@@ -15,7 +15,7 @@ if (!CLOUD_PATH.match(/.*\/$/)) {
 }
 
 run.logProjectHome();
-run.initAVOSCloudSDK(function(masterKey) {
+run.initAVOSCloudSDK(function(AV) {
     require(lib + '/mock').run(CLOUD_PATH, AV, run.getPort());
     console.log("请使用浏览器打开 http://localhost:" + run.getPort() + "/avos");
 });