From 5634ac0260c40bb736266d22f86dede05985c4e7 Mon Sep 17 00:00:00 2001 From: geekgeekrun Date: Sat, 17 Jan 2026 11:34:13 +0800 Subject: [PATCH] remove wrong import way --- packages/sqlite-plugin/package.json | 2 ++ .../src/entity/AutoStartChatRunRecord.ts | 4 ++-- .../src/entity/BossActiveStatusRecord.ts | 4 ++-- packages/sqlite-plugin/src/entity/BossInfo.ts | 4 ++-- .../src/entity/BossInfoChangeLog.ts | 4 ++-- .../src/entity/ChatMessageRecord.ts | 4 ++-- .../src/entity/ChatStartupLog.ts | 4 ++-- .../sqlite-plugin/src/entity/CompanyInfo.ts | 4 ++-- .../src/entity/CompanyInfoChangeLog.ts | 4 ++-- .../src/entity/JobHireStatusRecord.ts | 4 ++-- packages/sqlite-plugin/src/entity/JobInfo.ts | 4 ++-- .../src/entity/JobInfoChangeLog.ts | 4 ++-- .../src/entity/LlmModelUsageRecord.ts | 4 ++-- .../src/entity/MarkAsNotSuitLog.ts | 4 ++-- packages/sqlite-plugin/src/entity/UserInfo.ts | 4 ++-- .../sqlite-plugin/src/entity/VBossLibrary.ts | 4 ++-- .../src/entity/VChatStartupLog.ts | 4 ++-- .../src/entity/VCompanyLibrary.ts | 4 ++-- .../sqlite-plugin/src/entity/VJobLibrary.ts | 4 ++-- .../src/entity/VMarkAsNotSuitLog.ts | 4 ++-- packages/sqlite-plugin/src/index.ts | 7 +++---- .../sqlite-plugin/src/utils/module-loader.ts | 4 ---- packages/ui/package.json | 5 +++-- .../features/FlyingCompanyLogoList/index.vue | 2 +- .../page/BootstrapSplash/page/FailMessage.vue | 2 +- .../GeekAutoStartChatWithBoss/index.vue | 2 +- .../renderer/src/page/MainLayout/index.vue | 2 +- packages/ui/src/renderer/src/store/index.ts | 2 +- pnpm-lock.yaml | 21 +++++++++++++------ 29 files changed, 66 insertions(+), 59 deletions(-) delete mode 100644 packages/sqlite-plugin/src/utils/module-loader.ts diff --git a/packages/sqlite-plugin/package.json b/packages/sqlite-plugin/package.json index d61ad33..72f2ced 100644 --- a/packages/sqlite-plugin/package.json +++ b/packages/sqlite-plugin/package.json @@ -5,11 +5,13 @@ "main": "dist/index.js", "dependencies": { "cli-highlight": "^2.1.11", + "lodash": "^4.17.21", "reflect-metadata": "^0.2.1", "sqlite3": "5.1.6", "typeorm": "0.3.11" }, "devDependencies": { + "@types/lodash": "^4.17.23", "ts-node": "^10.9.2", "typescript": "^5.3.3" }, diff --git a/packages/sqlite-plugin/src/entity/AutoStartChatRunRecord.ts b/packages/sqlite-plugin/src/entity/AutoStartChatRunRecord.ts index fdeb0b3..41969b8 100644 --- a/packages/sqlite-plugin/src/entity/AutoStartChatRunRecord.ts +++ b/packages/sqlite-plugin/src/entity/AutoStartChatRunRecord.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryGeneratedColumn } = typeorm; @Entity() export class AutoStartChatRunRecord { diff --git a/packages/sqlite-plugin/src/entity/BossActiveStatusRecord.ts b/packages/sqlite-plugin/src/entity/BossActiveStatusRecord.ts index bb81e30..a3740dd 100644 --- a/packages/sqlite-plugin/src/entity/BossActiveStatusRecord.ts +++ b/packages/sqlite-plugin/src/entity/BossActiveStatusRecord.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryGeneratedColumn } = typeorm; @Entity() export class BossActiveStatusRecord { diff --git a/packages/sqlite-plugin/src/entity/BossInfo.ts b/packages/sqlite-plugin/src/entity/BossInfo.ts index 1971ff2..d51013b 100644 --- a/packages/sqlite-plugin/src/entity/BossInfo.ts +++ b/packages/sqlite-plugin/src/entity/BossInfo.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryColumn } = typeorm; @Entity() export class BossInfo { diff --git a/packages/sqlite-plugin/src/entity/BossInfoChangeLog.ts b/packages/sqlite-plugin/src/entity/BossInfoChangeLog.ts index 48173dc..f6defd9 100644 --- a/packages/sqlite-plugin/src/entity/BossInfoChangeLog.ts +++ b/packages/sqlite-plugin/src/entity/BossInfoChangeLog.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryGeneratedColumn } = typeorm @Entity() export class BossInfoChangeLog { diff --git a/packages/sqlite-plugin/src/entity/ChatMessageRecord.ts b/packages/sqlite-plugin/src/entity/ChatMessageRecord.ts index fc29e3d..d405a01 100644 --- a/packages/sqlite-plugin/src/entity/ChatMessageRecord.ts +++ b/packages/sqlite-plugin/src/entity/ChatMessageRecord.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryGeneratedColumn } = typeorm @Entity() export class ChatMessageRecord { diff --git a/packages/sqlite-plugin/src/entity/ChatStartupLog.ts b/packages/sqlite-plugin/src/entity/ChatStartupLog.ts index a8d2481..7cd868e 100644 --- a/packages/sqlite-plugin/src/entity/ChatStartupLog.ts +++ b/packages/sqlite-plugin/src/entity/ChatStartupLog.ts @@ -1,6 +1,6 @@ import { JobSource } from "../enums"; -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryGeneratedColumn } = typeorm export enum ChatStartupFrom { AutoFromRecommendList = null, diff --git a/packages/sqlite-plugin/src/entity/CompanyInfo.ts b/packages/sqlite-plugin/src/entity/CompanyInfo.ts index 58ca313..7a9c3b2 100644 --- a/packages/sqlite-plugin/src/entity/CompanyInfo.ts +++ b/packages/sqlite-plugin/src/entity/CompanyInfo.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryColumn } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryColumn } = typeorm @Entity() export class CompanyInfo { diff --git a/packages/sqlite-plugin/src/entity/CompanyInfoChangeLog.ts b/packages/sqlite-plugin/src/entity/CompanyInfoChangeLog.ts index 4d226ce..57f0118 100644 --- a/packages/sqlite-plugin/src/entity/CompanyInfoChangeLog.ts +++ b/packages/sqlite-plugin/src/entity/CompanyInfoChangeLog.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, PrimaryGeneratedColumn, Column } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, PrimaryGeneratedColumn, Column } = typeorm @Entity() export class CompanyInfoChangeLog { diff --git a/packages/sqlite-plugin/src/entity/JobHireStatusRecord.ts b/packages/sqlite-plugin/src/entity/JobHireStatusRecord.ts index d2f1aaf..c7d3f29 100644 --- a/packages/sqlite-plugin/src/entity/JobHireStatusRecord.ts +++ b/packages/sqlite-plugin/src/entity/JobHireStatusRecord.ts @@ -1,6 +1,6 @@ import { JobHireStatus } from "../enums"; -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryColumn } = typeorm; @Entity() export class JobHireStatusRecord { diff --git a/packages/sqlite-plugin/src/entity/JobInfo.ts b/packages/sqlite-plugin/src/entity/JobInfo.ts index d30f6e7..a88a3a3 100644 --- a/packages/sqlite-plugin/src/entity/JobInfo.ts +++ b/packages/sqlite-plugin/src/entity/JobInfo.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryColumn } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryColumn } = typeorm @Entity() export class JobInfo { diff --git a/packages/sqlite-plugin/src/entity/JobInfoChangeLog.ts b/packages/sqlite-plugin/src/entity/JobInfoChangeLog.ts index a90190f..48ad06b 100644 --- a/packages/sqlite-plugin/src/entity/JobInfoChangeLog.ts +++ b/packages/sqlite-plugin/src/entity/JobInfoChangeLog.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, PrimaryGeneratedColumn, Column } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, PrimaryGeneratedColumn, Column } = typeorm @Entity() export class JobInfoChangeLog { diff --git a/packages/sqlite-plugin/src/entity/LlmModelUsageRecord.ts b/packages/sqlite-plugin/src/entity/LlmModelUsageRecord.ts index db5c179..a1f0301 100644 --- a/packages/sqlite-plugin/src/entity/LlmModelUsageRecord.ts +++ b/packages/sqlite-plugin/src/entity/LlmModelUsageRecord.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, PrimaryGeneratedColumn, Column, Index } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, PrimaryGeneratedColumn, Column, Index } = typeorm @Entity() @Index(["providerCompleteApiUrl", "model", "providerApiSecret"]) diff --git a/packages/sqlite-plugin/src/entity/MarkAsNotSuitLog.ts b/packages/sqlite-plugin/src/entity/MarkAsNotSuitLog.ts index c3325fc..bd679d5 100644 --- a/packages/sqlite-plugin/src/entity/MarkAsNotSuitLog.ts +++ b/packages/sqlite-plugin/src/entity/MarkAsNotSuitLog.ts @@ -1,7 +1,7 @@ import { JobSource, MarkAsNotSuitOp, MarkAsNotSuitReason } from "../enums"; -import { requireTypeorm } from "../utils/module-loader"; +import * as typeorm from 'typeorm'; import { ChatStartupFrom } from "./ChatStartupLog"; -const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm() +const { Entity, Column, PrimaryGeneratedColumn } = typeorm @Entity() export class MarkAsNotSuitLog { diff --git a/packages/sqlite-plugin/src/entity/UserInfo.ts b/packages/sqlite-plugin/src/entity/UserInfo.ts index 665f1f7..1f73de3 100644 --- a/packages/sqlite-plugin/src/entity/UserInfo.ts +++ b/packages/sqlite-plugin/src/entity/UserInfo.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { Entity, Column, PrimaryColumn } = requireTypeorm() +import * as typeorm from 'typeorm'; +const { Entity, Column, PrimaryColumn } = typeorm @Entity() export class UserInfo { diff --git a/packages/sqlite-plugin/src/entity/VBossLibrary.ts b/packages/sqlite-plugin/src/entity/VBossLibrary.ts index d14959d..cbe83ff 100644 --- a/packages/sqlite-plugin/src/entity/VBossLibrary.ts +++ b/packages/sqlite-plugin/src/entity/VBossLibrary.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { ViewEntity, ViewColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { ViewEntity, ViewColumn } = typeorm; @ViewEntity({ expression: `SELECT boss_info.encryptBossId, diff --git a/packages/sqlite-plugin/src/entity/VChatStartupLog.ts b/packages/sqlite-plugin/src/entity/VChatStartupLog.ts index 49126c9..7aac526 100644 --- a/packages/sqlite-plugin/src/entity/VChatStartupLog.ts +++ b/packages/sqlite-plugin/src/entity/VChatStartupLog.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { ViewEntity, ViewColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { ViewEntity, ViewColumn } = typeorm; @ViewEntity({ expression: `SELECT job_info.*, diff --git a/packages/sqlite-plugin/src/entity/VCompanyLibrary.ts b/packages/sqlite-plugin/src/entity/VCompanyLibrary.ts index 5ac52b2..5cfa87b 100644 --- a/packages/sqlite-plugin/src/entity/VCompanyLibrary.ts +++ b/packages/sqlite-plugin/src/entity/VCompanyLibrary.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { ViewEntity, ViewColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { ViewEntity, ViewColumn } = typeorm; @ViewEntity({ expression: `SELECT company_info.* diff --git a/packages/sqlite-plugin/src/entity/VJobLibrary.ts b/packages/sqlite-plugin/src/entity/VJobLibrary.ts index c3c3c58..8757135 100644 --- a/packages/sqlite-plugin/src/entity/VJobLibrary.ts +++ b/packages/sqlite-plugin/src/entity/VJobLibrary.ts @@ -1,5 +1,5 @@ -import { requireTypeorm } from "../utils/module-loader"; -const { ViewEntity, ViewColumn } = requireTypeorm(); +import * as typeorm from 'typeorm'; +const { ViewEntity, ViewColumn } = typeorm; @ViewEntity({ expression: `SELECT job_info.*, diff --git a/packages/sqlite-plugin/src/entity/VMarkAsNotSuitLog.ts b/packages/sqlite-plugin/src/entity/VMarkAsNotSuitLog.ts index 81b7730..60d54bb 100644 --- a/packages/sqlite-plugin/src/entity/VMarkAsNotSuitLog.ts +++ b/packages/sqlite-plugin/src/entity/VMarkAsNotSuitLog.ts @@ -1,7 +1,7 @@ -import { requireTypeorm } from "../utils/module-loader"; +import * as typeorm from 'typeorm'; import { ChatStartupFrom } from "./ChatStartupLog"; import { MarkAsNotSuitReason } from "../enums"; -const { ViewEntity, ViewColumn } = requireTypeorm(); +const { ViewEntity, ViewColumn } = typeorm; @ViewEntity({ expression: `SELECT job_info.*, diff --git a/packages/sqlite-plugin/src/index.ts b/packages/sqlite-plugin/src/index.ts index 82c7e20..1893c42 100644 --- a/packages/sqlite-plugin/src/index.ts +++ b/packages/sqlite-plugin/src/index.ts @@ -1,6 +1,5 @@ import "reflect-metadata"; import { type DataSource } from "typeorm"; -import { requireTypeorm } from "./utils/module-loader"; import { BossInfo } from "./entity/BossInfo"; import { BossInfoChangeLog } from "./entity/BossInfoChangeLog"; @@ -40,10 +39,11 @@ import { AddColumnForMarkAsNotSuitLog1746092370665 } from "./migrations/17460923 import { Init1000000000000 } from "./migrations/1000000000000-Init"; import { AddJobSourceColumnForChatStartupLogAndMarkAsNotSuitLog1752380078526 } from "./migrations/1752380078526-AddJobSourceColumnForChatStartupLogAndMarkAsNotSuitLog"; import { AddJobHireStatusTable1766466476822 } from "./migrations/1766466476822-AddJobHireStatusTable"; -const lodashImportPromise = import('lodash-es') +import chunk from 'lodash/chunk' +import * as typeorm from 'typeorm' export function initDb(dbFilePath) { - const { DataSource } = requireTypeorm() + const { DataSource } = typeorm const appDataSource = new DataSource({ type: "sqlite", synchronize: false, @@ -202,7 +202,6 @@ export default class SqlitePlugin { if (chattedJobIds.length === 0) { return } - const { chunk } = await lodashImportPromise const chattedJobIdChunks = chunk(chattedJobIds, 200) const chattedBossIds = []; for (const chattedJobIdChunk of chattedJobIdChunks) { diff --git a/packages/sqlite-plugin/src/utils/module-loader.ts b/packages/sqlite-plugin/src/utils/module-loader.ts deleted file mode 100644 index ff7ea5d..0000000 --- a/packages/sqlite-plugin/src/utils/module-loader.ts +++ /dev/null @@ -1,4 +0,0 @@ -export function requireTypeorm () { - const importResult = require('typeorm') - return importResult -} \ No newline at end of file diff --git a/packages/ui/package.json b/packages/ui/package.json index e453565..958dbd6 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -33,14 +33,14 @@ "@geekgeekrun/dingtalk-plugin": "workspace:*", "@geekgeekrun/geek-auto-start-chat-with-boss": "workspace:*", "@geekgeekrun/launch-bosszhipin-login-page-with-preload-extension": "workspace:*", + "@geekgeekrun/pm": "workspace:*", "@geekgeekrun/puppeteer-extra-plugin-laodeng": "workspace:*", "@geekgeekrun/sqlite-plugin": "workspace:*", "@geekgeekrun/utils": "workspace:*", - "@geekgeekrun/pm": "workspace:*", "JSONStream": "^1.3.5", "diff": "^7.0.0", "electron-updater": "^6.1.7", - "lodash-es": "^4.17.21", + "lodash": "^4.17.21", "minimist": "^1.2.8", "mitt": "^3.0.1", "node-machine-id": "^1.1.12", @@ -58,6 +58,7 @@ "@inquirer/select": "^4.0.1", "@puppeteer/browsers": "^2.11.0", "@rushstack/eslint-patch": "^1.7.1", + "@types/lodash": "^4.17.23", "@types/node": "^18.19.9", "@unocss/preset-attributify": "^0.58.5", "@unocss/preset-icons": "^0.58.5", diff --git a/packages/ui/src/renderer/src/features/FlyingCompanyLogoList/index.vue b/packages/ui/src/renderer/src/features/FlyingCompanyLogoList/index.vue index c66eab7..a5b4c0b 100644 --- a/packages/ui/src/renderer/src/features/FlyingCompanyLogoList/index.vue +++ b/packages/ui/src/renderer/src/features/FlyingCompanyLogoList/index.vue @@ -11,7 +11,7 @@