Merge pull request #4 from zhengybo/dev

Dev

Author: zhengybo

lib/entry/entry-server.js

@@ -3,7 +3,13 @@ import createApp from '@/app'
 export default context => {
  return new Promise((resolve, reject) => {
  const { app, router, store } = createApp()
- router.push(context.url)
+
+ const { url } = context
+ const { fullPath } = router.resolve(url).route
+ if (fullPath !== url) {
+ return reject({ url: fullPath })
+ }
+ router.push(url)
  store.commit('SET_COOKIE', context.cookie)
  router.onReady(() => {
  const matchedComponents = router.getMatchedComponents()

lib/index.js

@@ -1,5 +1,6 @@
 module.exports = (app) => {
  require('./engine')(app);
  require('./setup')(app);
- app.use(require('./view'));
+ require('./view')(app);
+ app.use(require('./render'));
 }

lib/render.js

@@ -0,0 +1,26 @@
+/**
+ * 渲染模板
+ */
+class Render {
+
+ constructor(context){
+ this.context = context;
+ context.render = this.render.bind(this);
+ context.renderClient = this.renderClient.bind(this);
+ }
+
+ render(options){
+ return this.context.app.view.render(this.context, options);
+ }
+
+ renderClient(){
+
+ }
+
+}
+
+
+module.exports = async (context, next) => {
+ new Render(context);
+ await next();
+}

lib/view/index.js

@@ -1,35 +1,34 @@
 /**
- * 渲染模板
+ * 视图
  */
 class view {
- constructor(context){
- this.context = context;
- context.render = this.render.bind(this);
- context.renderClient = this.renderClient.bind(this);
+ constructor(app){
+ this.app = app;
+ app.view = this;
  }
 
- render(){
+ render(ctx, options){
  return new Promise((resolve, reject) => {
- this.renderToString().then(html => resolve(this.context.body = html));
+ this.renderToString(ctx, options).then(html => resolve(ctx.body = html)).catch(reject);
+ }).catch(e => {
+ let handlerError = this.app.handlerError || function(){};
+ handlerError.call(ctx, ctx, e)
  })
  }
 
- renderToString(options){
- let { app, url, request : { header : { cookie } } } = this.context,
+ renderToString(ctx, options){
+ let { url, request : { header : { cookie } } } = ctx,
  opt = Object.assign({ url, cookie }, options);
  return new Promise((resolve, reject) => {
-  app.engine.renderer.renderToString(opt, (err, html) => {
-  err ? reject(err) : resolve(html);
-  });
- }).catch(e => console.log(e))
+ this.app.engine.renderer.renderToString(opt, (err, html) => {
+ err ? reject(err) : resolve(html)
+ });
+ })
  }
 
  renderClient(){
 
  }
 }
 
-module.exports = async (context, next) => {
- new view(context);
- await next();
-}
+module.exports = app => new view(app)

middlewares/index.js

@@ -0,0 +1,17 @@
+
+/**
+ * token检查中间件
+ */
+async function checkToken(ctx, next){
+ if(!ctx.header.puid){
+ ctx.body = {
+ code : 0
+ }
+ }else {
+ await next();
+ }
+}
+
+
+
+export { checkToken }

router/index.js

@@ -2,21 +2,32 @@
 const router = require('koa-router')();
 
 export default (app) => {
+ /* 处理公用错误 */
+ app.handlerError = (ctx, e) => {
+ if(typeof e == 'object'){ // 人为返回错误
+ ctx.redirect('/404')
+ return;
+ }
+ ctx.throw(500);
+ }
 
- router.get(/^(?!\/(api|dist))\/*/, async (ctx) => {
- await ctx.render();
+ router.get(/^(?!\/(api|dist|404))\/*/, async (ctx) => {
+ await ctx.render(ctx);
  })
 
  router.get('/api/getUserInfo', async (ctx) => {
  ctx.body = {
- code : 0,
-
+ code : 1,
  data : {
- name : '我叫mv',
- age : 10
+ name : '我叫mmv'
  }
  }
  })
 
+ router.get('/404', async (ctx) => {
+ await ctx.render();
+ })
+
+
  return app.use(router.routes(),router.allowedMethods());
 }

src/js/http/axios.js

@@ -15,7 +15,16 @@ const http = store => options => {
 
  isBody && Object.assign(headers, {'Content-Type' : 'application/json' });
 
- return axios({ url, method, data, params, headers })
- .then(res => res.data).catch(err => console.log(err));
+ return new Promise((resolve, reject) => {
+ axios({ url, method, data, params, headers })
+ .then(res => res.data)
+ .then(data => {
+ if(data.code == 0){
+ resolve(data)
+ }
+ reject({})
+ })
+ .catch(err => console.log(err))
+ });
 }
 export { http }

src/view/layout/footer.vue

@@ -1,6 +1,6 @@
 <template lang="html">
  <div id="footer" class="">
- 我是底部111
+ 我是底部111我我看那边你说传
  </div>
 </template>