fix: fix mark bugs
This commit is contained in:
parent
12aa9022c4
commit
d8d78d184b
@ -38,7 +38,7 @@
|
|||||||
],
|
],
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@kevisual/local-app-manager": "0.1.10",
|
"@kevisual/local-app-manager": "0.1.11-beta.2",
|
||||||
"@kevisual/router": "0.0.9",
|
"@kevisual/router": "0.0.9",
|
||||||
"@kevisual/use-config": "^1.0.10",
|
"@kevisual/use-config": "^1.0.10",
|
||||||
"@types/semver": "^7.7.0",
|
"@types/semver": "^7.7.0",
|
||||||
|
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
@ -14,8 +14,8 @@ importers:
|
|||||||
.:
|
.:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@kevisual/local-app-manager':
|
'@kevisual/local-app-manager':
|
||||||
specifier: 0.1.10
|
specifier: 0.1.11-beta.2
|
||||||
version: 0.1.10(@kevisual/router@0.0.9)(@kevisual/types@0.0.6)(@kevisual/use-config@1.0.10(dotenv@16.4.7))(pm2@6.0.5)
|
version: 0.1.11-beta.2(@kevisual/router@0.0.9)(@kevisual/types@0.0.6)(@kevisual/use-config@1.0.10(dotenv@16.4.7))(pm2@6.0.5)
|
||||||
'@kevisual/router':
|
'@kevisual/router':
|
||||||
specifier: 0.0.9
|
specifier: 0.0.9
|
||||||
version: 0.0.9
|
version: 0.0.9
|
||||||
@ -511,8 +511,8 @@ packages:
|
|||||||
'@kevisual/load@0.0.4':
|
'@kevisual/load@0.0.4':
|
||||||
resolution: {integrity: sha512-TJBieKsEoEPfP4+tDyhNZdMX2LMAGiDZ/IrAXPFWB4jeFP0Ywm1W5xDV52LhhHq4nwTmuhyTVmPxJYiEVYTHtA==}
|
resolution: {integrity: sha512-TJBieKsEoEPfP4+tDyhNZdMX2LMAGiDZ/IrAXPFWB4jeFP0Ywm1W5xDV52LhhHq4nwTmuhyTVmPxJYiEVYTHtA==}
|
||||||
|
|
||||||
'@kevisual/local-app-manager@0.1.10':
|
'@kevisual/local-app-manager@0.1.11-beta.2':
|
||||||
resolution: {integrity: sha512-4zE3ndsGe5eA0Wl8b8JgWIbulX8uH8vZWuvBkgnAP9ry99XFYHx5Z3XGO990ZKqzRMy3jIFlfooAc1x1iMoZvQ==}
|
resolution: {integrity: sha512-X+w9vpQcyUl7qfIF1/Br0ed2fx/fdI9tx0K4ix0n8ABUpuNsI7mXrR79nNoY5mHZOYxGFqaz+iVdBJW3WQDaXA==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@kevisual/router': ^0.0.6
|
'@kevisual/router': ^0.0.6
|
||||||
'@kevisual/types': ^0.0.1
|
'@kevisual/types': ^0.0.1
|
||||||
@ -3055,7 +3055,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
eventemitter3: 5.0.1
|
eventemitter3: 5.0.1
|
||||||
|
|
||||||
'@kevisual/local-app-manager@0.1.10(@kevisual/router@0.0.9)(@kevisual/types@0.0.6)(@kevisual/use-config@1.0.10(dotenv@16.4.7))(pm2@6.0.5)':
|
'@kevisual/local-app-manager@0.1.11-beta.2(@kevisual/router@0.0.9)(@kevisual/types@0.0.6)(@kevisual/use-config@1.0.10(dotenv@16.4.7))(pm2@6.0.5)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@kevisual/router': 0.0.9
|
'@kevisual/router': 0.0.9
|
||||||
'@kevisual/types': 0.0.6
|
'@kevisual/types': 0.0.6
|
||||||
|
@ -1,13 +1,16 @@
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
import dotenv from 'dotenv';
|
import dotenv from 'dotenv';
|
||||||
|
// import { useConfig } from '@kevisual/use-config/env';
|
||||||
|
|
||||||
const envFiles = [
|
const envFiles = [
|
||||||
path.resolve(process.cwd(), '.env.dev'),
|
path.resolve(process.cwd(), process.env.NODE_ENV === 'development' ? '.env.dev' : '.env'),
|
||||||
path.resolve(process.cwd(), '.env'),
|
// path.resolve(process.cwd(), '.env'), //
|
||||||
];
|
];
|
||||||
dotenv.config({
|
export const config = dotenv.config({
|
||||||
path: envFiles,
|
path: envFiles,
|
||||||
});
|
override: true,
|
||||||
|
}).parsed;
|
||||||
export const config = process.env;
|
// const config = useConfig();
|
||||||
|
// export const config = process.env;
|
||||||
|
console.log('config', config);
|
||||||
export const port = config.PORT || 4005;
|
export const port = config.PORT || 4005;
|
||||||
|
@ -7,6 +7,7 @@ const minioConfig = {
|
|||||||
accessKey: config.MINIO_ACCESS_KEY,
|
accessKey: config.MINIO_ACCESS_KEY,
|
||||||
secretKey: config.MINIO_SECRET_KEY,
|
secretKey: config.MINIO_SECRET_KEY,
|
||||||
};
|
};
|
||||||
|
console.log('minioConfig', minioConfig);
|
||||||
export const minioClient = new Client(minioConfig);
|
export const minioClient = new Client(minioConfig);
|
||||||
|
|
||||||
export const bucketName = config.MINIO_BUCKET_NAME || 'resources';
|
export const bucketName = config.MINIO_BUCKET_NAME || 'resources';
|
||||||
|
@ -301,10 +301,8 @@ export const MarkMInit = async <T = any>(opts: MarkInitOpts<T>, sync?: Opts) =>
|
|||||||
paranoid: true,
|
paranoid: true,
|
||||||
...optsRest,
|
...optsRest,
|
||||||
});
|
});
|
||||||
console.log('MarkModel init', optsRest);
|
|
||||||
if (sync && sync.sync) {
|
if (sync && sync.sync) {
|
||||||
const { sync: _, ...rest } = sync;
|
const { sync: _, ...rest } = sync;
|
||||||
console.log('MarkModel sync', rest);
|
|
||||||
MarkModel.sync({ alter: true, logging: false, ...rest }).catch((e) => {
|
MarkModel.sync({ alter: true, logging: false, ...rest }).catch((e) => {
|
||||||
console.error('MarkModel sync', e);
|
console.error('MarkModel sync', e);
|
||||||
});
|
});
|
||||||
@ -318,4 +316,4 @@ export const syncMarkModel = async (sync?: Opts) => {
|
|||||||
await MarkMInit({ sequelize, tableName: 'micro_mark' }, sync);
|
await MarkMInit({ sequelize, tableName: 'micro_mark' }, sync);
|
||||||
};
|
};
|
||||||
|
|
||||||
syncMarkModel({ sync: true, alter: true, logging: true });
|
syncMarkModel({ sync: true, alter: true, logging: false });
|
Loading…
x
Reference in New Issue
Block a user