create-skweb 3.3.2 → 3.3.4

package/.turbo/turbo-build.log

@@ -1,17 +1,17 @@
 
-> create-skweb@3.3.2 prebuild
+> create-skweb@3.3.4 prebuild
 > tsc --outDir dist --rootDir src
 
 ⠙
-> create-skweb@3.3.2 build
+> create-skweb@3.3.4 build
 > rollup -c rollup.config.mjs && node scripts/inject-shebang.mjs && chmod +x dist/cli.js
 
 ⠙
 src/index.ts → dist/index.js...
 (!) [plugin typescript] @rollup/plugin-typescript: outputToFilesystem option is defaulting to true.
-created dist/index.js in 354ms
+created dist/index.js in 374ms
 
 src/cli.ts → dist/cli.js...
-created dist/cli.js in 183ms
+created dist/cli.js in 179ms
 [inject-shebang] Shebang added to /Users/stayknight/projects/skweb-mono/tools/create-skweb/dist/cli.js
 ⠙

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # create-skweb
 
+## 3.3.4
+
+### Patch Changes
+
+- chore(create-skweb): v3.3.4 - 模型改为 initModel 格式，移除 declare 声明，修复 SysUser 导入方式
+
+## 3.3.3
+
+### Patch Changes
+
+- chore(create-skweb): v3.3.3 - 抽取共享配置模块，统一数据库和 Redis 连接配置
+
 ## 3.3.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-skweb",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "Create a new SKWeb project with TypeScript, CJS, or MJS support",
   "type": "module",
   "main": "dist/index.js",

package/templates/cjs/src/commands/migrate.js

@@ -3,18 +3,13 @@ require('dotenv/config')
 const path = require('path')
 const { Database } = require('skweb-sequelize')
 const { logger } = require('../utils/logger.js')
+const { getDatabaseConfig } = require('../config/database.js')
 
 async function runMigrate() {
   logger.info('[migrate] Running database migrations...')
 
   const db = new Database({
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true' ? (msg) => logger.debug(msg) : false
   })
 
@@ -31,4 +26,4 @@ if (require.main === module) {
   })
 }
 
-module.exports = { runMigrate }
+module.exports = { runMigrate }

package/templates/cjs/src/commands/seed.js

@@ -4,18 +4,13 @@ const path = require('path')
 const fs = require('fs')
 const { Database } = require('skweb-sequelize')
 const { logger } = require('../utils/logger.js')
