From d8d78d184b18898e9aa397df28ca6c1528975406 Mon Sep 17 00:00:00 2001
From: xion <xiongxiao1012@outlook.com>
Date: Sat, 29 Mar 2025 18:24:00 +0800
Subject: [PATCH] fix: fix mark bugs

---
 package.json             |  2 +-
 pnpm-lock.yaml           | 10 +++++-----
 src/modules/config.ts    | 15 +++++++++------
 src/modules/minio.ts     |  1 +
 src/routes/mark/model.ts |  4 +---
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index a04111c..49b7979 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   ],
   "license": "UNLICENSED",
   "dependencies": {
-    "@kevisual/local-app-manager": "0.1.10",
+    "@kevisual/local-app-manager": "0.1.11-beta.2",
     "@kevisual/router": "0.0.9",
     "@kevisual/use-config": "^1.0.10",
     "@types/semver": "^7.7.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b8cd0d4..f6343d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,8 +14,8 @@ importers:
   .:
     dependencies:
       '@kevisual/local-app-manager':
-        specifier: 0.1.10
-        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)
+        specifier: 0.1.11-beta.2
+        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':
         specifier: 0.0.9
         version: 0.0.9
@@ -511,8 +511,8 @@ packages:
   '@kevisual/load@0.0.4':
     resolution: {integrity: sha512-TJBieKsEoEPfP4+tDyhNZdMX2LMAGiDZ/IrAXPFWB4jeFP0Ywm1W5xDV52LhhHq4nwTmuhyTVmPxJYiEVYTHtA==}
 
-  '@kevisual/local-app-manager@0.1.10':
-    resolution: {integrity: sha512-4zE3ndsGe5eA0Wl8b8JgWIbulX8uH8vZWuvBkgnAP9ry99XFYHx5Z3XGO990ZKqzRMy3jIFlfooAc1x1iMoZvQ==}
+  '@kevisual/local-app-manager@0.1.11-beta.2':
+    resolution: {integrity: sha512-X+w9vpQcyUl7qfIF1/Br0ed2fx/fdI9tx0K4ix0n8ABUpuNsI7mXrR79nNoY5mHZOYxGFqaz+iVdBJW3WQDaXA==}
     peerDependencies:
       '@kevisual/router': ^0.0.6
       '@kevisual/types': ^0.0.1
@@ -3055,7 +3055,7 @@ snapshots:
     dependencies:
       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:
       '@kevisual/router': 0.0.9
       '@kevisual/types': 0.0.6
diff --git a/src/modules/config.ts b/src/modules/config.ts
index 5abcef8..a2b696d 100644
--- a/src/modules/config.ts
+++ b/src/modules/config.ts
@@ -1,13 +1,16 @@
 import path from 'path';
 import dotenv from 'dotenv';
+// import { useConfig } from '@kevisual/use-config/env';
 
 const envFiles = [
-  path.resolve(process.cwd(), '.env.dev'),
-  path.resolve(process.cwd(), '.env'),
+  path.resolve(process.cwd(), process.env.NODE_ENV === 'development' ? '.env.dev' : '.env'),
+  // path.resolve(process.cwd(), '.env'), //
 ];
-dotenv.config({
+export const config = dotenv.config({
   path: envFiles,
-});
-
-export const config = process.env;
+  override: true,
+}).parsed;
+// const config = useConfig();
+// export const config = process.env;
+console.log('config', config);
 export const port = config.PORT || 4005;
diff --git a/src/modules/minio.ts b/src/modules/minio.ts
index 4c26368..10a1219 100644
--- a/src/modules/minio.ts
+++ b/src/modules/minio.ts
@@ -7,6 +7,7 @@ const minioConfig = {
   accessKey: config.MINIO_ACCESS_KEY,
   secretKey: config.MINIO_SECRET_KEY,
 };
+console.log('minioConfig', minioConfig);
 export const minioClient = new Client(minioConfig);
 
 export const bucketName = config.MINIO_BUCKET_NAME || 'resources';
diff --git a/src/routes/mark/model.ts b/src/routes/mark/model.ts
index c69ba0d..9636cab 100644
--- a/src/routes/mark/model.ts
+++ b/src/routes/mark/model.ts
@@ -301,10 +301,8 @@ export const MarkMInit = async <T = any>(opts: MarkInitOpts<T>, sync?: Opts) =>
     paranoid: true,
     ...optsRest,
   });
-  console.log('MarkModel init', optsRest);
   if (sync && sync.sync) {
     const { sync: _, ...rest } = sync;
-    console.log('MarkModel sync', rest);
     MarkModel.sync({ alter: true, logging: false, ...rest }).catch((e) => {
       console.error('MarkModel sync', e);
     });
@@ -318,4 +316,4 @@ export const syncMarkModel = async (sync?: Opts) => {
   await MarkMInit({ sequelize, tableName: 'micro_mark' }, sync);
 };
 
-syncMarkModel({ sync: true, alter: true, logging: true });
\ No newline at end of file
+syncMarkModel({ sync: true, alter: true, logging: false });
\ No newline at end of file