Skip to content
This repository has been archived by the owner on Dec 20, 2017. It is now read-only.

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

Merged
merged 7 commits into from
Oct 22, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77714d1
记录 appKey, 移动 .avoscloud_keys 到 .leancloud/app_keys, 新建项目时自动设置 appId
jysperm Oct 14, 2015
aa04b8f
运行时向程序发送真正的 appKey #562
jysperm Oct 14, 2015
9efa321
设置 .leancloud 的权限为 700, clear 命令也会删除新路径的 key 文件
jysperm Oct 15, 2015
5c1b69b
设置 .leancloud 的权限为 700, clear 命令也会删除新路径的 key 文件
jysperm Oct 15, 2015
79c2b6f
重构初始化 AV 对象的代码
sdjcw Oct 19, 2015
cfdbb1a
Merge branch 'zwang' into fetch-appkey
jysperm Oct 19, 2015
2a68c93
deleteMasterKeys 应当逐个删除 appKey 文件（第一个文件不存在也应当继续删除第二个）
jysperm Oct 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions bin/avoscloud
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ if(CMD) {
break;

case "upload":
run.initAVOSCloudSDK();
run.logProjectHome();
if (!program.args[1]) {
console.log("请使用：avoscloud upload <文件或目录>");
Expand Down Expand Up @@ -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);
});
Expand Down
4 changes: 2 additions & 2 deletions bin/cloudcodeRun.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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");
});
Loading