@fastcar/core 0.2.42 → 0.2.43

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.2.42",
+	"version": "0.2.43",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"reflect-metadata": "^0.1.13",
-		"winston": "^3.6.0",
+		"winston": "^3.9.0",
 		"yaml": "^1.10.2"
 	},
 	"devDependencies": {

package/src/annotation/stereotype/Log.ts

@@ -11,7 +11,7 @@ export default function Log(category?: string) {
 			get: (): Logger => {
 				let app: ApplicationInterface = Reflect.get(global, CommonConstant.FastcarApp);
 				let appid = app.getSetting(CommonConstant.APPId) || ""; //进行差异化区分
-				return app ? app.getLogger(appid ? `[${appid}] ${m}` : m) : console;
+				return app ? app.getLogger(appid ? `${appid}.${m}` : m) : console;
 			},
 		});
 	};

package/target/FastCarApplication.js

@@ -666,7 +666,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
 };
 __decorate([
     (0, Log_1.default)("sys"),
-    __metadata("design:type", Object)
+    __metadata("design:type", winston.Logger)
 ], FastCarApplication.prototype, "sysLogger", void 0);
 FastCarApplication = FastCarApplication_1 = __decorate([
     Component_1.default,

package/target/annotation/stereotype/Log.js

@@ -9,7 +9,7 @@ function Log(category) {
             get: () => {
                 let app = Reflect.get(global, CommonConstant_1.CommonConstant.FastcarApp);
                 let appid = app.getSetting(CommonConstant_1.CommonConstant.APPId) || ""; //进行差异化区分
-                return app ? app.getLogger(appid ? `[${appid}] ${m}` : m) : console;
+                return app ? app.getLogger(appid ? `${appid}.${m}` : m) : console;
             },
         });
     };

package/target/annotation/AddRequireModule.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const FastCarMetaData_1 = require("../constant/FastCarMetaData");
-require("reflect-metadata");
-/***
- * @version 1.0 依赖模块注入
- *
- */
-function AddRequireModule(target, m, alias) {
-    let relyname = FastCarMetaData_1.FastCarMetaData.IocModule;
-    if (Reflect.hasMetadata(relyname, target)) {
-        let iocMap = Reflect.getMetadata(relyname, target);
-        iocMap.set(m, alias);
-    }
-    else {
-        let modules = new Map();
-        modules.set(m, alias);
-        Reflect.defineMetadata(relyname, modules, target);
-    }
-}
-exports.default = AddRequireModule;

package/target/annotation/Autowired.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ReflectUtil_1 = require("../utils/ReflectUtil");
-const AddRequireModule_1 = require("./AddRequireModule");
-/***
- * @version 1.0 说明哪些模块需要被加载
- *
- *
- */
-function Autowired(target, propertyKey) {
-    //反向找设计类型
-    let key = ReflectUtil_1.default.getNameByPropertyKey(target, propertyKey);
-    AddRequireModule_1.default(target, propertyKey, key);
-}
-exports.default = Autowired;

package/target/annotation/Calldependency.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const CommonConstant_1 = require("../constant/CommonConstant");
-const ReflectUtil_1 = require("../utils/ReflectUtil");
-/***
- * @version 1.0 在使用该函数时进行调用 声明的类可以不是组件
- *
- */
-function CallDependency(target, propertyKey) {
-    Reflect.defineProperty(target, propertyKey, {
-        get: () => {
-            let key = ReflectUtil_1.default.getNameByPropertyKey(target, propertyKey);
-            let app = Reflect.get(global, CommonConstant_1.CommonConstant.FastcarApp);
-            return app ? app.getComponentByName(key) : null;
-        },
-    });
-}
-exports.default = CallDependency;