jcnet/webio-node
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix locale 404 not default

Browse Source
This commit is contained in:
Jay 2017-04-05 15:35:32 +08:00
parent b684672ad2
commit 34f2d0e24a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app.js
View File

@ -13,7 +13,7 @@ const app = express();
const api_route = require('./route/api'); const api_route = require('./route/api');
// storeObject interval clear // storeObject interval clear
const clearStore = setInterval(() =>{ const clearStore = setInterval(() => {
so.clear(); so.clear();
}, 30000) }, 30000)
@ -34,6 +34,10 @@ app.use(express.static(path.resolve(__dirname, 'public')));
app.use('/semantic', express.static(path.resolve(__dirname, 'node_modules', 'semantic-ui-css'))); app.use('/semantic', express.static(path.resolve(__dirname, 'node_modules', 'semantic-ui-css')));
app.use('/react-datetime', express.static(path.resolve(__dirname, 'node_modules', 'react-datetime', 'css'))); app.use('/react-datetime', express.static(path.resolve(__dirname, 'node_modules', 'react-datetime', 'css')));
app.use(/\/locales\/(\w+).json/, (req, res, n) => {
res.sendFile(path.resolve(__dirname, 'public', 'locales', 'zh.json'));
})
const server = app.listen(app.get('port'), () => { const server = app.listen(app.get('port'), () => {
console.log(`Server start on port ${server.address().port}`); console.log(`Server start on port ${server.address().port}`);
}); });
@ -45,11 +49,11 @@ app.get('/', (req, res) => {
res.sendFile(path.resolve(__dirname, 'views', 'index.html')); res.sendFile(path.resolve(__dirname, 'views', 'index.html'));
}); });
app.get(['/admin','/admin/*'], (req,res) => { app.get(['/admin', '/admin/*'], (req, res) => {
res.sendFile(path.resolve(__dirname, 'views', 'admin.html')); res.sendFile(path.resolve(__dirname, 'views', 'admin.html'));
}); });
app.get('/servcmd', (req,res) => { app.get('/servcmd', (req, res) => {
res.send({status: `exit time ${Date.now()}`}); res.send({ status: `exit time ${Date.now()}` });
setTimeout(()=>{process.exit(1)}, 2000); setTimeout(() => { process.exit(1) }, 2000);
}); });

3
public/js/index_bundle.js
View File

@ -62215,7 +62215,8 @@ var Root = function (_React$Component) {
value: function componentDidMount() { value: function componentDidMount() {
var _this2 = this; var _this2 = this;
var lang = navigator.language.substring(0, 2); var slang = sessionStorage.getItem('lang');
var lang = slang || navigator.language.substring(0, 2);
fetch('/locales/' + lang + '.json').then(function (response) { fetch('/locales/' + lang + '.json').then(function (response) {
if (response.status == 200) return response.json(); if (response.status == 200) return response.json();
return {}; return {};

3
src/components/Login/index.js
View File

@ -59,7 +59,8 @@ class Root extends React.Component {
} }
componentDidMount() { componentDidMount() {
let lang = navigator let slang = sessionStorage.getItem('lang');
let lang = slang || navigator
.language .language
.substring(0, 2); .substring(0, 2);
fetch(`/locales/${lang}.json`).then(response => { fetch(`/locales/${lang}.json`).then(response => {