+const { getDatabaseConfig } = require('../config/database.js')
 
 async function runSeed() {
   logger.info('[seed] Initializing database with seed data...')
 
   const db = new Database({
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true' ? (msg) => logger.debug(msg) : false
   })
 

package/templates/cjs/src/config/database.js

@@ -0,0 +1,13 @@
+function getDatabaseConfig() {
+  return {
+    host: process.env.DB_HOST || '127.0.0.1',
+    port: Number(process.env.DB_PORT) || 3306,
+    username: process.env.DB_USER || 'root',
+    password: process.env.DB_PASS || '',
+    database: process.env.DB_NAME || 'test-project',
+    dialect: process.env.DB_DIALECT || 'mysql',
+    charset: process.env.DB_CHARSET || 'utf8mb4'
+  }
+}
+
+module.exports = { getDatabaseConfig }

package/templates/cjs/src/config/redis.js

@@ -0,0 +1,9 @@
+function getRedisConfig() {
+  return {
+    host: process.env.REDIS_HOST || '127.0.0.1',
+    port: Number(process.env.REDIS_PORT) || 6379,
+    password: process.env.REDIS_PASSWORD || undefined
+  }
+}
+
+module.exports = { getRedisConfig }

package/templates/cjs/src/controllers/user.js

@@ -1,7 +1,5 @@
 const createHttpError = require('http-errors')
-const { framework } = require('../web-framework.js')
-
-const { SysUser } = framework.models
+const { SysUser } = require('../models/SysUser.js')
 
 /**
  * @swagger

package/templates/cjs/src/cron-framework.js

@@ -1,23 +1,15 @@
 // @ts-nocheck
 const { CronFramework } = require('skweb-framework')
 const { logger } = require('./utils/logger.js')
+const { getDatabaseConfig } = require('./config/database.js')
+const { getRedisConfig } = require('./config/redis.js')
 
 const framework = new CronFramework({
   db: {
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true'
   },
-  redis: {
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    port: Number(process.env.REDIS_PORT) || 6379,
-    password: process.env.REDIS_PASSWORD || undefined
-  },
+  redis: getRedisConfig(),
   channel: 'cron:task:cmd',
   logger,
   onSaveTask: async (taskData) => {
@@ -40,4 +32,4 @@ const framework = new CronFramework({
   }
 })
 
-module.exports = { framework }
+module.exports = { framework }

package/templates/cjs/src/models/SysUser.js

@@ -1,38 +1,42 @@
 const { Model, DataTypes } = require('sequelize')
 
-module.exports = (sequelize) => {
-  class SysUser extends Model {}
-  SysUser.init({
-    id: {
-      type: DataTypes.INTEGER,
-      primaryKey: true,
-      autoIncrement: true
-    },
-    username: {
-      type: DataTypes.STRING(50),
-      allowNull: false,
-      unique: true
-    },
-    password: {
-      type: DataTypes.STRING(255),
-      allowNull: false
-    },
-    email: {
-      type: DataTypes.STRING(100)
-    },
-    phone: {
-      type: DataTypes.STRING(20)
-    },
-    status: {
-      type: DataTypes.TINYINT,
-      defaultValue: 1
-    }
-  }, {
-    sequelize,
-    modelName: 'SysUser',
-    tableName: 'sys_users',
-    timestamps: true,
-    underscored: true
-  })
-  return SysUser
+class SysUser extends Model {
+  static initModel(sequelize) {
+    SysUser.init({
+      id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true
+      },
+      username: {
+        type: DataTypes.STRING(50),
+        allowNull: false,
+        unique: true
+      },
+      password: {
+        type: DataTypes.STRING(255),
+        allowNull: false
+      },
+      email: {
+        type: DataTypes.STRING(100)
+      },
+      phone: {
+        type: DataTypes.STRING(20)
+      },
+      status: {
+        type: DataTypes.TINYINT,
+        defaultValue: 1
+      }
+    }, {
+      sequelize,
+      modelName: 'SysUser',
+      tableName: 'sys_users',
+      timestamps: true,
+      underscored: true
+    })
+
+    return SysUser
+  }
 }
+
+module.exports = { SysUser }

package/templates/cjs/src/web-framework.js

@@ -1,22 +1,14 @@
 // @ts-nocheck
 const { WebFramework } = require('skweb-framework')
+const { getDatabaseConfig } = require('./config/database.js')
+const { getRedisConfig } = require('./config/redis.js')
 
 const framework = new WebFramework({
   db: {
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true'
   },
-  redis: {
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    port: Number(process.env.REDIS_PORT) || 6379,
-    password: process.env.REDIS_PASSWORD || undefined
-  }
+  redis: getRedisConfig()
 })
 
-module.exports = { framework }
+module.exports = { framework }

package/templates/mjs/src/commands/migrate.js

@@ -4,6 +4,7 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { Database } from 'skweb-sequelize'
 import logger from '../utils/logger.js'
+import { getDatabaseConfig } from '../config/database.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -12,13 +13,7 @@ async function runMigrate() {
   logger.info('[migrate] Running database migrations...')
 
   const db = new Database({
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true' ? (msg) => logger.debug(msg) : false
   })
 
@@ -34,4 +29,4 @@ if (isMainModule) {
     logger.error('[migrate] Fatal error:', err)
     process.exit(1)
   })
-}
+}

package/templates/mjs/src/commands/seed.js

@@ -4,6 +4,7 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { Database } from 'skweb-sequelize'
 import logger from '../utils/logger.js'
+import { getDatabaseConfig } from '../config/database.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -12,13 +13,7 @@ async function runSeed() {
   logger.info('[seed] Initializing database with seed data...')
 
   const db = new Database({
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true' ? (msg) => logger.debug(msg) : false
   })
 

package/templates/mjs/src/config/database.js

@@ -0,0 +1,11 @@
+export function getDatabaseConfig() {
+  return {
+    host: process.env.DB_HOST || '127.0.0.1',
+    port: Number(process.env.DB_PORT) || 3306,
+    username: process.env.DB_USER || 'root',
+    password: process.env.DB_PASS || '',
+    database: process.env.DB_NAME || 'test-project',
+    dialect: process.env.DB_DIALECT || 'mysql',
+    charset: process.env.DB_CHARSET || 'utf8mb4'
+  }
+}

package/templates/mjs/src/config/redis.js

@@ -0,0 +1,7 @@
+export function getRedisConfig() {
+  return {
+    host: process.env.REDIS_HOST || '127.0.0.1',
+    port: Number(process.env.REDIS_PORT) || 6379,
+    password: process.env.REDIS_PASSWORD || undefined
+  }
+}

package/templates/mjs/src/controllers/user.js

@@ -1,7 +1,5 @@
 import createHttpError from 'http-errors'
-import { framework } from '../web-framework.js'
-
-const { SysUser } = framework.models
+import { SysUser } from '../models/SysUser.js'
 
 /**
  * @swagger

package/templates/mjs/src/cron-framework.js

@@ -1,23 +1,15 @@
 // @ts-nocheck
 import { CronFramework } from 'skweb-framework'
 import logger from './utils/logger.js'
+import { getDatabaseConfig } from './config/database.js'
+import { getRedisConfig } from './config/redis.js'
 
 const framework = new CronFramework({
   db: {
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true'
   },
-  redis: {
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    port: Number(process.env.REDIS_PORT) || 6379,
-    password: process.env.REDIS_PASSWORD || undefined
-  },
+  redis: getRedisConfig(),
   channel: 'cron:task:cmd',
   logger,
   onSaveTask: async (taskData) => {
@@ -40,4 +32,4 @@ const framework = new CronFramework({
   }
 })
 
-export { framework }
+export { framework }

package/templates/mjs/src/models/SysUser.js

@@ -1,40 +1,40 @@
 import { Model, DataTypes } from 'sequelize'
 
-export default (sequelize) => {
-  class SysUser extends Model {}
+export class SysUser extends Model {
+  static initModel(sequelize) {
+    SysUser.init({
+      id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true
+      },
+      username: {
+        type: DataTypes.STRING(50),
+        allowNull: false,
+        unique: true
+      },
+      password: {
+        type: DataTypes.STRING(255),
+        allowNull: false
+      },
+      email: {
+        type: DataTypes.STRING(100)
+      },
+      phone: {
+        type: DataTypes.STRING(20)
+      },
+      status: {
+        type: DataTypes.TINYINT,
+        defaultValue: 1
+      }
+    }, {
+      sequelize,
+      modelName: 'SysUser',
+      tableName: 'sys_users',
+      timestamps: true,
+      underscored: true
+    })
 
-  SysUser.init({
-    id: {
-      type: DataTypes.INTEGER,
-      primaryKey: true,
-      autoIncrement: true
-    },
-    username: {
-      type: DataTypes.STRING(50),
-      allowNull: false,
-      unique: true
-    },
-    password: {
-      type: DataTypes.STRING(255),
-      allowNull: false
-    },
-    email: {
-      type: DataTypes.STRING(100)
-    },
-    phone: {
-      type: DataTypes.STRING(20)
-    },
-    status: {
-      type: DataTypes.TINYINT,
-      defaultValue: 1
-    }
-  }, {
-    sequelize,
-    modelName: 'SysUser',
-    tableName: 'sys_users',
-    timestamps: true,
-    underscored: true
-  })
-
-  return SysUser
-}
+    return SysUser
+  }
+}

package/templates/mjs/src/web-framework.js

@@ -1,22 +1,14 @@
 // @ts-nocheck
 import { WebFramework } from 'skweb-framework'
+import { getDatabaseConfig } from './config/database.js'
+import { getRedisConfig } from './config/redis.js'
 
 const framework = new WebFramework({
   db: {
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: process.env.DB_DIALECT || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true'
   },
-  redis: {
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    port: Number(process.env.REDIS_PORT) || 6379,
-    password: process.env.REDIS_PASSWORD || undefined
-  }
+  redis: getRedisConfig()
 })
 
-export { framework }
+export { framework }

package/templates/ts/src/commands/migrate.ts

@@ -4,6 +4,7 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { Database } from 'skweb-sequelize'
 import logger from '../utils/logger.js'
+import { getDatabaseConfig } from '../config/database.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -12,13 +13,7 @@ async function runMigrate(): Promise<void> {
   logger.info('[migrate] Running database migrations...')
 
   const db = new Database({
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: (process.env.DB_DIALECT as 'mysql' | 'postgres' | 'sqlite' | 'mariadb') || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true' ? (msg: string) => logger.debug(msg) : false
   })
 
@@ -34,4 +29,4 @@ if (isMainModule) {
     logger.error('[migrate] Fatal error:', err)
     process.exit(1)
   })
-}
+}

package/templates/ts/src/commands/seed.ts

@@ -4,6 +4,7 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { Database } from 'skweb-sequelize'
 import logger from '../utils/logger.js'
+import { getDatabaseConfig } from '../config/database.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -12,13 +13,7 @@ async function runSeed(): Promise<void> {
   logger.info('[seed] Initializing database with seed data...')
 
   const db = new Database({
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: (process.env.DB_DIALECT as 'mysql' | 'postgres' | 'sqlite' | 'mariadb') || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true' ? (msg: string) => logger.debug(msg) : false
   })
 

package/templates/ts/src/config/database.ts

@@ -0,0 +1,13 @@
+import type { DatabaseConfig } from 'skweb-sequelize'
+
+export function getDatabaseConfig(): DatabaseConfig {
+  return {
+    host: process.env.DB_HOST || '127.0.0.1',
+    port: Number(process.env.DB_PORT) || 3306,
+    username: process.env.DB_USER || 'root',
+    password: process.env.DB_PASS || '',
+    database: process.env.DB_NAME || 'test-project',
+    dialect: (process.env.DB_DIALECT as any) || 'mysql',
+    charset: process.env.DB_CHARSET || 'utf8mb4'
+  }
+}

package/templates/ts/src/config/redis.ts

@@ -0,0 +1,9 @@
+import type { RedisOptions } from 'skweb-redis'
+
+export function getRedisConfig(): RedisOptions {
+  return {
+    host: process.env.REDIS_HOST || '127.0.0.1',
+    port: Number(process.env.REDIS_PORT) || 6379,
+    password: process.env.REDIS_PASSWORD || undefined
+  }
+}

package/templates/ts/src/controllers/user.ts

@@ -1,7 +1,5 @@
 import createHttpError from 'http-errors'
-import { framework } from '../web-framework.js'
-
-const { SysUser } = framework.models
+import { SysUser } from '../models/SysUser.js'
 
 /**
  * @swagger

package/templates/ts/src/cron-framework.ts

@@ -1,23 +1,15 @@
 // @ts-nocheck
 import { CronFramework } from 'skweb-framework'
 import logger from './utils/logger.js'
+import { getDatabaseConfig } from './config/database.js'
+import { getRedisConfig } from './config/redis.js'
 
 const framework = new CronFramework({
   db: {
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: (process.env.DB_DIALECT as any) || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true'
   },
-  redis: {
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    port: Number(process.env.REDIS_PORT) || 6379,
-    password: process.env.REDIS_PASSWORD || undefined
-  },
+  redis: getRedisConfig(),
   channel: 'cron:task:cmd',
   logger,
   onSaveTask: async (taskData: { taskId: string; cache: unknown; data: unknown }) => {
@@ -40,4 +32,4 @@ const framework = new CronFramework({
   }
 })
 
-export { framework }
+export { framework }

package/templates/ts/src/models/SysUser.ts

@@ -1,49 +1,40 @@
 import { Model, DataTypes, type Sequelize, type ModelStatic } from 'sequelize'
 
-export default (sequelize: Sequelize): ModelStatic<Model> => {
-  class SysUser extends Model {
-    declare id: number
-    declare username: string
-    declare password: string
-    declare email: string
-    declare phone: string
-    declare status: number
-    declare createdAt: Date
-    declare updatedAt: Date
-  }
-
-  SysUser.init({
-    id: {
-      type: DataTypes.INTEGER,
-      primaryKey: true,
-      autoIncrement: true
-    },
-    username: {
-      type: DataTypes.STRING(50),
-      allowNull: false,
-      unique: true
-    },
-    password: {
-      type: DataTypes.STRING(255),
-      allowNull: false
-    },
-    email: {
-      type: DataTypes.STRING(100)
-    },
-    phone: {
-      type: DataTypes.STRING(20)
-    },
-    status: {
-      type: DataTypes.TINYINT,
-      defaultValue: 1
-    }
-  }, {
-    sequelize,
-    modelName: 'SysUser',
-    tableName: 'sys_users',
-    timestamps: true,
-    underscored: true
-  })
+export class SysUser extends Model {
+  static initModel(sequelize: Sequelize): ModelStatic<Model> {
+    SysUser.init({
+      id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true
+      },
+      username: {
+        type: DataTypes.STRING(50),
+        allowNull: false,
+        unique: true
+      },
+      password: {
+        type: DataTypes.STRING(255),
+        allowNull: false
+      },
+      email: {
+        type: DataTypes.STRING(100)
+      },
+      phone: {
+        type: DataTypes.STRING(20)
+      },
+      status: {
+        type: DataTypes.TINYINT,
+        defaultValue: 1
+      }
+    }, {
+      sequelize,
+      modelName: 'SysUser',
+      tableName: 'sys_users',
+      timestamps: true,
+      underscored: true
+    })
 
-  return SysUser
-}
+    return SysUser
+  }
+}

package/templates/ts/src/web-framework.ts

@@ -1,22 +1,14 @@
 // @ts-nocheck
 import { WebFramework } from 'skweb-framework'
+import { getDatabaseConfig } from './config/database.js'
+import { getRedisConfig } from './config/redis.js'
 
 const framework = new WebFramework({
   db: {
-    host: process.env.DB_HOST || '127.0.0.1',
-    port: Number(process.env.DB_PORT) || 3306,
-    username: process.env.DB_USER || 'root',
-    password: process.env.DB_PASS || '',
-    database: process.env.DB_NAME || 'test-project',
-    dialect: (process.env.DB_DIALECT as any) || 'mysql',
-    charset: process.env.DB_CHARSET || 'utf8mb4',
+    ...getDatabaseConfig(),
     logging: process.env.DEBUG_DB === 'true'
   },
-  redis: {
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    port: Number(process.env.REDIS_PORT) || 6379,
-    password: process.env.REDIS_PASSWORD || undefined
-  }
+  redis: getRedisConfig()
 })
 
-export { framework }
+export { framework }