@fastcar/koa 0.1.10 → 0.1.11

package/README.md

@@ -2,7 +2,7 @@
 
 ## 快速安装
 
-npm install fastcar@koa
+npm install @fastcar/koa
 
 ## 基本原理
 
@@ -31,12 +31,17 @@ export const app = new APP();
 ```ts
 import { Controller } from "@fastcar/core/annotation";
 import { GET } from "@fastcar/koa/annotation";
+import { Context } from "koa";
+
 
 @Controller
 export default class HelloController {
 
  @GET("/")
- home() {
+ home(params: string, ctx: Context) {
+  console.log("这边请注意 params是params和body二合一的参数 重名的值会优先取body的");
+  console.log('body取 ctx.request.body');
+  console.log('路径后参数取ctx.params');
   return "hello world";
  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/koa",
-	"version": "0.1.10",
+	"version": "0.1.11",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"description": "fastcar框架下对koa的包装",
 	"main": "target/index.js",

package/src/KoaApplication.ts

@@ -5,7 +5,7 @@ import * as Koa from "koa";
 import * as KoaRouter from "koa-router";
 import { MethodType } from "./type/MethodType";
 import { DesignMeta } from "./type/DesignMeta";
-import { TypeUtil } from "@fastcar/core/utils";
+import { TypeUtil, ValidationUtil } from "@fastcar/core/utils";
 import { KoaConfig } from "./type/KoaConfig";
 import { ServerApplication } from "@fastcar/server";
 
@@ -69,10 +69,15 @@ export default class KoaApplication {
 				//去除ctx的影响
 				let callBack = async (ctx: any, next?: Function) => {
 					//进行参数的取值
-					let body = Object.keys(ctx.query).length > 0 ? ctx.query : ctx.request.body;
+					let body = {};
 
-					if (!body) {
-						body = {};
+					//自动合并传参 如果有重合的部分 需要再次单独取就好了
+					if (Object.keys(ctx.query).length > 0) {
+						Object.assign(body, ctx.query);
+					}
+
+					if (!!ctx.request.body) {
+						Object.assign(body, ctx.request.body);
 					}
 
 					if (!!ctx.params) {
@@ -80,7 +85,7 @@ export default class KoaApplication {
 					}
 
 					let res = await instance[item.method](body, ctx);
-					if (!!res) {
+					if (ValidationUtil.isNotNull(res)) {
 						ctx.body = res;
 					}
 

package/target/KoaApplication.js

@@ -61,15 +61,19 @@ let KoaApplication = class KoaApplication {
                 //去除ctx的影响
                 let callBack = async (ctx, next) => {
                     //进行参数的取值
-                    let body = Object.keys(ctx.query).length > 0 ? ctx.query : ctx.request.body;
-                    if (!body) {
-                        body = {};
+                    let body = {};
+                    //自动合并传参 如果有重合的部分 需要再次单独取就好了
+                    if (Object.keys(ctx.query).length > 0) {
+                        Object.assign(body, ctx.query);
+                    }
+                    if (!!ctx.request.body) {
+                        Object.assign(body, ctx.request.body);
                     }
                     if (!!ctx.params) {
                         Object.assign(body, ctx.params);
                     }
                     let res = await instance[item.method](body, ctx);
-                    if (!!res) {
+                    if (utils_1.ValidationUtil.isNotNull(res)) {
                         ctx.body = res;
                     }
                     if (next) {

package/test/logs/sys.log

@@ -68,3 +68,9 @@
 {"timestamp":"2022-04-23 10:22:04.326","level":"INFO","label":"sys","message":"http server is running in 12234"}
 {"timestamp":"2022-04-23 10:22:04.327","level":"INFO","label":"sys","message":"start server koaSimple is run"}
 {"timestamp":"2022-04-23 10:22:04.328","level":"INFO","label":"sys","message":"version 1.0.0"}
+{"timestamp":"2023-02-18 15:57:04.345","level":"INFO","label":"sys","message":"Start scanning component"}
+{"timestamp":"2023-02-18 15:57:05.478","level":"INFO","label":"sys","message":"Complete component scan"}
+{"timestamp":"2023-02-18 15:57:05.479","level":"INFO","label":"sys","message":"Call application initialization method"}
+{"timestamp":"2023-02-18 15:57:06.254","level":"INFO","label":"sys","message":"http server is running in 1234"}
+{"timestamp":"2023-02-18 15:57:06.256","level":"INFO","label":"sys","message":"start server koaSimple is run"}
+{"timestamp":"2023-02-18 15:57:06.258","level":"INFO","label":"sys","message":"version 1.0.0"}

package/test/simple/app.ts

@@ -27,8 +27,7 @@ const m2 = (): Koa.Middleware => {
 
 @Application
 @EnableKoa //开启koa
-@KoaMiddleware(ExceptionGlobalHandler, KoaStatic, KoaBodyParser)
-@KoaMiddleware(KoaCors)
+@KoaMiddleware(ExceptionGlobalHandler, KoaStatic, KoaBodyParser as any)
 @KoaMiddleware(Swagger)
 @KoaMiddleware(m1, m2)
 class APP {