Skip to content
This repository was archived by the owner on Dec 30, 2018. It is now read-only.

Commit f597b8c

Browse files
committed
update for config, fix a bug in user api
1 parent bdc9ab2 commit f597b8c

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

api/user.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ function convertUsers(UidArray, mode) {
8585
return then(function (cont) {
8686
var result = [];
8787
UidArray = toArray(UidArray);
88+
removeItem(UidArray, null);
8889
if (mode === 'Uid') {
8990
each(UidArray, function (x) {
9091
result.push(convertUserID(x));

app.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ var fs = require('fs'),
88
http = require('http'),
99
domain = require('domain'),
1010
serverDm = domain.create(),
11-
processPath = path.dirname(process.argv[1]);
11+
processPath = path.dirname(process.argv[1]),
12+
conf = require('./config/config'); // 注册rrestjs配置文件
1213

1314
global.jsGen = {}; // 注册全局变量jsGen
14-
module.exports.conf = require('./config/config'); // 注册rrestjs配置文件
15+
16+
if (process.env.NODE_ENV) conf.staticFolder = '/static/' + process.env.NODE_ENV;
17+
module.exports.conf = conf;
1518

1619
serverDm.on('error', function (error) {
1720
delete error.domain;

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsGen",
3-
"version": "0.8.0",
3+
"version": "0.8.1",
44
"main": "index.html",
55
"dependencies": {
66
"angular": ">=1.2.0",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"url": "http://weibo.com/zensh"
66
},
77
"name": "jsgen",
8-
"version": "0.8.0",
8+
"version": "0.8.1",
99
"cdnHost": "http://cdn.angularjs.cn",
1010
"description": "",
1111
"keywords": [

static/dist/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="description" content="{{global.metadesc}}">
1010
<meta name="keywords" content="{{global.keywords}}">
1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
12-
<link rel="shortcut icon" href="/static/favicon.ico?v0.8.0"/>
12+
<link rel="shortcut icon" href="/static/favicon.ico?v0.8.1"/>
1313
<!-- build:css ../cdn/css/app.css -->
1414
<link rel="stylesheet" href="/static/css/app.css">
1515
<!-- endbuild -->
@@ -27,6 +27,7 @@
2727
<li><a href="/tag/AngularJS">AngularJS</a></li>
2828
<li><a href="/tag/Node.js">Node.js</a></li>
2929
<li><a href="/tag/jsGen">jsGen</a></li>
30+
<li><a href="http://docs.angularjs.cn" target="_blank">ngDocs</a></li>
3031
</ul>
3132
<ul class="right user" ng-if="!global.isLogin">
3233
<li><a href="/register"><i class="fa fa-user-md"></i>注册</a></li>

static/src/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<li><a href="/tag/AngularJS">AngularJS</a></li>
2828
<li><a href="/tag/Node.js">Node.js</a></li>
2929
<li><a href="/tag/jsGen">jsGen</a></li>
30+
<li><a href="http://docs.angularjs.cn" target="_blank">ngDocs</a></li>
3031
</ul>
3132
<ul class="right user" ng-if="!global.isLogin">
3233
<li><a href="/register"><i class="fa fa-user-md"></i>注册</a></li>

0 commit comments

Comments
 (0)