Skip to content

Commit

Permalink
Merge pull request #3 from xingbofeng/dev
Browse files Browse the repository at this point in the history
fix: 生产环境404 bug,增加apikey,本地运行生产环境代码bug
  • Loading branch information
Encounter authored May 8, 2017
2 parents f745104 + d7793fb commit a62be4e
Show file tree
Hide file tree
Showing 27 changed files with 5,992 additions and 5,196 deletions.
6 changes: 3 additions & 3 deletions server/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html style="font-size: 50px"><head><meta charset=utf-8><title>电影 - 豆瓣</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><link rel="shortcut icon" type=image/x-icon href=https://img3.doubanio.com/pics/douban-icons/favicon_48x48.png media=screen><link href=/static/css/app.4243a87e748e43e1cab59085112045a7.css rel=stylesheet></head><body><div id=app></div><script>(function (doc, win) {
<!DOCTYPE html><html style="font-size: 50px"><head><meta charset=utf-8><title>电影 - 豆瓣</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><link rel="shortcut icon" type=image/x-icon href=https://img3.doubanio.com/pics/douban-icons/favicon_48x48.png media=screen><link href=/static/css/app.5b31b8024e8373fafd7c396ffb9ceed4.css rel=stylesheet></head><body><div id=app></div><script>(function (doc, win) {
var docEl = doc.documentElement,
resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
recalc = function () {
Expand All @@ -8,6 +8,6 @@
};
if (!doc.addEventListener) return;
doc.addEventListener('DOMContentLoaded', recalc, false);
if (docEl.clientWidth > 640) return;
if (docEl.clientWidth > 750) return;
win.addEventListener(resizeEvt, recalc, false);
})(document, window);</script><script type=text/javascript src=/static/js/manifest.7526ca92921057c75047.js></script><script type=text/javascript src=/static/js/vendor.82e97d484b216868f424.js></script><script type=text/javascript src=/static/js/app.ba7f1cbdc54a206a1d0c.js></script></body></html>
})(document, window);</script><script type=text/javascript src=/static/js/manifest.4d08b8438bf27dfeb8da.js></script><script type=text/javascript src=/static/js/vendor.e24ba384d144217091d4.js></script><script type=text/javascript src=/static/js/app.7a909eb914891a480b0d.js></script></body></html>
12 changes: 6 additions & 6 deletions server/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var express = require('express');
var proxy = require('http-proxy-middleware');
const express = require('express');
const proxy = require('http-proxy-middleware');

var app = express();
app.use('/static', express.static('static'));
const app = express();
app.use('/static', express.static(`${__dirname}/static`));
app.use('/v2', proxy({
target: 'http://api.douban.com',
changeOrigin: true,
Expand All @@ -11,7 +11,7 @@ app.use('/v2', proxy({
},
}));

app.get('/', function(req, res) {
res.sendFile(__dirname + '/index.html');
app.get('/*', (req, res) => {
res.sendFile(`${__dirname}/index.html`);
});
app.listen(3000);

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions server/static/js/app.7a909eb914891a480b0d.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions server/static/js/app.7a909eb914891a480b0d.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions server/static/js/app.ba7f1cbdc54a206a1d0c.js

This file was deleted.

1 change: 0 additions & 1 deletion server/static/js/app.ba7f1cbdc54a206a1d0c.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions server/static/js/manifest.4d08b8438bf27dfeb8da.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/static/js/manifest.4d08b8438bf27dfeb8da.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions server/static/js/manifest.7526ca92921057c75047.js

This file was deleted.

Loading

0 comments on commit a62be4e

Please sign in to comment.