From 6698e2f6aeea3f7d533d8ba72e0a33fb920d0f93 Mon Sep 17 00:00:00 2001 From: CrescentLeaf Date: Mon, 7 Jul 2025 19:56:45 +0800 Subject: [PATCH 1/3] User.ts --- server/data/DataBaseManager.ts | 2 +- server/data/User.ts | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/data/DataBaseManager.ts b/server/data/DataBaseManager.ts index abef840..f4b822e 100644 --- a/server/data/DataBaseManager.ts +++ b/server/data/DataBaseManager.ts @@ -1,5 +1,5 @@ // @ts-types="npm:sequelize" -import { Sequelize, Op, Model, DataTypes } from 'sequelize' +import { Sequelize } from 'sequelize' import Config from "../config.ts" import User from "./User.ts"; diff --git a/server/data/User.ts b/server/data/User.ts index 5448a93..edb03ac 100644 --- a/server/data/User.ts +++ b/server/data/User.ts @@ -1,5 +1,5 @@ // @ts-types="npm:sequelize" -import { Sequelize, Op, Model, DataTypes } from 'sequelize' +import { Sequelize, Model, DataTypes } from 'sequelize' export default class User extends Model { declare created_id: number @@ -9,7 +9,19 @@ export default class User extends Model { type: DataTypes.INTEGER.UNSIGNED, autoIncrement: true, primaryKey: true, - } + }, + user_name: { + type: DataTypes.STRING, + allowNull: true, + }, + nick_name: { + type: DataTypes.STRING, + allowNull: true, + }, + avatar: { + type: DataTypes.BLOB, + }, + }, { sequelize: sequelize, tableName: name, From c80fa5cd3c5d0c4f72b8cf0741abf09e30328b99 Mon Sep 17 00:00:00 2001 From: CrescentLeaf Date: Sun, 13 Jul 2025 00:32:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?User.ts:=20=E6=9B=B4=E6=96=B0=20TypeScript?= =?UTF-8?q?=20=E5=AE=9A=E7=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/data/User.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/data/User.ts b/server/data/User.ts index edb03ac..67de0ad 100644 --- a/server/data/User.ts +++ b/server/data/User.ts @@ -1,8 +1,12 @@ // @ts-types="npm:sequelize" -import { Sequelize, Model, DataTypes } from 'sequelize' +import { Sequelize, Model, DataTypes, CreationOptional } from 'sequelize' export default class User extends Model { - declare created_id: number + declare created_id: CreationOptional + declare user_name: string | null + declare nick_name: string | null + declare avatar: Blob + static async initTable(sequelize: Sequelize, name: string) { this.init({ created_id: { @@ -20,8 +24,8 @@ export default class User extends Model { }, avatar: { type: DataTypes.BLOB, + allowNull: true, }, - }, { sequelize: sequelize, tableName: name, From c8c80685ec8a375c92ef37b82e3fe8d79c2e2070 Mon Sep 17 00:00:00 2001 From: CrescentLeaf Date: Mon, 14 Jul 2025 21:51:36 +0800 Subject: [PATCH 3/3] buzhidao --- deno.jsonc | 1 - server/data/DataBaseManager.ts | 10 ++-------- server/data/User.ts | 36 ++-------------------------------- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/deno.jsonc b/deno.jsonc index 8b49fe4..9674c56 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -5,7 +5,6 @@ "express": "npm:express@^4.21.2", "socket.io": "npm:socket.io@^4.8.1", // Database - "sequelize": "npm:sequelize@^6.37.7", "sqlite3": "npm:sqlite3@^5.1.7", // Front-end Compiling "@babel/core": "npm:@babel/core@^7.26.10", diff --git a/server/data/DataBaseManager.ts b/server/data/DataBaseManager.ts index f4b822e..1c28470 100644 --- a/server/data/DataBaseManager.ts +++ b/server/data/DataBaseManager.ts @@ -1,10 +1,7 @@ -// @ts-types="npm:sequelize" -import { Sequelize } from 'sequelize' import Config from "../config.ts" import User from "./User.ts"; abstract class BaseDataManager { - declare sequelize: Sequelize declare name: string constructor(name: string) { this.init(name) @@ -12,10 +9,7 @@ abstract class BaseDataManager { } private init(name: string) { this.name = name - this.sequelize = new Sequelize({ - dialect: 'sqlite', - storage: Config.dirs.DATABASES_DIR + '/' + name + '.db' - }) + } abstract onInit(): void } @@ -23,7 +17,7 @@ abstract class BaseDataManager { class UserDataManager extends BaseDataManager { static SINGLE_INSTANCE = new UserDataManager('users') override onInit(): void { - User.initTable(this.sequelize, this.name) + } } diff --git a/server/data/User.ts b/server/data/User.ts index 67de0ad..12cebe3 100644 --- a/server/data/User.ts +++ b/server/data/User.ts @@ -1,35 +1,3 @@ -// @ts-types="npm:sequelize" -import { Sequelize, Model, DataTypes, CreationOptional } from 'sequelize' - -export default class User extends Model { - declare created_id: CreationOptional - declare user_name: string | null - declare nick_name: string | null - declare avatar: Blob - - static async initTable(sequelize: Sequelize, name: string) { - this.init({ - created_id: { - type: DataTypes.INTEGER.UNSIGNED, - autoIncrement: true, - primaryKey: true, - }, - user_name: { - type: DataTypes.STRING, - allowNull: true, - }, - nick_name: { - type: DataTypes.STRING, - allowNull: true, - }, - avatar: { - type: DataTypes.BLOB, - allowNull: true, - }, - }, { - sequelize: sequelize, - tableName: name, - }) - await this.sync({ alter: true }) - } +export default class User { + }