yun - tijiao

@@ -14,8 +14,6 @@ module.exports = app => {
 
     app.on('response', ctx => {
         const used = Date.now() - ctx.starttime
-        console.log(used, 'used')
+        console.log(ctx, 'used')
     })
-
-
 }
\ No newline at end of file

@@ -2,11 +2,16 @@
 
 const Controller = require('egg').Controller;
 
-class HomeController extends Controller {
-  async index() {
-    const { ctx } = this;
-    ctx.body = 'hi, egg';
-  }
-}
+// class HomeController extends Controller {
+//   async index() {
+//     const { ctx } = this;
+//     ctx.body = 'hi,egg';
+//   }
+// }
+
+exports.index = async () => {
+  const { ctx } = this;
+  ctx.body = 'hi,egg';
+};
 
 module.exports = HomeController;

@@ -4,23 +4,69 @@ const Controller = require('egg').Controller;
 class ProxyController extends Controller {
   async info() {
     const { ctx } = this;
+    const { params } = ctx;
+
     ctx.body = {
-      name: `hello ${ctx.params.id}`,
+      name: `hello ${params.id}`,
     };
   }
 
+  addToken(options) {
+    const { ctx } = this;
+    const { session, headers, ip } = ctx;
+
+    if (session.passport && session.passport.user && session.passport.user && session.passport.user.token) {
+      options.headers['Authorization'] = "Bearer " + session.passport.user.token;
+    }
+
+    if (headers['device-id']) {
+      options.headers['Device-Id'] = headers['device-id'];
+    }
+
+    if (ip) {
+      options.headers['Client-Ip'] = ip;
+    }
+
+    return options;
+  }
 
-  getOptions() {
-    const { ctx, config } = this;
-    const { url, type } = ctx;
+  splitUrl(fullUrl) {
+    const { config } = this;
+    const { prefix } = config;
 
-    let catalog = url.substring(1, url.indexOf('/', 1));
-    let pathUrl = url.substring(url.indexOf('/', 1));
-    let fullPath = '/' + catalog + config.restful.version + pathUrl;
+    if (prefix && prefix.length > 1) {
+      fullUrl = fullUrl.substring(prefix.length - 1);
+    }
+
+    return fullUrl.substring(4);
+  }
+
+  addParams(options) {
+    const { ctx } = this;
+    const postData = !ctx.body ? '' : JSON.stringify(ctx.body || {});
+
+    options.params = postData;
+  }
+
+  addContentLength(options) {
+    const { params, headers } = options;
+
+    if (params) {
+      headers['Content-Length'] = params.length;
+    }
+  }
+
+  getOptions(url, type) {
+    const { config } = this;
+    const { restful = {} } = config;
+    const { version, host, port } = restful;
+    const catalog = url.substring(1, url.indexOf('/', 1));
+    const pathUrl = url.substring(url.indexOf('/', 1));
+    const fullPath = '/' + catalog + version + pathUrl;
 
     return {
-      'host': config.restful.host, //后台请求地址
-      'port': config.restful.port,
+      'host': host, //后台请求地址
+      'port': port,
       'path': fullPath,
       'method': type,
       'agent': false,
@@ -32,69 +78,218 @@ class ProxyController extends Controller {
     };
   }
 
-  addToken(options) {
-    const { ctx } = this;
+  async get() {
+    const { ctx, config, logger } = this;
+    const { originalUrl, session, curl } = ctx;
+    const { restful = {} } = config;
+    const { host } = restful;
+    const { access_token } = session.user_info;
+    const url = splitUrl(originalUrl);
+    const options = getOptions(url, 'GET');
 
-    if (ctx.session.passport && ctx.session.passport.user && ctx.session.passport.user && ctx.session.passport.user.token) {
-      options.headers['Authorization'] = "Bearer " + ctx.session.passport.user.token;
-    }
+    addToken(options);
 
-    if (ctx.headers['device-id']) {
-      options.headers['Device-Id'] = ctx.headers['device-id'];
-    }
+    const result = await curl(
+      `${host}${url}`,
+      {
+        method: 'GET',
+        dataType: 'json',
+        headers: {
+          'authorization': `Bearer ${access_token}`,
+          'accept': 'application/json',
+          'content-type': 'application/json'
+        },
+        timeout: [5000, 60000]
+      }
+    );
 
-    if (ctx.ip) {
-      options.headers['Client-Ip'] = ctx.ip;
-    }
+    logger.info(
+      "get originalUrl:",
+      `${splitUrl(originalUrl)}`,
+      "get host:",
+      `${host}`,
+      "get url:",
+      `${url}`,
+      "result:",
+      result
+    );
 
-    return options;
+    ctx.body = result.data || {};
+
+    return ctx.body;
   }
 
 
-  splitUrl(fullUrl) {
-    const { config } = this;
+  async post() {
+    const { ctx, config, logger } = this;
+    const { originalUrl, session, curl, request } = ctx;
+    const { restful = {} } = config;
+    const { host } = restful;
+    const { access_token } = session.user_info
+    const url = splitUrl(originalUrl);
+    const options = getOptions(url, 'POST');
 
-    if (config.prefix && config.prefix.length > 1) {
-      fullUrl = fullUrl.substring(config.prefix.length - 1);
-    }
+    addToken(options);
+    addParams(options);
 
-    return fullUrl.substring(4);
+    const result = await curl(
+      `${host}${url}`,
+      {
+        method: 'POST',
+        dataType: 'json',
+        data: JSON.stringify(request.body),
+        headers: {
+          'authorization': `Bearer ${access_token}`,
+          'accept': 'application/json',
+          'content-type': 'application/json'
+        }
+      }
+    );
+
+    logger.info(
+      "post proxy url:",
+      `${host}${url}`,
+      'headers',
+      {
+        'authorization': `Bearer ${access_token}`,
+        'accept': 'application/json',
+        'content-type': 'application/json'
+      },
+      'data',
+      JSON.stringify(request.body)
+    );
+
+    ctx.body = result.data || {};
+
+    return ctx.body;
   }
 
+  async put() {
+    const { ctx, config, logger } = this;
+    const { originalUrl, session, curl, request } = ctx;
+    const { hroProxy = {} } = config;
+    const { host } = hroProxy;
+    const { access_token } = session.user_info;
+    const url = splitUrl(originalUrl);
+    const options = getOptions(url, 'PUT');
 
-  async get() {
+    addToken(options);
+    addParams(options);
+
+    const result = await curl(
+      `${host}${url}`,
+      {
+        method: 'PUT',
+        dataType: 'json',
+        data: JSON.stringify(request.body),
+        headers: {
+          'authorization': `Bearer ${access_token}`,
+          'accept': 'application/json',
+          'content-type': 'application/json'
+        }
+      }
+    );
+
+    logger.info(
+      "put proxy url:",
+      `${host}${url}`,
+      'headers',
+      {
+        'authorization': `Bearer ${access_token}`,
+        'accept': 'application/json',
+        'content-type': 'application/json'
+      },
+      'data',
+      JSON.stringify(request.body)
+    );
+
+    ctx.body = result.data || {};
+
+    return ctx.body;
+  }
+
+  async head() {
     const { ctx, config, logger } = this;
-    const { originalUrl } = ctx;
-    const { restful = {} } = config;
-    const { host } = restful;
-    const { access_token } = ctx.session.user_info;
-    const url = originalUrl.substring(4); 
+    const { originalUrl, session, curl, request } = ctx;
+    const { hroProxy = {} } = config;
+    const { host } = hroProxy;
+    const { access_token } = session.user_info;
+    const url = splitUrl(originalUrl);
+    const options = getOptions(url, 'HEAD');
 
-    const result = await ctx.curl(`${host}${url}`, {
-      method: 'GET',
-      dataType: 'json',
-      headers: {
+    addToken(options);
+    addParams(options);
+
+    const result = await curl(
+      `${host}${url}`,
+      {
+        method: 'HEAD',
+        dataType: 'json',
+        data: JSON.stringify(request.body),
+        headers: {
+          'authorization': `Bearer ${access_token}`,
+          'accept': 'application/json',
+          'content-type': 'application/json'
+        }
+      }
+    );
+
+    logger.info(
+      "head proxy url:",
+      `${host}${url}`,
+      'headers',
+      {
         'authorization': `Bearer ${access_token}`,
         'accept': 'application/json',
         'content-type': 'application/json'
       },
-      timeout: [5000, 60000]
-    });
+      'data',
+      JSON.stringify(request.body)
+    );
+
+    ctx.body = result.data || {};
+
+    return ctx.body;
+  }
+
+  async del() {
+    const { ctx, config, logger } = this;
+    const { originalUrl, session, curl } = ctx;
+    const { hroProxy = {} } = config;
+    const { host } = hroProxy;
+    const { access_token } = session.user_info
+    const url = splitUrl(originalUrl);
+    const options = getOptions(url, 'DELETE');
+
+    addToken(options);
+    addParams(options);
+    addContentLength(options);
+
+    const result = await curl(
+      `${host}${url}`,
+      {
+        method: 'DELETE',
+        dataType: 'json',
+        headers: {
+          'authorization': `Bearer ${access_token}`,
+          'accept': 'application/json',
+          'content-type': 'application/json'
+        }
+      }
+    );
 
     logger.info(
-      "proxy url:",
+      "delete proxy url:",
       `${host}${url}`,
       'headers:',
       {
         'authorization': `Bearer ${access_token}`,
         'accept': 'application/json',
         'content-type': 'application/json'
-      },
-      "result:",
-      result
+      }
     );
 
-    ctx.body = result.data;
+    ctx.body = result.data || {};
 
     return ctx.body;
   }

 'use strict';
 
 module.exports = app => {
-    const { router, controller } = app;
-    const { proxy } = controller;
-    // 给proxy设置token 
-    router.get(/^\/api\/[\w/]+/, 'proxy.get');
-    // router.post(/^\/api\/[\w/]+/, 'proxy.post');
-    // router.put(/^\/api\/[\w/]+/, 'proxy.put');
-    // router.delete(/^\/api\/[\w/]+/, 'proxy.del');
+  const { router, controller } = app;
+  const { proxy } = controller;
+
+  // 给proxy设置token 
+  router.get(/^\/api\/[\w/]+/, 'proxy.get');
+  // router.post(/^\/api\/[\w/]+/, 'proxy.post');
+  // router.put(/^\/api\/[\w/]+/, 'proxy.put');
+  // router.head(/^\/api\/[\w/]+/, 'proxy.head');
+  // router.delete(/^\/api\/[\w/]+/, 'proxy.del');
 }
\ No newline at end of file

@@ -3,5 +3,5 @@
 module.exports = app => {
     const { router, controller } = app;
  
-    router.get('/', controller.home.index);
+    router.get('/api', controller.home.index);
 }
\ No newline at end of file

@@ -58,7 +58,7 @@ module.exports = appInfo => {
   };
 
   config.static = {
-    prefix: '',
+    prefix: '/',
     dir: path.join(appInfo.baseDir, 'app/public'),
     dynamic: true,//是否緩存靜態資源
     preload: false,//啓動項目開啓緩存