vona-core 5.0.28 → 5.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -340,7 +340,7 @@ export class BeanContainer {
|
|
|
340
340
|
let chains = [];
|
|
341
341
|
// aop
|
|
342
342
|
if (!proxyDisable && beanOptions && cast(beanOptions.scene) !== 'aop') {
|
|
343
|
-
const beanAop = this.app.bean._getBean('a-
|
|
343
|
+
const beanAop = this.app.bean._getBean('a-aspectutils.service.aop');
|
|
344
344
|
const aops = beanAop.findAopsMatched(beanOptions.beanFullName);
|
|
345
345
|
if (aops) {
|
|
346
346
|
chains = chains.concat(aops);
|
|
@@ -348,7 +348,7 @@ export class BeanContainer {
|
|
|
348
348
|
}
|
|
349
349
|
// aop method
|
|
350
350
|
if (!proxyDisable && beanOptions) {
|
|
351
|
-
const beanAop = this.app.bean._getBean('a-
|
|
351
|
+
const beanAop = this.app.bean._getBean('a-aspectutils.service.aop');
|
|
352
352
|
if (beanAop.hasAopMethods(beanOptions?.beanFullName)) {
|
|
353
353
|
chains.push(SymbolProxyAopMethod);
|
|
354
354
|
}
|
|
@@ -451,7 +451,7 @@ export class BeanContainer {
|
|
|
451
451
|
return result;
|
|
452
452
|
}
|
|
453
453
|
_getAopChainsProp_aopMethods(chains, aopKey, beanFullName, methodType, prop) {
|
|
454
|
-
const beanAop = this.app.bean._getBean('a-
|
|
454
|
+
const beanAop = this.app.bean._getBean('a-aspectutils.service.aop');
|
|
455
455
|
const aopMethods = beanAop.findAopMethodsMatched(beanFullName, prop);
|
|
456
456
|
for (const aopMethod of aopMethods) {
|
|
457
457
|
let fn;
|
package/dist/lib/core/config.js
CHANGED
|
@@ -7,7 +7,7 @@ import { combineLoggerDefault } from "./loggerDefault.js";
|
|
|
7
7
|
export function combineAppConfigDefault(appInfo, env) {
|
|
8
8
|
let config = configDefault(appInfo, env);
|
|
9
9
|
const mode = appInfo.configMeta.mode;
|
|
10
|
-
if (mode === '
|
|
10
|
+
if (mode === 'dev') {
|
|
11
11
|
config = deepExtend(config, configLocal(env));
|
|
12
12
|
}
|
|
13
13
|
else if (mode === 'prod') {
|
|
@@ -83,7 +83,7 @@ export function configTest(_env) {
|
|
|
83
83
|
function getLoggerPathPhysicalRoot(appInfo) {
|
|
84
84
|
const mode = appInfo.configMeta.mode;
|
|
85
85
|
let loggerDir;
|
|
86
|
-
if (mode === 'test' || mode === '
|
|
86
|
+
if (mode === 'test' || mode === 'dev') {
|
|
87
87
|
loggerDir = path.join(appInfo.projectPath, '.app/logs');
|
|
88
88
|
}
|
|
89
89
|
else {
|
|
@@ -95,7 +95,7 @@ function getLoggerPathPhysicalRoot(appInfo) {
|
|
|
95
95
|
function getPublicPathPhysicalRoot(appInfo) {
|
|
96
96
|
const mode = appInfo.configMeta.mode;
|
|
97
97
|
let publicDir;
|
|
98
|
-
if (mode === 'test' || mode === '
|
|
98
|
+
if (mode === 'test' || mode === 'dev') {
|
|
99
99
|
publicDir = path.join(appInfo.projectPath, '.app/public');
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
@@ -107,7 +107,7 @@ function getPublicPathPhysicalRoot(appInfo) {
|
|
|
107
107
|
export async function combineConfigDefault(app, configDefault, configLocal, configProd, configTest) {
|
|
108
108
|
let config = await configDefault(app);
|
|
109
109
|
const mode = app.config.meta.mode;
|
|
110
|
-
if (mode === '
|
|
110
|
+
if (mode === 'dev' && configLocal) {
|
|
111
111
|
config = deepExtend(config, await configLocal(app));
|
|
112
112
|
}
|
|
113
113
|
else if (mode === 'prod' && configProd) {
|
package/dist/lib/core/meta.js
CHANGED
|
@@ -65,7 +65,7 @@ export class AppMeta extends BeanSimple {
|
|
|
65
65
|
const mode = this.app.config.meta.mode;
|
|
66
66
|
this.isProd = mode === 'prod';
|
|
67
67
|
this.isTest = mode === 'test';
|
|
68
|
-
this.isLocal = mode === '
|
|
68
|
+
this.isLocal = mode === 'dev';
|
|
69
69
|
}
|
|
70
70
|
async waitAppStarted() {
|
|
71
71
|
return new Promise((resolve, reject) => {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona-core",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "5.0.
|
|
4
|
+
"version": "5.0.30",
|
|
5
5
|
"description": "vona",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
@@ -30,10 +30,10 @@
|
|
|
30
30
|
"@cabloy/extend": "^3.1.10",
|
|
31
31
|
"@cabloy/json5": "^1.0.18",
|
|
32
32
|
"@cabloy/localeutil": "^2.0.10",
|
|
33
|
-
"@cabloy/module-info": "^1.3.
|
|
34
|
-
"@cabloy/module-info-pro": "^1.0.
|
|
33
|
+
"@cabloy/module-info": "^1.3.23",
|
|
34
|
+
"@cabloy/module-info-pro": "^1.0.31",
|
|
35
35
|
"@cabloy/set": "^1.0.17",
|
|
36
|
-
"@cabloy/utils": "^1.0.
|
|
36
|
+
"@cabloy/utils": "^1.0.31",
|
|
37
37
|
"@cabloy/word-utils": "^2.0.1",
|
|
38
38
|
"fs-extra": "^10.1.0",
|
|
39
39
|
"koa": "^3.0.0",
|