fix: component env filter (#1234)

* fix: component env filter * fix: jest version
midwayjs · Aug 18, 2021 · bfb44b7 · bfb44b7
1 parent c826e68
commit bfb44b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "a web framework for complex Node.js application",
   "version": "1.0.0",
   "devDependencies": {
-    "@types/jest": "^26.0.23",
+    "@types/jest": "^27.0.0",
     "@types/node": "^15.0.1",
     "@vercel/ncc": "^0.29.0",
     "dotenv": "^10.0.0",

diff --git a/packages-serverless/egg-layer/test/index.test.js b/packages-serverless/egg-layer/test/index.test.js
@@ -318,9 +318,9 @@ describe('/test/index.test.ts', () => {
 
     it('should test param with get', done => {
       request(app)
-        .get('/echo/%E6%B5%8B%E8%AF%95')
+        .get('/echo/' + encodeURI('测试'))
         .expect('Content-Type', 'text/plain; charset=utf-8')
-        .expect('测试')
+        .expect('%E6%B5%8B%E8%AF%95')
         .expect(200, done);
     });
   });

diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -427,11 +427,13 @@ export abstract class BaseFramework<
       } else {
         // 普通类写法
         const providerId = getProviderId(cycle.target);
-        cycle.instance =
-          await this.getApplicationContext().getAsync<ILifeCycle>(providerId);
+        if (this.getApplicationContext().registry.hasDefinition(providerId)) {
+          cycle.instance =
+            await this.getApplicationContext().getAsync<ILifeCycle>(providerId);
+        }
       }
 
-      lifecycleInstanceList.push(cycle);
+      cycle.instance && lifecycleInstanceList.push(cycle);
     }
 
     // exec onConfigLoad()

diff --git a/packages/core/src/interface.ts b/packages/core/src/interface.ts
@@ -14,6 +14,7 @@ import { ILogger, LoggerOptions } from '@midwayjs/logger';
  * 生命周期定义
  */
 export interface ILifeCycle {
+  onConfigLoad?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
   onReady(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
   onStop?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
 }