From c1f5d0256499e3354da401db22fabefa8d7ccb93 Mon Sep 17 00:00:00 2001 From: rosercode Date: Fri, 18 Sep 2026 12:32:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=90=E8=A1=8C=E6=97=B6=E9=85=8D=E7=BD=AE=E4=B8=8E?= =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8C=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E5=B9=B6=E5=AE=8C=E5=96=84=E6=89=93?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 数据库支持 SQLite / MySQL 运行时配置与切换，未配置时仍可启动，配置后自动建表 - 新增默认分类与标签初始化，注册用户自动创建 - 新增注册开关（默认关闭，可在系统设置开启；无用户时允许创建首个账号） - 合并数据库、注册与 AI 配置为「系统设置」页，拆分「模型使用情况」独立页面 - AI 一键设置支持新建分类与标签 - 前端构建产物打包进可执行 jar，后端增加 SPA 路由回退 - jar 更名为 finance-app，补全 Gradle Wrapper，移除 archive 任务 - 更新 DeepSeek 模型说明文案 --- README.md | 43 +- build.gradle | 56 ++- frontend/src/api/ai.ts | 20 +- frontend/src/api/database.ts | 45 +++ frontend/src/api/request.ts | 10 + frontend/src/api/user.ts | 17 + frontend/src/components/AiConfigPanel.vue | 174 ++++++++ frontend/src/components/AiUsagePanel.vue | 222 ++++++++++ .../src/components/DatabaseConfigPanel.vue | 237 +++++++++++ .../components/RegistrationConfigPanel.vue | 91 +++++ frontend/src/locales/messages.ts | 72 +++- frontend/src/router/index.ts | 57 ++- frontend/src/store/database.ts | 32 ++ frontend/src/store/registration.ts | 30 ++ frontend/src/views/AiSettings.vue | 379 ----------------- frontend/src/views/AiUsage.vue | 35 ++ frontend/src/views/DatabaseSettings.vue | 31 ++ frontend/src/views/Layout.vue | 10 +- frontend/src/views/Login.vue | 15 +- frontend/src/views/Settings.vue | 30 ++ frontend/src/views/TransactionList.vue | 99 ++++- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 251 ++++++++++++ gradlew.bat | 188 ++++----- settings.gradle | 2 +- .../rosercode/finance/FinanceApplication.java | 6 +- .../DatabaseNotConfiguredException.java | 22 + .../common/GlobalExceptionHandler.java | 71 ++++ .../finance/config/SpaErrorController.java | 92 +++++ .../finance/config/SpaRouteSupport.java | 36 ++ .../rosercode/finance/config/WebConfig.java | 5 +- .../finance/config/app/AppConfig.java | 20 + .../finance/config/app/AppConfigStore.java | 81 ++++ .../datasource/DataSourceContextHolder.java | 71 ++++ .../config/datasource/DataSourceType.java | 46 +++ .../config/datasource/DatabaseBootstrap.java | 34 ++ .../config/datasource/DatabaseConfig.java | 68 ++++ .../datasource/DatabaseConfigStore.java | 106 +++++ .../config/datasource/DynamicDataSource.java | 89 ++++ .../datasource/DynamicDataSourceConfig.java | 29 ++ .../config/datasource/SchemaInitializer.java | 51 +++ .../datasource/UnconfiguredDataSource.java | 66 +++ .../controller/DatabaseController.java | 64 +++ .../finance/controller/UserController.java | 32 +- .../rosercode/finance/dto/AiApplyRequest.java | 10 + .../finance/dto/DatabaseConfigRequest.java | 34 ++ .../dto/RegistrationUpdateRequest.java | 15 + .../finance/interceptor/JwtInterceptor.java | 8 + .../finance/service/DatabaseService.java | 39 ++ .../finance/service/RegistrationService.java | 32 ++ .../service/impl/AiSuggestionServiceImpl.java | 234 +++++++++-- .../service/impl/DatabaseServiceImpl.java | 382 ++++++++++++++++++ .../service/impl/DefaultDataInitializer.java | 127 ++++++ .../service/impl/RegistrationServiceImpl.java | 76 ++++ .../service/impl/StatisticsServiceImpl.java | 21 +- .../finance/service/impl/UserServiceImpl.java | 16 +- .../cn/rosercode/finance/vo/AiNewTagVO.java | 18 + .../rosercode/finance/vo/AiSuggestionVO.java | 9 + .../finance/vo/DatabaseStatusVO.java | 43 ++ .../finance/vo/RegistrationStatusVO.java | 21 + src/main/resources/application.yml | 9 +- src/main/resources/sql/schema-sqlite.sql | 125 ++++++ 63 files changed, 3783 insertions(+), 573 deletions(-) create mode 100644 frontend/src/api/database.ts create mode 100644 frontend/src/components/AiConfigPanel.vue create mode 100644 frontend/src/components/AiUsagePanel.vue create mode 100644 frontend/src/components/DatabaseConfigPanel.vue create mode 100644 frontend/src/components/RegistrationConfigPanel.vue create mode 100644 frontend/src/store/database.ts create mode 100644 frontend/src/store/registration.ts delete mode 100644 frontend/src/views/AiSettings.vue create mode 100644 frontend/src/views/AiUsage.vue create mode 100644 frontend/src/views/DatabaseSettings.vue create mode 100644 frontend/src/views/Settings.vue create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100755 gradlew create mode 100644 src/main/java/cn/rosercode/finance/common/DatabaseNotConfiguredException.java create mode 100644 src/main/java/cn/rosercode/finance/config/SpaErrorController.java create mode 100644 src/main/java/cn/rosercode/finance/config/SpaRouteSupport.java create mode 100644 src/main/java/cn/rosercode/finance/config/app/AppConfig.java create mode 100644 src/main/java/cn/rosercode/finance/config/app/AppConfigStore.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DataSourceContextHolder.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DataSourceType.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DatabaseBootstrap.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfig.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfigStore.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSource.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSourceConfig.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/SchemaInitializer.java create mode 100644 src/main/java/cn/rosercode/finance/config/datasource/UnconfiguredDataSource.java create mode 100644 src/main/java/cn/rosercode/finance/controller/DatabaseController.java create mode 100644 src/main/java/cn/rosercode/finance/dto/DatabaseConfigRequest.java create mode 100644 src/main/java/cn/rosercode/finance/dto/RegistrationUpdateRequest.java create mode 100644 src/main/java/cn/rosercode/finance/service/DatabaseService.java create mode 100644 src/main/java/cn/rosercode/finance/service/RegistrationService.java create mode 100644 src/main/java/cn/rosercode/finance/service/impl/DatabaseServiceImpl.java create mode 100644 src/main/java/cn/rosercode/finance/service/impl/DefaultDataInitializer.java create mode 100644 src/main/java/cn/rosercode/finance/service/impl/RegistrationServiceImpl.java create mode 100644 src/main/java/cn/rosercode/finance/vo/AiNewTagVO.java create mode 100644 src/main/java/cn/rosercode/finance/vo/DatabaseStatusVO.java create mode 100644 src/main/java/cn/rosercode/finance/vo/RegistrationStatusVO.java create mode 100644 src/main/resources/sql/schema-sqlite.sql diff --git a/README.md b/README.md index 2fb312c..3ff9760 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ | 层级 | 技术 | |---|---| -| 后端 | Spring Boot 3.3.6 + Java 21 + MyBatis-Plus + MySQL | +| 后端 | Spring Boot 3.3.6 + Java 21 + MyBatis-Plus + MySQL / SQLite | | 前端 | Vue 3 + TypeScript + Vite + Naive UI + ECharts | | 构建 | Gradle 8.13 (后端) / npm (前端) | | 认证 | JWT | @@ -19,20 +19,23 @@ - JDK 21.0.12.1 Temurin LTS，安装在 `D:\venv\jdk-21` - Node.js v24.0.0 -## 数据库初始化 +## 数据库配置 -首次运行前需建表，执行 `src/main/resources/sql/init.sql`，或运行 Python 脚本： +系统支持在服务启动后再配置数据库，无需启动前准备： -```bash -pip install pymysql bcrypt -python init_db.py -python generate_test_data.py -``` +- 未检测到配置时，应用仍可正常启动，前端会引导进入「初始化数据库」页面； +- 支持 **SQLite**（本地单文件，零配置）与 **MySQL** 两种数据库； +- 保存配置后立即生效并自动建表，无需手动执行 SQL； +- 配置持久化在 `config/database.json`（已加入 `.gitignore`），SQLite 数据默认位于 `data/` 目录； +- 新注册用户会自动获得一套默认分类与标签； +- 兼容旧部署：若无本地配置但存在 `DB_URL` / `DB_USERNAME` / `DB_PASSWORD` 环境变量，会自动作为首次配置并保存。 + +登录后可通过右上角用户菜单 →「数据库设置」随时切换数据库；切换后原数据库的数据保留，不做自动迁移。 ## 启动后端 ```bash -cd my-app +cd finance-app set JAVA_HOME=D:\venv\jdk-21 gradlew.bat bootRun ``` @@ -43,26 +46,36 @@ gradlew.bat bootRun ## 启动前端 ```bash -cd my-app/frontend +cd finance-app/frontend npm run dev ``` - 前端地址：http://localhost:5173 -## 打包 +## 构建可执行 jar（前后端一体化） -将项目源代码打包为 tar.gz（不含构建产物和 node_modules）： +将前端构建产物一并打入 jar，单文件同时提供前端页面与后端接口： ```bash -gradlew.bat archive +gradle bootJar ``` -输出文件：`build/distributions/finance-app-0.0.1-SNAPSHOT-{时间戳}.tar.gz` +- 该任务会先执行前端 `npm run build`，再把 `frontend/dist` 复制到 jar 内的 `BOOT-INF/classes/static/` +- 构建环境需具备 Node（开发容器通过 `NODE_HOME` 指向系统 nvm Node，npm 走本地 verdaccio 源） +- 输出文件：`build/libs/finance-app-0.0.1-SNAPSHOT.jar` + +启动（默认 8080，可另指定端口）： + +```bash +java -jar build/libs/finance-app-0.0.1-SNAPSHOT.jar --server.port=18081 +``` + +访问对应端口即可同时使用前端与接口；刷新 `/dashboard` 等子路由会由后端回退到 `index.html`。 ## 项目结构 ``` -my-app/ +finance-app/ ├── build.gradle ├── src/main/java/cn/rosercode/finance/ │ ├── controller/ # 接口层 diff --git a/build.gradle b/build.gradle index 59136b5..bd20214 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,8 @@ dependencies { implementation 'com.baomidou:mybatis-plus-spring-boot3-starter:3.5.12' implementation 'com.baomidou:mybatis-plus-jsqlparser:3.5.12' runtimeOnly 'com.mysql:mysql-connector-j' + // SQLite 驱动，用于本地文件数据库 + runtimeOnly 'org.xerial:sqlite-jdbc:3.46.1.3' implementation 'com.github.xiaoymin:knife4j-openapi3-jakarta-spring-boot-starter:4.5.0' @@ -54,24 +56,44 @@ tasks.named('test') { useJUnitPlatform() } -import java.time.LocalDateTime -import java.time.format.DateTimeFormatter +// ===== 前端构建与打包 ===== +def frontendDir = file("${projectDir}/frontend") +def frontendDistDir = file("${frontendDir}/dist") -task archive(type: Tar) { - def timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) - archiveFileName = "finance-app-${version}-${timestamp}.tar.gz" - destinationDirectory = file("${projectDir}/distributions") - compression = Compression.GZIP +// 解析 npm 可执行文件：优先使用 NODE_HOME，其次使用 PATH 中的 npm +def resolveNpm = { + def nodeHome = System.getenv('NODE_HOME') + return nodeHome ? "${nodeHome}/bin/npm" : 'npm' +} - from(projectDir) { - exclude 'build/**' - exclude '.gradle/**' - exclude 'distributions/**' - exclude 'frontend/node_modules/**' - exclude 'frontend/node_modules*/**' - exclude 'frontend/node_modules*.zip' - exclude 'frontend/dist/**' - exclude '**/*.log' - exclude 'logs/**' +// 安装前端依赖（node_modules 存在且 package.json 未变化时自动跳过） +tasks.register('npmInstall', Exec) { + group = 'frontend' + description = '安装前端依赖' + workingDir frontendDir + commandLine resolveNpm(), 'install' + inputs.file("${frontendDir}/package.json") + outputs.dir("${frontendDir}/node_modules") +} + +// 构建前端产物 +tasks.register('frontendBuild', Exec) { + group = 'frontend' + description = '构建前端产物（npm run build）' + dependsOn 'npmInstall' + workingDir frontendDir + commandLine resolveNpm(), 'run', 'build' + inputs.dir("${frontendDir}/src") + inputs.file("${frontendDir}/package.json") + inputs.file("${frontendDir}/index.html") + inputs.file("${frontendDir}/vite.config.ts") + outputs.dir(frontendDistDir) +} + +// 将前端产物打入可执行 jar 的静态资源目录，实现前后端一体化部署 +tasks.named('bootJar') { + dependsOn 'frontendBuild' + from(frontendDistDir) { + into 'BOOT-INF/classes/static' } } diff --git a/frontend/src/api/ai.ts b/frontend/src/api/ai.ts index fbb8218..c29a6ab 100644 --- a/frontend/src/api/ai.ts +++ b/frontend/src/api/ai.ts @@ -10,6 +10,12 @@ export interface AiConfig { model: string } +/** AI 建议新建的标签 */ +export interface AiNewTag { + name: string + color: string +} + /** 单条 AI 建议（按类型、备注、支付方式聚合后的一组记录） */ export interface AiSuggestion { transactionId: number @@ -17,8 +23,11 @@ export interface AiSuggestion { count: number categoryId: number | null categoryName: string | null + newCategoryName: string | null + newCategoryIcon: string | null tagIds: number[] tagNames: string[] + newTags: AiNewTag[] reason: string } @@ -83,8 +92,15 @@ export function suggestColor(name: string) { return request.post('/ai/color', { name }, { timeout: 60000 }) } -/** 一键应用建议：覆盖分类并追加标签 */ -export function applyAiSuggestions(suggestions: { transactionId: number; categoryId: number | null; tagIds: number[] }[]) { +/** 一键应用建议：覆盖分类并追加标签，标记为新建的分类/标签会先创建再关联 */ +export function applyAiSuggestions(suggestions: { + transactionId: number + categoryId: number | null + newCategoryName?: string | null + newCategoryIcon?: string | null + tagIds: number[] + newTags?: AiNewTag[] +}[]) { return request.post('/ai/apply', { suggestions }) } diff --git a/frontend/src/api/database.ts b/frontend/src/api/database.ts new file mode 100644 index 0000000..708df1d --- /dev/null +++ b/frontend/src/api/database.ts @@ -0,0 +1,45 @@ +// 数据库配置接口封装：状态查询、连接测试与配置保存 +import request from './request' + +/** 数据库类型 */ +export type DatabaseType = 'MYSQL' | 'SQLITE' + +/** 数据库配置请求参数 */ +export interface DatabaseConfigPayload { + type: DatabaseType + sqlitePath?: string + host?: string + port?: number + database?: string + username?: string + password?: string +} + +/** 数据库状态 */ +export interface DatabaseStatus { + configured: boolean + type?: DatabaseType + typeName?: string + summary?: string + configFile?: string + host?: string + port?: number + database?: string + username?: string + sqlitePath?: string +} + +/** 查询当前数据库配置状态 */ +export function getDatabaseStatus() { + return request.get('/database/status') +} + +/** 测试数据库连接是否可用 */ +export function testDatabaseConnection(data: DatabaseConfigPayload) { + return request.post('/database/test', data) +} + +/** 保存数据库配置并切换到新数据源 */ +export function saveDatabaseConfig(data: DatabaseConfigPayload) { + return request.post('/database/config', data) +} diff --git a/frontend/src/api/request.ts b/frontend/src/api/request.ts index 3c17cc0..90e2f0e 100644 --- a/frontend/src/api/request.ts +++ b/frontend/src/api/request.ts @@ -24,6 +24,16 @@ request.interceptors.response.use( const data = response.data // 如果业务状态码不是 200，视为请求失败 if (data.code !== 200) { + // 5031：数据库未配置，更新本地状态并跳转到配置引导页 + if (data.code === 5031) { + import('../store/database').then(({ useDatabaseStore }) => { + const databaseStore = useDatabaseStore() + databaseStore.setStatus(null) + if (router.currentRoute.value.path !== '/database-setup') { + router.push('/database-setup') + } + }) + } return Promise.reject(new Error(data.message || '请求失败')) } return data diff --git a/frontend/src/api/user.ts b/frontend/src/api/user.ts index 8cfd268..114d1d1 100644 --- a/frontend/src/api/user.ts +++ b/frontend/src/api/user.ts @@ -15,3 +15,20 @@ export function register(data: { username: string; password: string; nickname?: export function getUserInfo() { return request.get('/user/info') } + +/** 注册状态 */ +export interface RegistrationStatus { + enabled: boolean + firstUser: boolean + allowed: boolean +} + +/** 查询注册状态（无需登录） */ +export function getRegistrationStatus() { + return request.get('/user/registration-status') +} + +/** 更新注册开关（需登录） */ +export function updateRegistration(enabled: boolean) { + return request.put('/user/registration', { enabled }) +} diff --git a/frontend/src/components/AiConfigPanel.vue b/frontend/src/components/AiConfigPanel.vue new file mode 100644 index 0000000..9b8a034 --- /dev/null +++ b/frontend/src/components/AiConfigPanel.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/frontend/src/components/AiUsagePanel.vue b/frontend/src/components/AiUsagePanel.vue new file mode 100644 index 0000000..a234626 --- /dev/null +++ b/frontend/src/components/AiUsagePanel.vue @@ -0,0 +1,222 @@ + + + + + diff --git a/frontend/src/components/DatabaseConfigPanel.vue b/frontend/src/components/DatabaseConfigPanel.vue new file mode 100644 index 0000000..468df84 --- /dev/null +++ b/frontend/src/components/DatabaseConfigPanel.vue @@ -0,0 +1,237 @@ + + + + + diff --git a/frontend/src/components/RegistrationConfigPanel.vue b/frontend/src/components/RegistrationConfigPanel.vue new file mode 100644 index 0000000..dc533ab --- /dev/null +++ b/frontend/src/components/RegistrationConfigPanel.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/frontend/src/locales/messages.ts b/frontend/src/locales/messages.ts index 31dddf5..9954a2f 100644 --- a/frontend/src/locales/messages.ts +++ b/frontend/src/locales/messages.ts @@ -82,11 +82,72 @@ export default { transactions: { zh: '收支记录', en: 'Transactions', ja: '収支記録' }, categories: { zh: '分类管理', en: 'Categories', ja: 'カテゴリ管理' }, tags: { zh: '标签管理', en: 'Tags', ja: 'タグ管理' }, - aiSettings: { zh: 'AI 设置', en: 'AI Settings', ja: 'AI 設定' }, + settings: { zh: '系统设置', en: 'Settings', ja: 'システム設定' }, user: { zh: '用户', en: 'User', ja: 'ユーザー' }, logout: { zh: '退出', en: 'Sign Out', ja: 'ログアウト' }, }, + // 数据库设置 + database: { + title: { zh: '数据库设置', en: 'Database Settings', ja: 'データベース設定' }, + setupTitle: { zh: '初始化数据库', en: 'Initialize Database', ja: 'データベースの初期化' }, + intro: { zh: '可选择本地 SQLite 文件数据库或 MySQL 数据库。保存后立即生效并自动建表，原有数据库的数据保持不变。', en: 'Choose a local SQLite file database or a MySQL database. Changes take effect immediately with automatic table creation; data in the previous database is preserved.', ja: 'ローカルの SQLite ファイルデータベースまたは MySQL を選択できます。保存すると即時に反映され、テーブルが自動作成されます。以前のデータベースのデータは保持されます。' }, + setupIntro: { zh: '首次使用请先完成数据库配置。推荐零配置的 SQLite（本地文件），也可以连接已有的 MySQL。', en: 'Please configure a database before first use. SQLite (local file) requires no setup; you may also connect to an existing MySQL.', ja: '初回利用の前にデータベースを設定してください。設定不要の SQLite（ローカルファイル）を推奨します。既存の MySQL に接続することもできます。' }, + setupHint: { zh: '配置完成后即可登录使用；如需修改，可稍后在「数据库设置」中调整。', en: 'After configuration you can sign in. You can adjust it later in Database Settings.', ja: '設定後はログインして利用できます。後で「データベース設定」から変更できます。' }, + configured: { zh: '已配置', en: 'Configured', ja: '設定済み' }, + notConfigured: { zh: '未配置', en: 'Not configured', ja: '未設定' }, + currentType: { zh: '当前类型', en: 'Current type', ja: '現在の種類' }, + currentSummary: { zh: '连接地址', en: 'Connection', ja: '接続先' }, + configFile: { zh: '配置文件', en: 'Config file', ja: '設定ファイル' }, + type: { zh: '数据库类型', en: 'Database type', ja: 'データベースの種類' }, + sqlitePath: { zh: '数据库文件', en: 'Database file', ja: 'データベースファイル' }, + sqlitePathPlaceholder: { zh: '例如 data/finance.db', en: 'e.g. data/finance.db', ja: '例：data/finance.db' }, + sqliteHint: { zh: 'SQLite 为本地单文件数据库，路径相对于服务运行目录；建议使用 data 目录并做好持久化挂载。', en: 'SQLite is a single local file; the path is relative to the server working directory. Use a data directory with persistent storage.', ja: 'SQLite はローカルの単一ファイルです。パスはサーバーの作業ディレクトリからの相対パスです。data ディレクトリと永続化ストレージの利用を推奨します。' }, + sqlitePathRequired: { zh: '请填写 SQLite 数据库文件路径', en: 'Please enter the SQLite database file path', ja: 'SQLite データベースファイルのパスを入力してください' }, + mysqlRequired: { zh: '请填写主机地址、数据库名与用户名', en: 'Please fill in host, database and username', ja: 'ホスト、データベース名、ユーザー名を入力してください' }, + host: { zh: '主机地址', en: 'Host', ja: 'ホスト' }, + port: { zh: '端口', en: 'Port', ja: 'ポート' }, + database: { zh: '数据库名', en: 'Database', ja: 'データベース名' }, + username: { zh: '用户名', en: 'Username', ja: 'ユーザー名' }, + password: { zh: '密码', en: 'Password', ja: 'パスワード' }, + passwordPlaceholder: { zh: '请输入密码', en: 'Enter password', ja: 'パスワードを入力してください' }, + passwordKeep: { zh: '已配置，留空表示不修改', en: 'Configured; leave blank to keep unchanged', ja: '設定済み。空欄のままにすると変更されません' }, + test: { zh: '测试连接', en: 'Test connection', ja: '接続テスト' }, + save: { zh: '保存并应用', en: 'Save & Apply', ja: '保存して適用' }, + testSuccess: { zh: '连接成功', en: 'Connection succeeded', ja: '接続に成功しました' }, + testFailed: { zh: '连接失败', en: 'Connection failed', ja: '接続に失敗しました' }, + saveSuccess: { zh: '数据库配置已保存并生效', en: 'Database configuration saved and applied', ja: 'データベース設定を保存して適用しました' }, + saveFailed: { zh: '数据库配置失败', en: 'Failed to configure database', ja: 'データベース設定に失敗しました' }, + loadFailed: { zh: '加载数据库状态失败', en: 'Failed to load database status', ja: 'データベース状態の読み込みに失敗しました' }, + }, + + // 系统设置 + settings: { + title: { zh: '系统设置', en: 'Settings', ja: 'システム設定' }, + databaseSection: { zh: '数据库配置', en: 'Database', ja: 'データベース' }, + aiSection: { zh: 'AI 模型配置', en: 'AI Model', ja: 'AI モデル' }, + viewUsage: { zh: '使用情况', en: 'Usage', ja: '利用状況' }, + registrationSection: { zh: '注册设置', en: 'Registration', ja: '登録設定' }, + }, + + // 注册设置 + registration: { + statusOn: { zh: '已开启', en: 'Enabled', ja: '有効' }, + statusOff: { zh: '已关闭', en: 'Disabled', ja: '無効' }, + enabledHint: { zh: '关闭后新用户无法注册；系统无任何用户时仍可创建首个账号', en: 'When off, new users cannot sign up; the first account can still be created when there are no users.', ja: 'オフにすると新規登録できません。ユーザーが一人もいない場合は最初のアカウントを作成できます。' }, + firstUserHint: { zh: '当前系统暂无用户，可直接注册首个账号', en: 'No users yet — you can register the first account directly.', ja: '現在ユーザーがいないため、最初のアカウントを直接登録できます。' }, + save: { zh: '保存', en: 'Save', ja: '保存' }, + saveSuccess: { zh: '注册设置已保存', en: 'Registration settings saved', ja: '登録設定を保存しました' }, + saveFailed: { zh: '保存注册设置失败', en: 'Failed to save registration settings', ja: '登録設定の保存に失敗しました' }, + loadFailed: { zh: '加载注册状态失败', en: 'Failed to load registration status', ja: '登録状態の読み込みに失敗しました' }, + }, + + // 模型使用情况 + aiUsage: { + title: { zh: '模型使用情况', en: 'Model Usage', ja: 'モデル利用状況' }, + back: { zh: '返回设置', en: 'Back to Settings', ja: '設定に戻る' }, + }, + // 统计面板 dashboard: { title: { zh: '统计面板', en: 'Dashboard', ja: 'ダッシュボード' }, @@ -312,9 +373,7 @@ export default { // AI 智能建议 ai: { - title: { zh: 'AI 智能建议', en: 'AI Suggestions', ja: 'AI 提案' }, - intro: { zh: '配置 DeepSeek 后，可在收支记录页的「一键设置」中让 AI 根据记录内容推荐分类与标签。', en: 'After configuring DeepSeek, you can let AI recommend categories and tags for records in the "Batch Set" dialog on the Transactions page.', ja: 'DeepSeek を設定すると、収支記録ページの「一括設定」で AI が記録内容に応じてカテゴリとタグを提案できます。' }, - configTitle: { zh: '模型配置', en: 'Model Configuration', ja: 'モデル設定' }, + intro: { zh: '启用后，可在收支记录页使用 AI 智能建议（一键设置中推荐分类与标签）、智能记账与 AI 查询；调用量与 Token 消耗可在「模型使用情况」查看。', en: 'Once enabled, you can use AI suggestions (categories & tags in Batch Set), Smart Entry, and AI Query on the Transactions page; call counts and token usage are available under "Model Usage".', ja: '有効にすると、収支記録ページで AI 提案（一括設定でカテゴリとタグを推薦）、スマート入力、AI 検索を利用できます。呼び出し回数とトークン消費は「モデル利用状況」で確認できます。' }, enabledOn: { zh: '已启用', en: 'Enabled', ja: '有効' }, enabledOff: { zh: '未启用', en: 'Disabled', ja: '無効' }, enabled: { zh: '启用 AI 建议', en: 'Enable AI suggestions', ja: 'AI 提案を有効にする' }, @@ -349,7 +408,10 @@ export default { oneApplied: { zh: '已应用 AI 推荐分类', en: 'AI category applied', ja: 'AI が提案したカテゴリを適用しました' }, tagApplied: { zh: '已应用 AI 推荐标签', en: 'AI tags applied', ja: 'AI が提案したタグを適用しました' }, applyFailed: { zh: '应用建议失败', en: 'Failed to apply suggestions', ja: '提案の適用に失敗しました' }, - applyHint: { zh: '将覆盖分类并追加标签，确认后立即写入', en: 'Categories will be overwritten and tags appended; changes are written immediately.', ja: 'カテゴリは上書きされ、タグは追加されます。確定するとすぐに保存されます。' }, + applyHint: { zh: '将覆盖分类并追加标签；标记「新建」的分类/标签会在确认后创建', en: 'Categories will be overwritten and tags appended; items marked "New" will be created after confirmation.', ja: 'カテゴリは上書き、タグは追加されます。「新規」の項目は確定後に作成されます。' }, + newBadge: { zh: '新建', en: 'New', ja: '新規' }, + applyNewTitle: { zh: '确认新建', en: 'Confirm creation', ja: '新規作成の確認' }, + applyNewConfirm: { zh: '将新建 {categories} 个分类、{tags} 个标签，确认应用？', en: 'Will create {categories} category(ies) and {tags} tag(s). Continue?', ja: '{categories} 件のカテゴリと {tags} 件のタグを作成します。適用しますか？' }, needConfig: { zh: 'AI 未启用，请先在「AI 设置」中配置', en: 'AI is not enabled. Please configure it in AI Settings first.', ja: 'AI が有効になっていません。「AI 設定」で設定してください。' }, decorate: { emojiButton: { zh: 'AI 推荐', en: 'AI Pick', ja: 'AI におまかせ' }, diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 7d74ec8..57030b2 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -1,11 +1,18 @@ // 路由配置文件：定义应用的所有路由及导航守卫 import { createRouter, createWebHistory } from 'vue-router' import { useUserStore } from '../store/user' +import { useDatabaseStore } from '../store/database' +import { useRegistrationStore } from '../store/registration' // 创建路由实例，使用 HTML5 History 模式 const router = createRouter({ history: createWebHistory(), routes: [ + { + path: '/database-setup', + name: 'DatabaseSetup', + component: () => import('../views/DatabaseSettings.vue'), // 首次数据库配置引导页（无需登录） + }, { path: '/login', name: 'Login', @@ -42,17 +49,57 @@ const router = createRouter({ component: () => import('../views/TagManage.vue'), // 标签管理 }, { - path: 'ai-settings', - name: 'AiSettings', - component: () => import('../views/AiSettings.vue'), // AI 设置 + path: 'settings', + name: 'Settings', + component: () => import('../views/Settings.vue'), // 系统设置（数据库 + AI 模型） + }, + { + path: 'ai-usage', + name: 'AiUsage', + component: () => import('../views/AiUsage.vue'), // 模型使用情况 }, ], }, ], }) -// 全局前置守卫：未登录时拦截跳转至登录页 -router.beforeEach((to, _from, next) => { +// 全局前置守卫：优先校验数据库配置，再校验登录状态 +router.beforeEach(async (to, _from, next) => { + const databaseStore = useDatabaseStore() + // 首次进入时从后端加载数据库配置状态 + if (!databaseStore.loaded) { + await databaseStore.load() + } + + // 数据库未配置：强制引导到配置页，避免用户卡在无法登录的状态 + if (!databaseStore.configured) { + if (to.path === '/database-setup') { + next() + } else { + next('/database-setup') + } + return + } + + // 已配置数据库：配置引导页不再需要，跳转到登录或首页 + if (to.path === '/database-setup') { + const userStore = useUserStore() + next(userStore.token ? '/dashboard' : '/login') + return + } + + // 注册功能关闭且已有用户时，不允许访问注册页 + if (to.path === '/register') { + const registrationStore = useRegistrationStore() + if (!registrationStore.loaded) { + await registrationStore.load() + } + if (!registrationStore.status?.allowed) { + next('/login') + return + } + } + const userStore = useUserStore() // 如果目标页面不是登录/注册页，且没有 token，则重定向到登录页 if (to.path !== '/login' && to.path !== '/register' && !userStore.token) { diff --git a/frontend/src/store/database.ts b/frontend/src/store/database.ts new file mode 100644 index 0000000..a3ec4a7 --- /dev/null +++ b/frontend/src/store/database.ts @@ -0,0 +1,32 @@ +// 数据库状态管理模块：记录后端是否已完成数据库配置，供路由守卫与页面使用 +import { defineStore } from 'pinia' +import { ref } from 'vue' +import { getDatabaseStatus } from '../api/database' +import type { DatabaseStatus } from '../api/database' + +export const useDatabaseStore = defineStore('database', () => { + const configured = ref(false) // 后端是否已完成数据库配置 + const status = ref(null) // 当前数据库状态 + const loaded = ref(false) // 是否已从后端加载过状态 + + /** 从后端加载数据库状态 */ + async function load() { + try { + const res: any = await getDatabaseStatus() + setStatus(res.data) + } catch (e) { + // 状态查询失败时按未配置处理，引导用户前往配置页 + configured.value = false + loaded.value = true + } + } + + /** 更新本地保存的数据库状态 */ + function setStatus(next: DatabaseStatus | null) { + status.value = next + configured.value = !!next?.configured + loaded.value = true + } + + return { configured, status, loaded, load, setStatus } +}) diff --git a/frontend/src/store/registration.ts b/frontend/src/store/registration.ts new file mode 100644 index 0000000..ee3ae5f --- /dev/null +++ b/frontend/src/store/registration.ts @@ -0,0 +1,30 @@ +// 注册状态管理模块：缓存后端注册开关与是否允许注册，供登录页与路由守卫复用 +import { defineStore } from 'pinia' +import { ref } from 'vue' +import { getRegistrationStatus } from '../api/user' +import type { RegistrationStatus } from '../api/user' + +export const useRegistrationStore = defineStore('registration', () => { + const status = ref(null) // 注册状态 + const loaded = ref(false) // 是否已从后端加载过 + + /** 从后端加载注册状态，失败时按不允许注册处理 */ + async function load() { + try { + const res: any = await getRegistrationStatus() + status.value = res.data + } catch (e) { + status.value = null + } finally { + loaded.value = true + } + } + + /** 更新本地缓存的注册状态 */ + function setStatus(next: RegistrationStatus | null) { + status.value = next + loaded.value = true + } + + return { status, loaded, load, setStatus } +}) diff --git a/frontend/src/views/AiSettings.vue b/frontend/src/views/AiSettings.vue deleted file mode 100644 index 6debd0f..0000000 --- a/frontend/src/views/AiSettings.vue +++ /dev/null @@ -1,379 +0,0 @@ - - - - - diff --git a/frontend/src/views/AiUsage.vue b/frontend/src/views/AiUsage.vue new file mode 100644 index 0000000..5354f86 --- /dev/null +++ b/frontend/src/views/AiUsage.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/frontend/src/views/DatabaseSettings.vue b/frontend/src/views/DatabaseSettings.vue new file mode 100644 index 0000000..bedd55a --- /dev/null +++ b/frontend/src/views/DatabaseSettings.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/frontend/src/views/Layout.vue b/frontend/src/views/Layout.vue index e31d25b..c483b65 100644 --- a/frontend/src/views/Layout.vue +++ b/frontend/src/views/Layout.vue @@ -5,7 +5,7 @@ import { useRouter, useRoute } from 'vue-router' import { useI18n } from 'vue-i18n' import { NLayout, NLayoutSider, NLayoutContent, NLayoutHeader, NMenu, NSpace, NIcon, NDropdown } from 'naive-ui' import type { MenuOption } from 'naive-ui' -import { BarChartOutline, ListOutline, FolderOpenOutline, PricetagsOutline, SparklesOutline, LogOutOutline, ChevronDownOutline } from '@vicons/ionicons5' +import { BarChartOutline, ListOutline, FolderOpenOutline, PricetagsOutline, SettingsOutline, LogOutOutline, ChevronDownOutline } from '@vicons/ionicons5' import { useUserStore } from '../store/user' import LocaleSwitch from '../components/LocaleSwitch.vue' @@ -45,14 +45,14 @@ function handleMenuUpdate(key: string) { // 顶部用户下拉菜单配置项（随语言切换响应式更新） const userMenuOptions = computed(() => [ - { label: t('layout.aiSettings'), key: 'ai-settings', icon: renderIcon(SparklesOutline) }, + { label: t('layout.settings'), key: 'settings', icon: renderIcon(SettingsOutline) }, { label: t('layout.logout'), key: 'logout', icon: renderIcon(LogOutOutline) }, ]) -/** 用户下拉菜单选择事件：跳转 AI 设置或退出登录 */ +/** 用户下拉菜单选择事件：跳转系统设置或退出登录 */ function handleUserMenuSelect(key: string) { - if (key === 'ai-settings') { - router.push('/ai-settings') + if (key === 'settings') { + router.push('/settings') } else if (key === 'logout') { handleLogout() } diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue index f526d39..520a2fa 100644 --- a/frontend/src/views/Login.vue +++ b/frontend/src/views/Login.vue @@ -1,18 +1,29 @@ + + + + diff --git a/frontend/src/views/TransactionList.vue b/frontend/src/views/TransactionList.vue index 073472f..bfda01f 100644 --- a/frontend/src/views/TransactionList.vue +++ b/frontend/src/views/TransactionList.vue @@ -1007,17 +1007,47 @@ async function handleAiApply() { message.warning(t('ai.applyNone')) return } + // 勾选中包含新建分类/标签时，先经用户确认再落库 + if (aiNewCategoryNames.value.length > 0 || aiNewTagNames.value.length > 0) { + const confirmed = await new Promise((resolve) => { + dialog.warning({ + title: t('ai.applyNewTitle'), + content: t('ai.applyNewConfirm', { + categories: aiNewCategoryNames.value.length, + tags: aiNewTagNames.value.length, + }), + positiveText: t('common.confirm'), + negativeText: t('common.cancel'), + onPositiveClick: () => resolve(true), + onNegativeClick: () => resolve(false), + onClose: () => resolve(false), + }) + }) + if (!confirmed) { + return + } + } aiApplying.value = true try { // 仅提交勾选的建议，聚合建议按组展开为逐条记录 const payload = chosen.flatMap((s) => { const ids = s.transactionIds?.length ? s.transactionIds : [s.transactionId] - return ids.map((id) => ({ transactionId: id, categoryId: s.categoryId, tagIds: s.tagIds || [] })) + return ids.map((id) => ({ + transactionId: id, + categoryId: s.categoryId, + newCategoryName: s.newCategoryName, + newCategoryIcon: s.newCategoryIcon, + tagIds: s.tagIds || [], + newTags: s.newTags || [], + })) }) const res: any = await applyAiSuggestions(payload) message.success(t('ai.applySuccess', { count: res.data })) showAiModal.value = false await fetchData() + // 应用过程中可能新建了分类或标签，刷新以保持一致 + await fetchCategories() + await fetchTags() } catch (e: any) { message.error(e.message || t('ai.applyFailed')) } finally { @@ -1344,6 +1374,30 @@ const aiTotalCount = computed(() => { .reduce((sum, s) => sum + (s.transactionIds?.length || 1), 0) }) +/** 勾选建议中需要新建的分类名称（去重） */ +const aiNewCategoryNames = computed(() => { + const selected = new Set(checkedAiRowKeys.value) + const names = new Set() + aiSuggestions.value.forEach((s) => { + if (selected.has(s.transactionId) && s.newCategoryName) { + names.add(s.newCategoryName) + } + }) + return Array.from(names) +}) + +/** 勾选建议中需要新建的标签名称（去重） */ +const aiNewTagNames = computed(() => { + const selected = new Set(checkedAiRowKeys.value) + const names = new Set() + aiSuggestions.value.forEach((s) => { + if (selected.has(s.transactionId) && s.newTags) { + s.newTags.forEach((tag) => names.add(tag.name)) + } + }) + return Array.from(names) +}) + /** AI 建议表格列定义（随语言切换与建议范围响应式更新） */ const aiColumns = computed>(() => { const columns: DataTableColumns = [ @@ -1365,18 +1419,55 @@ const aiColumns = computed>(() => { ] // 按建议范围展示对应列 if (aiScope.value !== 'TAG') { - columns.push({ title: t('ai.column.category'), key: 'category', width: 130, render: (row) => row.categoryName || '-' }) + columns.push({ + title: t('ai.column.category'), key: 'category', minWidth: 150, + render: (row) => renderCategoryCell(row), + }) } if (aiScope.value !== 'CATEGORY') { columns.push({ - title: t('ai.column.tags'), key: 'tags', minWidth: 150, - render: (row) => (row.tagNames && row.tagNames.length > 0 ? row.tagNames.join('、') : '-'), + title: t('ai.column.tags'), key: 'tags', minWidth: 180, + render: (row) => renderTagsCell(row), }) } columns.push({ title: t('ai.column.reason'), key: 'reason', minWidth: 180, ellipsis: { tooltip: true } }) return columns }) +/** 渲染 AI 建议的分类单元格，新建分类带「新建」标记 */ +function renderCategoryCell(row: AiSuggestion) { + if (row.newCategoryName) { + return h(NSpace, { size: 4, align: 'center', wrap: false }, { + default: () => [ + h(NTag, { size: 'small', type: 'info' }, { default: () => t('ai.newBadge') }), + h('span', null, `${row.newCategoryIcon || ''}${row.newCategoryName}`), + ], + }) + } + return row.categoryName || '-' +} + +/** 渲染 AI 建议的标签单元格，新建标签带「新建」标记并使用建议颜色 */ +function renderTagsCell(row: AiSuggestion) { + const items: any[] = [] + if (row.tagNames && row.tagNames.length > 0) { + items.push(...row.tagNames.map((name) => h(NTag, { size: 'small' }, { default: () => name }))) + } + if (row.newTags && row.newTags.length > 0) { + items.push(...row.newTags.map((tag) => + h(NTag, { size: 'small', color: { color: tag.color, textColor: '#fff' } }, { + default: () => h(NSpace, { size: 2, align: 'center', wrap: false }, { + default: () => [ + h('span', null, t('ai.newBadge')), + h('span', null, tag.name), + ], + }), + }), + )) + } + return items.length > 0 ? h(NSpace, { size: 4, wrap: true }, { default: () => items }) : '-' +} + /** 打开批量设置分类弹窗 */ function handleBatchOpen() { if (transactions.value.length === 0) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..9bbc975c742b298b441bfb90dbc124400a3751b9 GIT binary patch literal 43705 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 DHx0+F literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ed10c6..452c18e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.13-bin.zip -networkTimeout=120000 +networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..faf9300 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,94 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle index c091d71..a5ef8bb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'my-app' +rootProject.name = 'finance-app' diff --git a/src/main/java/cn/rosercode/finance/FinanceApplication.java b/src/main/java/cn/rosercode/finance/FinanceApplication.java index 302a04b..a07ed15 100644 --- a/src/main/java/cn/rosercode/finance/FinanceApplication.java +++ b/src/main/java/cn/rosercode/finance/FinanceApplication.java @@ -2,12 +2,16 @@ package cn.rosercode.finance; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 应用程序主启动类。 *

Spring Boot 应用的入口点，负责引导和启动整个应用程序。

+ * + *

排除 {@link DataSourceAutoConfiguration}，因为数据源改为运行时配置： + * 应用在未配置数据库时也能正常启动，由动态数据源提供占位连接。

*/ -@SpringBootApplication +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) public class FinanceApplication { /** diff --git a/src/main/java/cn/rosercode/finance/common/DatabaseNotConfiguredException.java b/src/main/java/cn/rosercode/finance/common/DatabaseNotConfiguredException.java new file mode 100644 index 0000000..2f9d66b --- /dev/null +++ b/src/main/java/cn/rosercode/finance/common/DatabaseNotConfiguredException.java @@ -0,0 +1,22 @@ +package cn.rosercode.finance.common; + +/** + * 数据库未配置异常。 + * + *

当应用尚未完成数据库配置、业务代码却尝试访问数据库时抛出。全局异常处理器会将其 + * 转换为携带专用状态码的响应，前端据此跳转到数据库配置引导页。

+ * + * @date 2026-09-18 11:00:23 + */ +public class DatabaseNotConfiguredException extends BusinessException { + + /** 数据库未配置的专用状态码 */ + public static final int CODE = 5031; + + /** + * 构造数据库未配置异常。 + */ + public DatabaseNotConfiguredException() { + super(CODE, "数据库尚未配置，请先完成数据库配置"); + } +} diff --git a/src/main/java/cn/rosercode/finance/common/GlobalExceptionHandler.java b/src/main/java/cn/rosercode/finance/common/GlobalExceptionHandler.java index eb5fc69..f346a1a 100644 --- a/src/main/java/cn/rosercode/finance/common/GlobalExceptionHandler.java +++ b/src/main/java/cn/rosercode/finance/common/GlobalExceptionHandler.java @@ -1,8 +1,15 @@ package cn.rosercode.finance.common; +import cn.rosercode.finance.config.SpaRouteSupport; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.servlet.resource.NoResourceFoundException; + +import java.io.IOException; /** * 全局异常处理器。 @@ -22,6 +29,17 @@ public class GlobalExceptionHandler { return Result.error(e.getCode(), e.getMessage()); } + /** + * 处理数据库未配置异常。 + * + * @param e 数据库未配置异常 + * @return 包含专用状态码的响应结果 + */ + @ExceptionHandler(DatabaseNotConfiguredException.class) + public Result handleDatabaseNotConfigured(DatabaseNotConfiguredException e) { + return Result.error(e.getCode(), e.getMessage()); + } + /** * 处理参数校验异常。 *

当请求参数校验不通过时，提取第一个校验错误信息并返回。

@@ -36,6 +54,31 @@ public class GlobalExceptionHandler { return Result.error(400, message); } + /** + * 处理静态资源未找到异常。 + * + *

前后端一体化部署时，前端 History 路由（如 {@code /dashboard}）在服务器上无对应文件， + * Spring 会抛出该异常。此时转发到前端入口页面，由前端路由接管；其余情况返回 404。

+ * + * @param e 静态资源未找到异常 + * @param request HTTP 请求 + * @param response HTTP 响应 + * @return SPA 路由转发时返回 null，否则返回 404 错误结果 + * @throws IOException 转发时可能抛出 + * @throws ServletException 转发时可能抛出 + */ + @ExceptionHandler(NoResourceFoundException.class) + public Object handleNoResourceFound(NoResourceFoundException e, + HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + String path = request.getRequestURI(); + if (SpaRouteSupport.isSpaRoute(path)) { + request.getRequestDispatcher("/index.html").forward(request, response); + return null; + } + return Result.error(404, "资源不存在"); + } + /** * 处理未捕获的通用异常。 * @@ -44,8 +87,36 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(Exception.class) public Result handleException(Exception e) { + // 数据库未配置异常可能被持久层框架包装，需沿异常链查找 + DatabaseNotConfiguredException notConfigured = + findCause(e, DatabaseNotConfiguredException.class); + if (notConfigured != null) { + return Result.error(notConfigured.getCode(), notConfigured.getMessage()); + } // 打印异常堆栈信息，便于排查问题 e.printStackTrace(); return Result.error(500, "服务器内部错误: " + e.getMessage()); } + + /** + * 沿异常链查找指定类型的异常。 + * + * @param throwable 原始异常 + * @param type 目标异常类型 + * @param 异常泛型 + * @return 找到的异常，未找到返回 null + */ + private T findCause(Throwable throwable, Class type) { + Throwable current = throwable; + while (current != null) { + if (type.isInstance(current)) { + return type.cast(current); + } + if (current.getCause() == current) { + break; + } + current = current.getCause(); + } + return null; + } } diff --git a/src/main/java/cn/rosercode/finance/config/SpaErrorController.java b/src/main/java/cn/rosercode/finance/config/SpaErrorController.java new file mode 100644 index 0000000..8be97d2 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/SpaErrorController.java @@ -0,0 +1,92 @@ +package cn.rosercode.finance.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.boot.web.servlet.error.ErrorController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * 前端单页应用路由回退控制器。 + * + *

前后端一体化部署时，前端使用 History 路由模式，直接访问或刷新 {@code /dashboard} 等 + * 子路径时服务器上并不存在对应文件，会被解析为 404。本控制器在 404 时判断：若请求路径不是 + * 接口或文档等资源路径，且不带文件扩展名，则转发到前端入口 {@code /index.html}，交由前端路由处理。 + * 其余情况仍返回 JSON 错误信息，避免影响接口与 API 文档。

+ * + * @date 2026-09-18 11:16:04 + */ +@Controller +public class SpaErrorController implements ErrorController { + + private final ObjectMapper objectMapper; + + public SpaErrorController(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + /** + * 处理容器转发的错误请求。 + * + * @param request HTTP 请求 + * @param response HTTP 响应 + * @throws IOException 写出响应时可能抛出 + * @throws ServletException 转发到前端入口时可能抛出 + */ + @RequestMapping("/error") + public void handleError(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + int status = resolveStatus(request); + String path = resolvePath(request); + + if (status == 404 && SpaRouteSupport.isSpaRoute(path)) { + // 转发到前端入口，交由前端路由处理（如刷新 /dashboard） + request.getRequestDispatcher("/index.html").forward(request, response); + return; + } + + response.setStatus(status); + response.setContentType("application/json;charset=UTF-8"); + Map body = new LinkedHashMap<>(); + body.put("code", status); + body.put("message", status == 404 ? "资源不存在" : "服务器内部错误"); + body.put("data", null); + response.getWriter().write(objectMapper.writeValueAsString(body)); + } + + /** + * 从请求属性中解析错误状态码。 + * + * @param request HTTP 请求 + * @return 状态码，缺失时返回 500 + */ + private int resolveStatus(HttpServletRequest request) { + Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE); + if (status == null) { + return 500; + } + try { + return Integer.parseInt(status.toString()); + } catch (NumberFormatException e) { + return 500; + } + } + + /** + * 从请求属性中解析原始请求路径。 + * + * @param request HTTP 请求 + * @return 请求路径 + */ + private String resolvePath(HttpServletRequest request) { + Object uri = request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI); + return uri != null ? uri.toString() : ""; + } +} diff --git a/src/main/java/cn/rosercode/finance/config/SpaRouteSupport.java b/src/main/java/cn/rosercode/finance/config/SpaRouteSupport.java new file mode 100644 index 0000000..4128525 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/SpaRouteSupport.java @@ -0,0 +1,36 @@ +package cn.rosercode.finance.config; + +/** + * SPA 路由判断工具。 + * + *

前后端一体化部署时，需要区分「前端 History 路由」与「接口 / 静态资源 / API 文档」请求。 + * 前者在服务器上无对应文件，应回退到前端入口；后者应正常返回 404 或由对应处理器处理。

+ * + * @date 2026-09-18 11:22:02 + */ +public final class SpaRouteSupport { + + private SpaRouteSupport() { + } + + /** + * 判断请求路径是否为需要回退到前端入口的 SPA 路由。 + * + * @param path 请求路径 + * @return 需要回退返回 true + */ + public static boolean isSpaRoute(String path) { + if (path == null || path.isEmpty()) { + return false; + } + // 接口、API 文档等路径不做回退 + if (path.startsWith("/api") || path.startsWith("/v3/api-docs") + || path.startsWith("/swagger-ui") || path.startsWith("/webjars") + || path.startsWith("/doc.html") || path.startsWith("/favicon")) { + return false; + } + // 带扩展名的视为静态资源请求 + String lastSegment = path.substring(path.lastIndexOf('/') + 1); + return !lastSegment.contains("."); + } +} diff --git a/src/main/java/cn/rosercode/finance/config/WebConfig.java b/src/main/java/cn/rosercode/finance/config/WebConfig.java index 8f480b5..5feb230 100644 --- a/src/main/java/cn/rosercode/finance/config/WebConfig.java +++ b/src/main/java/cn/rosercode/finance/config/WebConfig.java @@ -34,8 +34,9 @@ public class WebConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(jwtInterceptor) .addPathPatterns("/api/**") - // 登录和注册接口不需要认证 - .excludePathPatterns("/api/user/login", "/api/user/register"); + // 登录、注册与状态查询接口不需要认证；数据库状态查询用于前端判断是否已配置 + .excludePathPatterns("/api/user/login", "/api/user/register", + "/api/user/registration-status", "/api/database/status"); } /** diff --git a/src/main/java/cn/rosercode/finance/config/app/AppConfig.java b/src/main/java/cn/rosercode/finance/config/app/AppConfig.java new file mode 100644 index 0000000..c72b861 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/app/AppConfig.java @@ -0,0 +1,20 @@ +package cn.rosercode.finance.config.app; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +/** + * 应用级运行时配置。 + * + *

目前包含注册开关，持久化在本地文件 {@code config/app.json}。由于注册入口需要在 + * 未登录状态下即可判断，且不希望依赖数据库，因此采用本地文件存储。

+ * + * @date 2026-09-18 12:09:20 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class AppConfig { + + /** 是否开放注册：true 开放，false 关闭（默认关闭） */ + private boolean registrationEnabled = false; +} diff --git a/src/main/java/cn/rosercode/finance/config/app/AppConfigStore.java b/src/main/java/cn/rosercode/finance/config/app/AppConfigStore.java new file mode 100644 index 0000000..503203a --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/app/AppConfigStore.java @@ -0,0 +1,81 @@ +package cn.rosercode.finance.config.app; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +/** + * 应用级运行时配置的本地文件存储。 + * + *

配置以 JSON 形式保存在工作目录下的 {@code config/app.json}。文件不存在或解析失败时 + * 返回默认配置（注册关闭），保证在首次部署时注册功能默认禁用。

+ * + * @date 2026-09-18 12:09:22 + */ +@Component +public class AppConfigStore { + + private static final Logger log = LoggerFactory.getLogger(AppConfigStore.class); + + /** 配置目录 */ + private static final String CONFIG_DIR = "config"; + + /** 配置文件名 */ + private static final String CONFIG_FILE = "app.json"; + + private final ObjectMapper objectMapper; + + public AppConfigStore(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + /** + * 获取配置文件路径。 + * + * @return 配置文件路径 + */ + public Path getConfigFile() { + return Paths.get(CONFIG_DIR, CONFIG_FILE); + } + + /** + * 读取应用配置，文件不存在或解析失败时返回默认配置。 + * + * @return 应用配置 + */ + public AppConfig load() { + Path file = getConfigFile(); + if (!Files.exists(file)) { + return new AppConfig(); + } + try { + AppConfig config = objectMapper.readValue(file.toFile(), AppConfig.class); + return config != null ? config : new AppConfig(); + } catch (IOException e) { + log.error("读取应用配置文件 {} 失败，使用默认配置：{}", file, e.getMessage()); + return new AppConfig(); + } + } + + /** + * 保存应用配置，自动创建父目录。 + * + * @param config 应用配置 + */ + public void save(AppConfig config) { + Path file = getConfigFile(); + try { + Files.createDirectories(file.getParent()); + objectMapper.writerWithDefaultPrettyPrinter().writeValue(file.toFile(), config); + log.info("应用配置已保存到 {}", file.toAbsolutePath()); + } catch (IOException e) { + throw new IllegalStateException("保存应用配置失败：" + e.getMessage(), e); + } + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DataSourceContextHolder.java b/src/main/java/cn/rosercode/finance/config/datasource/DataSourceContextHolder.java new file mode 100644 index 0000000..6b17c28 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DataSourceContextHolder.java @@ -0,0 +1,71 @@ +package cn.rosercode.finance.config.datasource; + +/** + * 动态数据源上下文，保存当前生效的数据源标识与类型。 + * + *

由于本系统为单实例个人应用，数据库为全局单例配置，因此使用静态 {@code volatile} 字段 + * 而非 ThreadLocal 保存当前数据源。动态数据源在每次获取连接时都会读取这里的标识， + * 从而实现运行时热切换。

+ * + * @date 2026-09-18 11:00:17 + */ +public final class DataSourceContextHolder { + + /** 未配置数据库时使用的占位数据源标识 */ + public static final String UNCONFIGURED_KEY = "UNCONFIGURED"; + + /** 当前数据源标识 */ + private static volatile String key = UNCONFIGURED_KEY; + + /** 当前数据源类型，未配置时为 null */ + private static volatile DataSourceType type; + + private DataSourceContextHolder() { + } + + /** + * 获取当前数据源标识。 + * + * @return 数据源标识 + */ + public static String getKey() { + return key; + } + + /** + * 获取当前数据源类型。 + * + * @return 数据源类型，未配置时返回 null + */ + public static DataSourceType getType() { + return type; + } + + /** + * 判断是否已完成数据库配置。 + * + * @return 已配置返回 true + */ + public static boolean isConfigured() { + return type != null; + } + + /** + * 设置当前生效的数据源。 + * + * @param dataSourceType 数据源类型 + * @param dataSourceKey 数据源标识 + */ + public static void set(DataSourceType dataSourceType, String dataSourceKey) { + key = dataSourceKey; + type = dataSourceType; + } + + /** + * 重置为未配置状态。 + */ + public static void reset() { + key = UNCONFIGURED_KEY; + type = null; + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DataSourceType.java b/src/main/java/cn/rosercode/finance/config/datasource/DataSourceType.java new file mode 100644 index 0000000..ad9f4dd --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DataSourceType.java @@ -0,0 +1,46 @@ +package cn.rosercode.finance.config.datasource; + +/** + * 数据库类型枚举，标识当前支持的数据库种类。 + * + *

每种类型携带对应的 JDBC 驱动类名与显示名称，供动态数据源构建连接时使用。

+ * + * @date 2026-09-18 11:00:06 + */ +public enum DataSourceType { + + /** MySQL 数据库 */ + MYSQL("com.mysql.cj.jdbc.Driver", "MySQL"), + + /** SQLite 本地文件数据库 */ + SQLITE("org.sqlite.JDBC", "SQLite"); + + /** JDBC 驱动类名 */ + private final String driverClassName; + + /** 显示名称 */ + private final String displayName; + + DataSourceType(String driverClassName, String displayName) { + this.driverClassName = driverClassName; + this.displayName = displayName; + } + + /** + * 获取 JDBC 驱动类名。 + * + * @return 驱动类名 + */ + public String getDriverClassName() { + return driverClassName; + } + + /** + * 获取显示名称。 + * + * @return 显示名称 + */ + public String getDisplayName() { + return displayName; + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DatabaseBootstrap.java b/src/main/java/cn/rosercode/finance/config/datasource/DatabaseBootstrap.java new file mode 100644 index 0000000..69b76ae --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DatabaseBootstrap.java @@ -0,0 +1,34 @@ +package cn.rosercode.finance.config.datasource; + +import cn.rosercode.finance.service.DatabaseService; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +/** + * 数据库启动引导器。 + * + *

在 Spring 上下文准备就绪后触发一次数据库配置加载：优先使用本地保存的配置， + * 其次兼容环境变量。若均不存在，则保持未配置状态，等待用户通过设置页配置。

+ * + * @date 2026-09-18 11:01:22 + */ +@Component +public class DatabaseBootstrap implements ApplicationRunner { + + private final DatabaseService databaseService; + + public DatabaseBootstrap(DatabaseService databaseService) { + this.databaseService = databaseService; + } + + /** + * 应用启动完成后执行数据库引导。 + * + * @param args 启动参数 + */ + @Override + public void run(ApplicationArguments args) { + databaseService.bootstrap(); + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfig.java b/src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfig.java new file mode 100644 index 0000000..bd32e8a --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfig.java @@ -0,0 +1,68 @@ +package cn.rosercode.finance.config.datasource; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +/** + * 数据库连接配置，描述一个可用的 MySQL 或 SQLite 数据源。 + * + *

该对象会以 JSON 形式持久化到本地文件 {@code config/database.json}， + * 因为应用启动时可能尚未连接任何数据库，无法把配置存入数据库本身。

+ * + * @date 2026-09-18 11:00:10 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class DatabaseConfig { + + /** 数据库类型 */ + private DataSourceType type; + + /** SQLite 数据库文件路径（仅 SQLite 使用） */ + private String sqlitePath; + + /** MySQL 主机地址（仅 MySQL 使用） */ + private String host; + + /** MySQL 端口（仅 MySQL 使用） */ + private Integer port; + + /** MySQL 数据库名（仅 MySQL 使用） */ + private String database; + + /** MySQL 用户名（仅 MySQL 使用） */ + private String username; + + /** MySQL 密码（仅 MySQL 使用，明文存储，与 AI 配置一致） */ + private String password; + + /** + * 根据配置构建 JDBC 连接地址。 + * + *

MySQL 地址附带常用参数：UTF-8 编码、关闭 SSL、上海时区、允许公钥检索， + * 并开启 {@code createDatabaseIfNotExist}，便于首次连接自动建库。

+ * + * @return JDBC URL + */ + public String buildJdbcUrl() { + if (type == DataSourceType.SQLITE) { + return "jdbc:sqlite:" + sqlitePath; + } + return String.format( + "jdbc:mysql://%s:%d/%s?useUnicode=true&characterEncoding=utf8&useSSL=false" + + "&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&createDatabaseIfNotExist=true", + host, port, database); + } + + /** + * 生成用于展示的脱敏连接摘要，不包含密码。 + * + * @return 连接摘要 + */ + public String maskedSummary() { + if (type == DataSourceType.SQLITE) { + return sqlitePath; + } + return String.format("%s:%d/%s", host, port, database); + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfigStore.java b/src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfigStore.java new file mode 100644 index 0000000..72d05c8 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DatabaseConfigStore.java @@ -0,0 +1,106 @@ +package cn.rosercode.finance.config.datasource; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Optional; + +/** + * 数据库配置的本地文件存储。 + * + *

配置以 JSON 形式保存在工作目录下的 {@code config/database.json}。之所以不使用数据库存储， + * 是因为应用需要在尚未连接任何数据库时就能读取配置并完成初始化，形成"先有配置、后连数据库"的顺序。

+ * + * @date 2026-09-18 11:00:14 + */ +@Component +public class DatabaseConfigStore { + + private static final Logger log = LoggerFactory.getLogger(DatabaseConfigStore.class); + + /** 配置文件相对工作目录的位置 */ + private static final String CONFIG_DIR = "config"; + + /** 配置文件名称 */ + private static final String CONFIG_FILE = "database.json"; + + private final ObjectMapper objectMapper; + + public DatabaseConfigStore(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + /** + * 获取配置文件路径。 + * + * @return 配置文件路径 + */ + public Path getConfigFile() { + return Paths.get(CONFIG_DIR, CONFIG_FILE); + } + + /** + * 判断本地是否已存在配置文件。 + * + * @return 存在返回 true + */ + public boolean exists() { + return Files.exists(getConfigFile()); + } + + /** + * 读取本地配置，文件不存在或解析失败时返回空。 + * + * @return 数据库配置 + */ + public Optional load() { + Path file = getConfigFile(); + if (!Files.exists(file)) { + return Optional.empty(); + } + try { + DatabaseConfig config = objectMapper.readValue(file.toFile(), DatabaseConfig.class); + if (config == null || config.getType() == null) { + log.warn("数据库配置文件 {} 内容不完整，已忽略", file); + return Optional.empty(); + } + return Optional.of(config); + } catch (IOException e) { + log.error("读取数据库配置文件 {} 失败：{}", file, e.getMessage()); + return Optional.empty(); + } + } + + /** + * 将配置写入本地文件，自动创建父目录。 + * + * @param config 数据库配置 + */ + public void save(DatabaseConfig config) { + Path file = getConfigFile(); + try { + Files.createDirectories(file.getParent()); + objectMapper.writerWithDefaultPrettyPrinter().writeValue(file.toFile(), config); + log.info("数据库配置已保存到 {}", file.toAbsolutePath()); + } catch (IOException e) { + throw new IllegalStateException("保存数据库配置失败：" + e.getMessage(), e); + } + } + + /** + * 删除本地配置文件。 + */ + public void clear() { + try { + Files.deleteIfExists(getConfigFile()); + } catch (IOException e) { + log.error("删除数据库配置文件失败：{}", e.getMessage()); + } + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSource.java b/src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSource.java new file mode 100644 index 0000000..a76b7e8 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSource.java @@ -0,0 +1,89 @@ +package cn.rosercode.finance.config.datasource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import javax.sql.DataSource; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 动态数据源，支持在运行时切换底层真实数据源。 + * + *

继承 Spring 的 {@link AbstractRoutingDataSource}，每次获取连接时根据 + * {@link DataSourceContextHolder} 中的标识选择目标数据源。由于父类不暴露已注册的目标数据源， + * 本类自行维护一份映射，切换时同步到父类并触发 {@link #afterPropertiesSet()} 重建解析缓存， + * 同时关闭被替换的旧连接池。

+ * + * @date 2026-09-18 11:00:28 + */ +public class DynamicDataSource extends AbstractRoutingDataSource { + + private static final Logger log = LoggerFactory.getLogger(DynamicDataSource.class); + + /** 自行维护的目标数据源映射，用于运行时增量注册与切换 */ + private final Map targetDataSources = new ConcurrentHashMap<>(); + + /** + * 构造动态数据源并注册初始占位数据源。 + * + * @param placeholder 未配置数据库时使用的占位数据源 + */ + public DynamicDataSource(DataSource placeholder) { + targetDataSources.put(DataSourceContextHolder.UNCONFIGURED_KEY, placeholder); + setTargetDataSources(new HashMap<>(targetDataSources)); + setDefaultTargetDataSource(placeholder); + afterPropertiesSet(); + } + + /** + * 返回当前请求应使用的数据源标识。 + * + * @return 数据源标识 + */ + @Override + protected Object determineCurrentLookupKey() { + return DataSourceContextHolder.getKey(); + } + + /** + * 注册并切换到指定类型的数据源。 + * + *

切换过程为：更新内部映射 -> 同步到父类并重建解析缓存 -> 更新上下文标识 -> 关闭旧数据源。 + * 方法加锁以保证并发切换时的映射一致性。

+ * + * @param type 数据源类型 + * @param dataSource 新的数据源 + */ + public synchronized void addAndSwitch(DataSourceType type, DataSource dataSource) { + String key = type.name(); + DataSource previous = (DataSource) targetDataSources.put(key, dataSource); + + setTargetDataSources(new HashMap<>(targetDataSources)); + // 重新解析目标数据源映射，使新数据源立即生效 + afterPropertiesSet(); + DataSourceContextHolder.set(type, key); + + if (previous != null && previous != dataSource) { + closeQuietly(previous); + } + log.info("已切换到 {} 数据源", type.getDisplayName()); + } + + /** + * 安静地关闭数据源，忽略关闭过程中的异常。 + * + * @param dataSource 待关闭的数据源 + */ + private void closeQuietly(DataSource dataSource) { + if (dataSource instanceof AutoCloseable closeable) { + try { + closeable.close(); + } catch (Exception e) { + log.warn("关闭旧数据源失败：{}", e.getMessage()); + } + } + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSourceConfig.java b/src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSourceConfig.java new file mode 100644 index 0000000..a9d8524 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/DynamicDataSourceConfig.java @@ -0,0 +1,29 @@ +package cn.rosercode.finance.config.datasource; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +/** + * 动态数据源配置类。 + * + *

向 Spring 容器注册唯一的 {@link DynamicDataSource} 作为主数据源。初始时仅注册一个 + * 未配置占位数据源，保证应用在没有数据库配置的情况下也能启动；真正的数据库连接在 + * 运行时配置完成后动态注册进来。

+ * + * @date 2026-09-18 11:00:31 + */ +@Configuration +public class DynamicDataSourceConfig { + + /** + * 创建动态数据源，初始指向未配置占位数据源。 + * + * @return 动态数据源实例 + */ + @Bean + @Primary + public DynamicDataSource dynamicDataSource() { + return new DynamicDataSource(new UnconfiguredDataSource()); + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/SchemaInitializer.java b/src/main/java/cn/rosercode/finance/config/datasource/SchemaInitializer.java new file mode 100644 index 0000000..9a2234b --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/SchemaInitializer.java @@ -0,0 +1,51 @@ +package cn.rosercode.finance.config.datasource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.io.ClassPathResource; +import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; + +/** + * 数据库表结构初始化器。 + * + *

根据数据库类型选择对应的建表脚本并执行。所有建表语句均为幂等（IF NOT EXISTS）， + * 因此重复执行不会破坏已有数据。

+ * + * @date 2026-09-18 11:00:46 + */ +@Component +public class SchemaInitializer { + + private static final Logger log = LoggerFactory.getLogger(SchemaInitializer.class); + + /** MySQL 建表脚本 */ + private static final String MYSQL_SCRIPT = "sql/init.sql"; + + /** SQLite 建表脚本 */ + private static final String SQLITE_SCRIPT = "sql/schema-sqlite.sql"; + + /** + * 执行建表脚本。 + * + * @param dataSource 目标数据源 + * @param type 数据库类型 + */ + public void initialize(DataSource dataSource, DataSourceType type) { + ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); + populator.setContinueOnError(false); + + if (type == DataSourceType.SQLITE) { + // SQLite 脚本以 ;; 分隔，避免 CREATE TRIGGER 体内的分号被误拆分 + populator.setSeparator(";;"); + } + String script = type == DataSourceType.MYSQL ? MYSQL_SCRIPT : SQLITE_SCRIPT; + populator.addScript(new ClassPathResource(script)); + + log.info("开始执行 {} 建表脚本：{}", type.getDisplayName(), script); + populator.execute(dataSource); + log.info("{} 建表脚本执行完成", type.getDisplayName()); + } +} diff --git a/src/main/java/cn/rosercode/finance/config/datasource/UnconfiguredDataSource.java b/src/main/java/cn/rosercode/finance/config/datasource/UnconfiguredDataSource.java new file mode 100644 index 0000000..87b9f70 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/config/datasource/UnconfiguredDataSource.java @@ -0,0 +1,66 @@ +package cn.rosercode.finance.config.datasource; + +import cn.rosercode.finance.common.DatabaseNotConfiguredException; + +import javax.sql.DataSource; +import java.io.PrintWriter; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.logging.Logger; + +/** + * 未配置数据库时使用的占位数据源。 + * + *

该数据源不连接任何真实数据库，任何获取连接的尝试都会抛出 + * {@link DatabaseNotConfiguredException}，由全局异常处理器转换为"数据库未配置"的业务响应， + * 从而保证应用在尚未配置数据库时也能正常启动。

+ * + * @date 2026-09-18 11:00:20 + */ +public class UnconfiguredDataSource implements DataSource { + + @Override + public Connection getConnection() { + throw new DatabaseNotConfiguredException(); + } + + @Override + public Connection getConnection(String username, String password) { + throw new DatabaseNotConfiguredException(); + } + + @Override + public PrintWriter getLogWriter() { + return null; + } + + @Override + public void setLogWriter(PrintWriter out) { + // 占位数据源无需日志输出 + } + + @Override + public void setLoginTimeout(int seconds) { + // 占位数据源无需登录超时设置 + } + + @Override + public int getLoginTimeout() { + return 0; + } + + @Override + public Logger getParentLogger() { + return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME); + } + + @Override + public T unwrap(Class iface) throws SQLException { + throw new SQLException("占位数据源不支持 unwrap"); + } + + @Override + public boolean isWrapperFor(Class iface) { + return false; + } +} diff --git a/src/main/java/cn/rosercode/finance/controller/DatabaseController.java b/src/main/java/cn/rosercode/finance/controller/DatabaseController.java new file mode 100644 index 0000000..f4680d8 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/controller/DatabaseController.java @@ -0,0 +1,64 @@ +package cn.rosercode.finance.controller; + +import cn.rosercode.finance.common.Result; +import cn.rosercode.finance.dto.DatabaseConfigRequest; +import cn.rosercode.finance.service.DatabaseService; +import cn.rosercode.finance.vo.DatabaseStatusVO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 数据库配置控制器。 + * + *

提供数据库状态查询、连接测试与配置保存接口。数据库未配置时这些接口允许匿名访问， + * 否则用户无法在无法登录的情况下完成初始化；一旦配置完成，则需携带 JWT 才能修改， + * 具体由 {@code JwtInterceptor} 动态控制。

+ * + * @date 2026-09-18 11:01:23 + */ +@RestController +@RequestMapping("/api/database") +public class DatabaseController { + + private final DatabaseService databaseService; + + public DatabaseController(DatabaseService databaseService) { + this.databaseService = databaseService; + } + + /** + * 查询当前数据库配置状态。 + * + * @return 数据库状态 + */ + @GetMapping("/status") + public Result status() { + return Result.success(databaseService.getStatus()); + } + + /** + * 测试数据库连接。 + * + * @param request 数据库配置请求 + * @return 无数据成功响应 + */ + @PostMapping("/test") + public Result test(@RequestBody DatabaseConfigRequest request) { + databaseService.testConnection(request); + return Result.success(); + } + + /** + * 保存数据库配置并切换到新的数据源。 + * + * @param request 数据库配置请求 + * @return 切换后的数据库状态 + */ + @PostMapping("/config") + public Result save(@RequestBody DatabaseConfigRequest request) { + return Result.success(databaseService.save(request)); + } +} diff --git a/src/main/java/cn/rosercode/finance/controller/UserController.java b/src/main/java/cn/rosercode/finance/controller/UserController.java index 6f935f4..6281d72 100644 --- a/src/main/java/cn/rosercode/finance/controller/UserController.java +++ b/src/main/java/cn/rosercode/finance/controller/UserController.java @@ -3,8 +3,11 @@ package cn.rosercode.finance.controller; import cn.rosercode.finance.common.Result; import cn.rosercode.finance.dto.LoginRequest; import cn.rosercode.finance.dto.RegisterRequest; +import cn.rosercode.finance.dto.RegistrationUpdateRequest; +import cn.rosercode.finance.service.RegistrationService; import cn.rosercode.finance.service.UserService; import cn.rosercode.finance.vo.LoginVO; +import cn.rosercode.finance.vo.RegistrationStatusVO; import cn.rosercode.finance.vo.UserVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -12,6 +15,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,9 +31,11 @@ import org.springframework.web.bind.annotation.RestController; public class UserController { private final UserService userService; + private final RegistrationService registrationService; - public UserController(UserService userService) { + public UserController(UserService userService, RegistrationService registrationService) { this.userService = userService; + this.registrationService = registrationService; } /** @@ -57,6 +63,30 @@ public class UserController { return Result.success(); } + /** + * 查询注册状态（无需登录） + * + * @return 注册状态，包含开关、是否首个用户以及当前是否允许注册 + */ + @GetMapping("/registration-status") + @Operation(summary = "查询注册状态", description = "供登录页判断是否显示注册入口") + public Result registrationStatus() { + return Result.success(registrationService.getStatus()); + } + + /** + * 更新注册开关（需登录） + * + * @param request 注册开关更新请求 + * @return 更新后的注册状态 + */ + @PutMapping("/registration") + @Operation(summary = "更新注册开关", description = "开启或关闭注册功能") + public Result updateRegistration(@RequestBody RegistrationUpdateRequest request) { + registrationService.setEnabled(Boolean.TRUE.equals(request.getEnabled())); + return Result.success(registrationService.getStatus()); + } + /** * 获取当前用户信息 * diff --git a/src/main/java/cn/rosercode/finance/dto/AiApplyRequest.java b/src/main/java/cn/rosercode/finance/dto/AiApplyRequest.java index 0c4beff..885edc4 100644 --- a/src/main/java/cn/rosercode/finance/dto/AiApplyRequest.java +++ b/src/main/java/cn/rosercode/finance/dto/AiApplyRequest.java @@ -1,5 +1,6 @@ package cn.rosercode.finance.dto; +import cn.rosercode.finance.vo.AiNewTagVO; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -33,7 +34,16 @@ public class AiApplyRequest { /** 建议分类ID，为 null 表示不修改分类 */ private Long categoryId; + /** 建议新建的分类名称，categoryId 为空时按名称查找或创建 */ + private String newCategoryName; + + /** 建议新建的分类图标（Emoji） */ + private String newCategoryIcon; + /** 建议追加的标签ID列表，可为空表示不追加标签 */ private List tagIds; + + /** 建议新建的标签列表，按名称查找或创建后追加 */ + private List newTags; } } diff --git a/src/main/java/cn/rosercode/finance/dto/DatabaseConfigRequest.java b/src/main/java/cn/rosercode/finance/dto/DatabaseConfigRequest.java new file mode 100644 index 0000000..a0e1608 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/dto/DatabaseConfigRequest.java @@ -0,0 +1,34 @@ +package cn.rosercode.finance.dto; + +import cn.rosercode.finance.config.datasource.DataSourceType; +import lombok.Data; + +/** + * 数据库配置请求对象，用于提交 MySQL 或 SQLite 的连接信息。 + * + * @date 2026-09-18 11:00:59 + */ +@Data +public class DatabaseConfigRequest { + + /** 数据库类型：MYSQL 或 SQLITE */ + private DataSourceType type; + + /** SQLite 数据库文件路径（仅 SQLite 使用） */ + private String sqlitePath; + + /** MySQL 主机地址（仅 MySQL 使用） */ + private String host; + + /** MySQL 端口（仅 MySQL 使用） */ + private Integer port; + + /** MySQL 数据库名（仅 MySQL 使用） */ + private String database; + + /** MySQL 用户名（仅 MySQL 使用） */ + private String username; + + /** MySQL 密码（仅 MySQL 使用）；留空表示沿用已保存的密码 */ + private String password; +} diff --git a/src/main/java/cn/rosercode/finance/dto/RegistrationUpdateRequest.java b/src/main/java/cn/rosercode/finance/dto/RegistrationUpdateRequest.java new file mode 100644 index 0000000..7f2c6f6 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/dto/RegistrationUpdateRequest.java @@ -0,0 +1,15 @@ +package cn.rosercode.finance.dto; + +import lombok.Data; + +/** + * 注册开关更新请求对象。 + * + * @date 2026-09-18 12:09:24 + */ +@Data +public class RegistrationUpdateRequest { + + /** 目标开关状态：true 开启注册，false 关闭注册 */ + private Boolean enabled; +} diff --git a/src/main/java/cn/rosercode/finance/interceptor/JwtInterceptor.java b/src/main/java/cn/rosercode/finance/interceptor/JwtInterceptor.java index 221410d..e95dca9 100644 --- a/src/main/java/cn/rosercode/finance/interceptor/JwtInterceptor.java +++ b/src/main/java/cn/rosercode/finance/interceptor/JwtInterceptor.java @@ -1,5 +1,6 @@ package cn.rosercode.finance.interceptor; +import cn.rosercode.finance.config.datasource.DataSourceContextHolder; import cn.rosercode.finance.util.JwtUtil; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; @@ -49,6 +50,13 @@ public class JwtInterceptor implements HandlerInterceptor { return true; } + // 数据库未配置时放行数据库配置接口，否则用户无法登录、陷入死锁； + // 配置完成后这些接口重新纳入 JWT 认证保护 + String uri = request.getRequestURI(); + if (uri.startsWith("/api/database/") && !DataSourceContextHolder.isConfigured()) { + return true; + } + // 从 Authorization 请求头中提取 Token String token = request.getHeader("Authorization"); if (token != null && token.startsWith("Bearer ")) { diff --git a/src/main/java/cn/rosercode/finance/service/DatabaseService.java b/src/main/java/cn/rosercode/finance/service/DatabaseService.java new file mode 100644 index 0000000..fafa601 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/service/DatabaseService.java @@ -0,0 +1,39 @@ +package cn.rosercode.finance.service; + +import cn.rosercode.finance.dto.DatabaseConfigRequest; +import cn.rosercode.finance.vo.DatabaseStatusVO; + +/** + * 数据库配置服务，负责连接测试、运行时切换与启动引导。 + * + * @date 2026-09-18 11:01:02 + */ +public interface DatabaseService { + + /** + * 获取当前数据库配置状态。 + * + * @return 数据库状态 + */ + DatabaseStatusVO getStatus(); + + /** + * 测试数据库连接是否可用，不会改变当前生效的数据源。 + * + * @param request 数据库配置请求 + */ + void testConnection(DatabaseConfigRequest request); + + /** + * 保存配置并切换到新的数据源，同时自动初始化表结构。 + * + * @param request 数据库配置请求 + * @return 切换后的数据库状态 + */ + DatabaseStatusVO save(DatabaseConfigRequest request); + + /** + * 应用启动时引导数据库：优先读取本地配置，其次读取环境变量。 + */ + void bootstrap(); +} diff --git a/src/main/java/cn/rosercode/finance/service/RegistrationService.java b/src/main/java/cn/rosercode/finance/service/RegistrationService.java new file mode 100644 index 0000000..62481d6 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/service/RegistrationService.java @@ -0,0 +1,32 @@ +package cn.rosercode.finance.service; + +import cn.rosercode.finance.vo.RegistrationStatusVO; + +/** + * 注册管理服务，负责注册开关的读取、更新与注册放行判断。 + * + * @date 2026-09-18 12:09:25 + */ +public interface RegistrationService { + + /** + * 获取当前注册状态。 + * + * @return 注册状态 + */ + RegistrationStatusVO getStatus(); + + /** + * 判断当前是否允许注册（开关开启，或系统尚无任何用户）。 + * + * @return 允许注册返回 true + */ + boolean isRegistrationAllowed(); + + /** + * 设置注册开关并持久化。 + * + * @param enabled 是否开放注册 + */ + void setEnabled(boolean enabled); +} diff --git a/src/main/java/cn/rosercode/finance/service/impl/AiSuggestionServiceImpl.java b/src/main/java/cn/rosercode/finance/service/impl/AiSuggestionServiceImpl.java index 09fc25b..9311b0d 100644 --- a/src/main/java/cn/rosercode/finance/service/impl/AiSuggestionServiceImpl.java +++ b/src/main/java/cn/rosercode/finance/service/impl/AiSuggestionServiceImpl.java @@ -20,6 +20,7 @@ import cn.rosercode.finance.mapper.TransactionTagMapper; import cn.rosercode.finance.service.AiConfigService; import cn.rosercode.finance.service.AiSuggestionService; import cn.rosercode.finance.service.AiUsageService; +import cn.rosercode.finance.vo.AiNewTagVO; import cn.rosercode.finance.vo.AiSuggestionVO; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -30,11 +31,13 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.function.Function; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -54,14 +57,39 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { /** 原始账单数据注入提示词时的最大长度 */ private static final int RAW_DATA_LIMIT = 300; - /** 系统提示词，要求模型严格返回 JSON */ - private static final String SYSTEM_PROMPT = "你是一个专业的个人记账助手。请根据每条交易记录的类型、金额、备注等信息，" + /** 分类/标签名称最大长度 */ + private static final int NAME_MAX_LENGTH = 20; + + /** 分类图标最大长度（按 UTF-16 字符数限制） */ + private static final int ICON_MAX_LENGTH = 16; + + /** 默认标签颜色，AI 未返回合法颜色时使用 */ + private static final String DEFAULT_TAG_COLOR = "#2080f0"; + + /** 十六进制颜色校验 */ + private static final Pattern COLOR_PATTERN = Pattern.compile("^#[0-9a-fA-F]{6}$"); + + /** 严格模式系统提示词，仅允许使用现有分类与标签，供编辑弹窗单条建议使用 */ + private static final String STRICT_SYSTEM_PROMPT = "你是一个专业的个人记账助手。请根据每条交易记录的类型、金额、备注等信息，" + "从给定的分类列表和标签列表中，为该记录选择最合适的分类与标签。" + "要求：1. 分类必须与记录的类型一致（INCOME 只能选 INCOME 分类，EXPENSE 只能选 EXPENSE 分类）；" + "2. 只能使用给定列表中的 ID，不要编造；3. 标签可多选，也可为空数组；" + "4. 只输出 JSON，不要输出任何多余内容。" + "输出格式：{\"suggestions\":[{\"id\":记录ID,\"categoryId\":分类ID,\"tagIds\":[标签ID],\"reason\":\"简要中文理由\"}]}"; + /** 增强模式系统提示词，允许在现有候选都不合适时提出新建分类与标签 */ + private static final String NEW_SYSTEM_PROMPT = "你是一个专业的个人记账助手。请根据每条交易记录的类型、金额、备注等信息，" + + "为该记录选择合适的分类与标签。优先从给定的分类列表和标签列表中选择，如果列表中确实没有合适的，可以提出新建。" + + "要求：1. 分类必须与记录的类型一致（INCOME 只能选 INCOME 分类，EXPENSE 只能选 EXPENSE 分类）；" + + "2. 优先使用给定列表中的 ID，不要编造列表之外的 ID；" + + "3. 现有列表都不合适时，用 newCategory 提出新分类（name 为 2-6 个汉字，type 与记录类型一致，icon 为最贴切的一个 Emoji），" + + "或（和）用 newTags 提出新标签（name 为 2-6 个汉字，color 为高饱和、搭配白色文字清晰的十六进制颜色）；" + + "4. 已有合适分类时 categoryId 填其 ID 且 newCategory 为 null；已有合适标签时 tagIds 填其 ID 且 newTags 为空数组；" + + "5. 标签可多选，也可为空数组；6. 只输出 JSON，不要输出任何多余内容。" + + "输出格式：{\"suggestions\":[{\"id\":记录ID,\"categoryId\":分类ID或null," + + "\"newCategory\":{\"name\":\"分类名\",\"type\":\"EXPENSE\",\"icon\":\"🐾\"}或null," + + "\"tagIds\":[标签ID],\"newTags\":[{\"name\":\"标签名\",\"color\":\"#2f80ed\"}],\"reason\":\"简要中文理由\"}]}"; + private final AiConfigService aiConfigService; private final TransactionMapper transactionMapper; private final CategoryMapper categoryMapper; @@ -128,11 +156,9 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { throw new BusinessException("未找到可分析的交易记录"); } + // 候选列表允许为空，此时由模型提出新建分类与标签 List categories = categoryMapper.selectList(new LambdaQueryWrapper() .eq(Category::getUserId, userId)); - if (categories.isEmpty()) { - throw new BusinessException("请先创建分类后再使用 AI 建议"); - } List tags = tagMapper.selectList(new LambdaQueryWrapper() .eq(Tag::getUserId, userId)); @@ -216,8 +242,8 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { long start = System.currentTimeMillis(); DeepSeekResponse aiResponse; try { - aiResponse = deepSeekClient.chat(config.getBaseUrl(), config.getApiKey(), config.getModel(), - SYSTEM_PROMPT, userPrompt); + aiResponse = deepSeekClient.chat(config.getBaseUrl(), config.getApiKey(), config.getModel(), + STRICT_SYSTEM_PROMPT, userPrompt); } catch (RuntimeException e) { aiUsageService.recordFailure(userId, AiCallType.SUGGEST, config.getModel(), 1, System.currentTimeMillis() - start, e.getMessage()); @@ -324,12 +350,12 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { */ private String buildSystemPrompt(String scope) { if ("CATEGORY".equals(scope)) { - return SYSTEM_PROMPT + "注意：本次只需给出分类建议，tagIds 必须返回空数组。"; + return NEW_SYSTEM_PROMPT + "注意：本次只需给出分类建议，tagIds 必须返回空数组，newTags 必须返回空数组。"; } if ("TAG".equals(scope)) { - return SYSTEM_PROMPT + "注意：本次只需给出标签建议，categoryId 必须返回 null。"; + return NEW_SYSTEM_PROMPT + "注意：本次只需给出标签建议，categoryId 必须返回 null，newCategory 必须返回 null。"; } - return SYSTEM_PROMPT; + return NEW_SYSTEM_PROMPT; } /** @@ -419,6 +445,11 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { Map tagMap = tagMapper.selectList(new LambdaQueryWrapper() .eq(Tag::getUserId, userId)) .stream().collect(Collectors.toMap(Tag::getId, Function.identity())); + // 名称映射同时作为本次新建的缓存，避免同批重复创建 + Map categoryNameMap = categoryMap.values().stream() + .collect(Collectors.toMap(c -> c.getType() + "|" + c.getName(), Function.identity(), (a, b) -> a)); + Map tagNameMap = tagMap.values().stream() + .collect(Collectors.toMap(Tag::getName, Function.identity(), (a, b) -> a)); int applied = 0; for (AiApplyRequest.Item item : items) { @@ -428,25 +459,43 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { } boolean changed = false; - // 分类：仅接受类型匹配且确属当前用户的分类 - if (item.getCategoryId() != null) { - Category category = categoryMap.get(item.getCategoryId()); - if (category != null - && category.getType().equals(transaction.getType()) - && !category.getId().equals(transaction.getCategoryId())) { - transactionMapper.update(null, new LambdaUpdateWrapper() - .eq(Transaction::getId, transaction.getId()) - .eq(Transaction::getUserId, userId) - .set(Transaction::getCategoryId, category.getId())); - changed = true; - } + // 分类：优先使用现有分类，否则按 AI 建议的名称查找或创建 + Category category = item.getCategoryId() == null ? null : categoryMap.get(item.getCategoryId()); + if (category == null && !isBlank(item.getNewCategoryName())) { + category = resolveCategory(userId, transaction.getType(), item.getNewCategoryName().trim(), + item.getNewCategoryIcon(), categoryNameMap); + } + if (category != null + && category.getType().equals(transaction.getType()) + && !category.getId().equals(transaction.getCategoryId())) { + transactionMapper.update(null, new LambdaUpdateWrapper() + .eq(Transaction::getId, transaction.getId()) + .eq(Transaction::getUserId, userId) + .set(Transaction::getCategoryId, category.getId())); + changed = true; } - // 标签：追加尚未关联的有效标签 - List validTagIds = item.getTagIds() == null ? List.of() : item.getTagIds().stream() - .filter(tagMap::containsKey) - .distinct() - .collect(Collectors.toList()); + // 标签：现有标签ID + AI 建议的新标签，追加尚未关联的有效标签 + List validTagIds = new ArrayList<>(); + if (item.getTagIds() != null) { + item.getTagIds().stream().filter(tagMap::containsKey).distinct().forEach(validTagIds::add); + } + if (item.getNewTags() != null) { + for (AiNewTagVO newTag : item.getNewTags()) { + if (newTag == null || isBlank(newTag.getName()) + || newTag.getName().trim().length() > NAME_MAX_LENGTH) { + continue; + } + String color = newTag.getColor(); + if (color == null || !COLOR_PATTERN.matcher(color).matches()) { + color = DEFAULT_TAG_COLOR; + } + Tag tag = resolveTag(userId, newTag.getName().trim(), color.toLowerCase(), tagNameMap); + if (!validTagIds.contains(tag.getId())) { + validTagIds.add(tag.getId()); + } + } + } if (!validTagIds.isEmpty()) { Set existingTagIds = transactionTagMapper.selectList(new LambdaQueryWrapper() .eq(TransactionTag::getTransactionId, transaction.getId())) @@ -470,6 +519,58 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { return applied; } + /** + * 按「类型 + 名称」查找分类，不存在时创建并写入缓存。 + * + * @param userId 用户ID + * @param type 分类类型，取记录自身类型 + * @param name 分类名称 + * @param icon 分类图标 + * @param categoryNameMap 类型与名称到分类的映射，同时作为新建缓存 + * @return 已存在或新建的分类 + */ + private Category resolveCategory(Long userId, String type, String name, String icon, + Map categoryNameMap) { + String key = type + "|" + name; + Category existing = categoryNameMap.get(key); + if (existing != null) { + return existing; + } + Category category = new Category(); + category.setUserId(userId); + category.setName(name); + category.setType(type); + category.setIcon(icon); + category.setSortOrder(0); + categoryMapper.insert(category); + categoryNameMap.put(key, category); + return category; + } + + /** + * 按名称查找标签，不存在时创建并写入缓存。 + * + * @param userId 用户ID + * @param name 标签名称 + * @param color 标签颜色 + * @param tagNameMap 名称到标签的映射，同时作为新建缓存 + * @return 已存在或新建的标签 + */ + private Tag resolveTag(Long userId, String name, String color, Map tagNameMap) { + Tag existing = tagNameMap.get(name); + if (existing != null) { + return existing; + } + Tag tag = new Tag(); + tag.setUserId(userId); + tag.setName(name); + tag.setColor(color); + tag.setSortOrder(0); + tagMapper.insert(tag); + tagNameMap.put(name, tag); + return tag; + } + /** * 构建用户提示词，将分类、标签与交易记录序列化为 JSON。 * @@ -546,6 +647,9 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { .collect(Collectors.toMap(Category::getId, Function.identity())); Map tagMap = tags.stream() .collect(Collectors.toMap(Tag::getId, Function.identity())); + // 名称到标签的映射，用于把 AI 提出的新标签与现有标签同名时直接复用 + Map tagNameMap = tags.stream() + .collect(Collectors.toMap(Tag::getName, Function.identity(), (a, b) -> a)); List result = new ArrayList<>(); for (JsonNode node : array) { @@ -557,19 +661,22 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { AiSuggestionVO vo = new AiSuggestionVO(); vo.setTransactionId(id); - // 分类必须存在且与记录类型一致（仅标签建议时跳过） + // 分类：优先使用现有且类型一致的分类，否则接受模型提出的新分类 if (wantCategory) { long categoryId = node.path("categoryId").asLong(0); Category category = categoryMap.get(categoryId); if (category != null && category.getType().equals(transaction.getType())) { vo.setCategoryId(category.getId()); vo.setCategoryName(category.getName()); + } else { + fillNewCategory(vo, node.path("newCategory")); } } - // 标签过滤为属于当前用户的标签（仅分类建议时跳过） + // 标签：现有标签按ID校验，新标签按名称去重、同名时复用现有标签 List tagIds = new ArrayList<>(); List tagNames = new ArrayList<>(); + List newTags = new ArrayList<>(); if (wantTag) { JsonNode tagNode = node.path("tagIds"); if (tagNode.isArray()) { @@ -581,19 +688,84 @@ public class AiSuggestionServiceImpl implements AiSuggestionService { } } } + collectNewTags(node.path("newTags"), tagNameMap, tagIds, tagNames, newTags); } vo.setTagIds(tagIds); vo.setTagNames(tagNames); + vo.setNewTags(newTags); vo.setReason(node.path("reason").asText("")); - // 至少存在一项有效建议才返回 - if (vo.getCategoryId() != null || !tagIds.isEmpty()) { + // 至少存在一项有效建议（现有或新建）才返回 + if (vo.getCategoryId() != null || !isBlank(vo.getNewCategoryName()) + || !tagIds.isEmpty() || !newTags.isEmpty()) { result.add(vo); } } return result; } + /** + * 从模型返回的 newCategory 节点填充新分类建议，名称非法时忽略。 + * + * @param vo 建议对象 + * @param node 模型返回的 newCategory 节点 + */ + private void fillNewCategory(AiSuggestionVO vo, JsonNode node) { + if (!node.isObject()) { + return; + } + String name = node.path("name").asText("").trim(); + if (isBlank(name) || name.length() > NAME_MAX_LENGTH) { + return; + } + String icon = node.path("icon").asText("").trim(); + vo.setNewCategoryName(name); + vo.setNewCategoryIcon(icon.length() <= ICON_MAX_LENGTH ? icon : ""); + } + + /** + * 收集模型提出的新标签，按名称去重；与现有标签同名时转为现有标签ID。 + * + * @param node 模型返回的 newTags 节点 + * @param tagNameMap 现有标签名称到标签的映射 + * @param tagIds 现有标签ID收集列表，同名标签会追加到这里 + * @param tagNames 现有标签名称收集列表 + * @param newTags 新标签收集列表 + */ + private void collectNewTags(JsonNode node, + Map tagNameMap, + List tagIds, + List tagNames, + List newTags) { + if (!node.isArray()) { + return; + } + Set seen = new LinkedHashSet<>(); + for (JsonNode item : node) { + String name = item.path("name").asText("").trim(); + if (isBlank(name) || name.length() > NAME_MAX_LENGTH || !seen.add(name)) { + continue; + } + // 与现有标签同名时直接复用，避免重复创建 + Tag existing = tagNameMap.get(name); + if (existing != null) { + if (!tagIds.contains(existing.getId())) { + tagIds.add(existing.getId()); + tagNames.add(existing.getName()); + } + continue; + } + String color = item.path("color").asText("").trim(); + if (!COLOR_PATTERN.matcher(color).matches()) { + color = DEFAULT_TAG_COLOR; + } + AiNewTagVO newTag = new AiNewTagVO(); + newTag.setName(name); + newTag.setColor(color.toLowerCase()); + newTags.add(newTag); + } + } + /** * 去除模型可能附加的 Markdown 代码块围栏。 * diff --git a/src/main/java/cn/rosercode/finance/service/impl/DatabaseServiceImpl.java b/src/main/java/cn/rosercode/finance/service/impl/DatabaseServiceImpl.java new file mode 100644 index 0000000..7f84bf1 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/service/impl/DatabaseServiceImpl.java @@ -0,0 +1,382 @@ +package cn.rosercode.finance.service.impl; + +import cn.rosercode.finance.common.BusinessException; +import cn.rosercode.finance.config.datasource.DataSourceContextHolder; +import cn.rosercode.finance.config.datasource.DataSourceType; +import cn.rosercode.finance.config.datasource.DatabaseConfig; +import cn.rosercode.finance.config.datasource.DatabaseConfigStore; +import cn.rosercode.finance.config.datasource.DynamicDataSource; +import cn.rosercode.finance.config.datasource.SchemaInitializer; +import cn.rosercode.finance.dto.DatabaseConfigRequest; +import cn.rosercode.finance.service.DatabaseService; +import cn.rosercode.finance.vo.DatabaseStatusVO; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.sql.DataSource; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 数据库配置服务实现类。 + * + *

负责连接测试、数据源创建与运行时切换、建表初始化，以及启动时的配置引导。 + * 配置优先从本地文件 {@code config/database.json} 读取，其次兼容从环境变量 + * {@code DB_URL/DB_USERNAME/DB_PASSWORD} 读取，以保证旧部署方式仍可平滑运行。

+ * + * @date 2026-09-18 11:01:18 + */ +@Service +public class DatabaseServiceImpl implements DatabaseService { + + private static final Logger log = LoggerFactory.getLogger(DatabaseServiceImpl.class); + + /** 从 MySQL JDBC URL 中解析主机、端口与库名 */ + private static final Pattern MYSQL_URL_PATTERN = + Pattern.compile("jdbc:mysql://([^:/]+):(\\d+)/([^?]+)"); + + private final DynamicDataSource dynamicDataSource; + private final DatabaseConfigStore configStore; + private final SchemaInitializer schemaInitializer; + + /** 当前生效的数据库配置，未配置时为 null */ + private volatile DatabaseConfig currentConfig; + + public DatabaseServiceImpl(DynamicDataSource dynamicDataSource, + DatabaseConfigStore configStore, + SchemaInitializer schemaInitializer) { + this.dynamicDataSource = dynamicDataSource; + this.configStore = configStore; + this.schemaInitializer = schemaInitializer; + } + + /** + * {@inheritDoc} + */ + @Override + public DatabaseStatusVO getStatus() { + return buildStatus(currentConfig); + } + + /** + * {@inheritDoc} + * + * 使用临时连接池验证连通性，验证完成后立即关闭，不影响当前数据源。 + */ + @Override + public void testConnection(DatabaseConfigRequest request) { + DatabaseConfig config = toConfig(request, currentConfig); + validate(config); + normalizeSqlitePath(config); + + try (HikariDataSource dataSource = createDataSource(config)) { + assertConnectable(dataSource); + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw new BusinessException("数据库连接失败：" + rootMessage(e)); + } + } + + /** + * {@inheritDoc} + * + * 执行顺序：创建并测试新数据源 -> 建表 -> 持久化配置 -> 切换数据源。 + * 任一步骤失败都会关闭新数据源并保持原有配置不变。 + */ + @Override + public synchronized DatabaseStatusVO save(DatabaseConfigRequest request) { + DatabaseConfig config = toConfig(request, currentConfig); + validate(config); + normalizeSqlitePath(config); + + HikariDataSource newDataSource = createDataSource(config); + boolean switched = false; + try { + assertConnectable(newDataSource); + schemaInitializer.initialize(newDataSource, config.getType()); + // 先落盘再切换，避免切换成功但配置未保存导致重启后状态不一致 + configStore.save(config); + dynamicDataSource.addAndSwitch(config.getType(), newDataSource); + switched = true; + currentConfig = config; + log.info("数据库配置已更新并切换到 {}：{}", config.getType().getDisplayName(), config.maskedSummary()); + return buildStatus(config); + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw new BusinessException("数据库配置失败：" + rootMessage(e)); + } finally { + if (!switched) { + newDataSource.close(); + } + } + } + + /** + * {@inheritDoc} + * + * 优先读取本地配置文件；若不存在，则尝试从环境变量构建配置并保存到本地。 + */ + @Override + public void bootstrap() { + Optional stored = configStore.load(); + if (stored.isPresent()) { + applyStoredConfig(stored.get()); + return; + } + + DatabaseConfig fromEnv = fromEnvironment(); + if (fromEnv == null) { + log.warn("未检测到数据库配置，服务以未配置状态启动，请通过数据库设置页完成配置"); + return; + } + try { + applyConfig(fromEnv); + configStore.save(fromEnv); + log.info("已从环境变量加载数据库配置并保存到本地配置文件"); + } catch (Exception e) { + log.error("从环境变量加载数据库配置失败：{}", rootMessage(e)); + } + } + + /** + * 应用本地文件中的配置，失败时回退到未配置状态。 + * + * @param config 本地保存的数据库配置 + */ + private void applyStoredConfig(DatabaseConfig config) { + try { + applyConfig(config); + log.info("已从本地配置加载 {} 数据源：{}", config.getType().getDisplayName(), config.maskedSummary()); + } catch (Exception e) { + log.error("加载本地数据库配置失败：{}，服务将以未配置状态运行", rootMessage(e)); + DataSourceContextHolder.reset(); + } + } + + /** + * 创建数据源、测试连通性、初始化表结构并切换。 + * + * @param config 数据库配置 + */ + private void applyConfig(DatabaseConfig config) { + validate(config); + normalizeSqlitePath(config); + + HikariDataSource dataSource = createDataSource(config); + boolean switched = false; + try { + assertConnectable(dataSource); + schemaInitializer.initialize(dataSource, config.getType()); + dynamicDataSource.addAndSwitch(config.getType(), dataSource); + switched = true; + currentConfig = config; + } finally { + if (!switched) { + dataSource.close(); + } + } + } + + /** + * 根据配置创建 Hikari 连接池。 + * + *

SQLite 为单文件数据库，写操作会加文件锁，因此连接池大小固定为 1，避免并发写冲突。

+ * + * @param config 数据库配置 + * @return 连接池数据源 + */ + private HikariDataSource createDataSource(DatabaseConfig config) { + HikariConfig hikari = new HikariConfig(); + hikari.setPoolName("finance-" + config.getType().name().toLowerCase()); + hikari.setDriverClassName(config.getType().getDriverClassName()); + hikari.setJdbcUrl(config.buildJdbcUrl()); + hikari.setConnectionTimeout(10_000); + + if (config.getType() == DataSourceType.SQLITE) { + hikari.setMaximumPoolSize(1); + hikari.setMinimumIdle(1); + } else { + hikari.setUsername(config.getUsername()); + hikari.setPassword(config.getPassword()); + hikari.setMaximumPoolSize(10); + hikari.setMinimumIdle(2); + } + return new HikariDataSource(hikari); + } + + /** + * 校验数据源是否可连接。 + * + * @param dataSource 数据源 + */ + private void assertConnectable(DataSource dataSource) { + try (Connection connection = dataSource.getConnection()) { + if (!connection.isValid(5)) { + throw new BusinessException("数据库连接无效"); + } + } catch (SQLException e) { + throw new BusinessException("数据库连接失败：" + e.getMessage()); + } + } + + /** + * 将 SQLite 文件路径规范化为绝对路径，并确保父目录存在。 + * + * @param config 数据库配置 + */ + private void normalizeSqlitePath(DatabaseConfig config) { + if (config.getType() != DataSourceType.SQLITE) { + return; + } + Path path = Paths.get(config.getSqlitePath()).toAbsolutePath().normalize(); + try { + if (path.getParent() != null) { + Files.createDirectories(path.getParent()); + } + } catch (Exception e) { + throw new BusinessException("创建 SQLite 数据库目录失败：" + e.getMessage()); + } + config.setSqlitePath(path.toString()); + } + + /** + * 校验配置完整性。 + * + * @param config 数据库配置 + */ + private void validate(DatabaseConfig config) { + if (config.getType() == null) { + throw new BusinessException("请选择数据库类型"); + } + if (config.getType() == DataSourceType.SQLITE) { + if (!StringUtils.hasText(config.getSqlitePath())) { + throw new BusinessException("请填写 SQLite 数据库文件路径"); + } + return; + } + if (!StringUtils.hasText(config.getHost())) { + throw new BusinessException("请填写数据库主机地址"); + } + if (config.getPort() == null || config.getPort() < 1 || config.getPort() > 65535) { + throw new BusinessException("数据库端口不合法"); + } + if (!StringUtils.hasText(config.getDatabase())) { + throw new BusinessException("请填写数据库名称"); + } + if (!StringUtils.hasText(config.getUsername())) { + throw new BusinessException("请填写数据库用户名"); + } + } + + /** + * 将请求对象转换为内部配置对象，密码留空时沿用已保存的密码。 + * + * @param request 请求对象 + * @param base 当前已生效的配置，可为 null + * @return 数据库配置 + */ + private DatabaseConfig toConfig(DatabaseConfigRequest request, DatabaseConfig base) { + DatabaseConfig config = new DatabaseConfig(); + config.setType(request.getType()); + config.setSqlitePath(request.getSqlitePath()); + config.setHost(request.getHost()); + config.setPort(request.getPort() != null ? request.getPort() : 3306); + config.setDatabase(request.getDatabase()); + config.setUsername(request.getUsername()); + config.setPassword(resolvePassword(request, base)); + return config; + } + + /** + * 解析 MySQL 密码：请求未提供密码时沿用已保存配置中的密码。 + * + * @param request 请求对象 + * @param base 当前已生效的配置 + * @return 最终使用的密码 + */ + private String resolvePassword(DatabaseConfigRequest request, DatabaseConfig base) { + if (request.getType() == DataSourceType.MYSQL + && !StringUtils.hasText(request.getPassword()) + && base != null + && base.getType() == DataSourceType.MYSQL) { + return base.getPassword(); + } + return request.getPassword(); + } + + /** + * 从环境变量构建 MySQL 配置，兼容旧部署方式。 + * + * @return 数据库配置，环境变量缺失或无法解析时返回 null + */ + private DatabaseConfig fromEnvironment() { + String url = System.getenv("DB_URL"); + if (!StringUtils.hasText(url)) { + return null; + } + Matcher matcher = MYSQL_URL_PATTERN.matcher(url); + if (!matcher.find()) { + log.warn("环境变量 DB_URL 无法解析为 MySQL 连接地址，已忽略：{}", url); + return null; + } + DatabaseConfig config = new DatabaseConfig(); + config.setType(DataSourceType.MYSQL); + config.setHost(matcher.group(1)); + config.setPort(Integer.parseInt(matcher.group(2))); + config.setDatabase(matcher.group(3)); + config.setUsername(System.getenv("DB_USERNAME")); + config.setPassword(System.getenv("DB_PASSWORD")); + return config; + } + + /** + * 构建数据库状态视图对象。 + * + * @param config 数据库配置，可为 null + * @return 状态视图对象 + */ + private DatabaseStatusVO buildStatus(DatabaseConfig config) { + DatabaseStatusVO vo = new DatabaseStatusVO(); + vo.setConfigFile(configStore.getConfigFile().toAbsolutePath().toString()); + if (config == null) { + vo.setConfigured(false); + return vo; + } + vo.setConfigured(true); + vo.setType(config.getType()); + vo.setTypeName(config.getType().getDisplayName()); + vo.setSummary(config.maskedSummary()); + vo.setHost(config.getHost()); + vo.setPort(config.getPort()); + vo.setDatabase(config.getDatabase()); + vo.setUsername(config.getUsername()); + vo.setSqlitePath(config.getSqlitePath()); + return vo; + } + + /** + * 获取异常链中最底层异常的消息。 + * + * @param throwable 异常 + * @return 根因消息 + */ + private String rootMessage(Throwable throwable) { + Throwable cause = throwable; + while (cause.getCause() != null && cause.getCause() != cause) { + cause = cause.getCause(); + } + return cause.getMessage() != null ? cause.getMessage() : cause.getClass().getSimpleName(); + } +} diff --git a/src/main/java/cn/rosercode/finance/service/impl/DefaultDataInitializer.java b/src/main/java/cn/rosercode/finance/service/impl/DefaultDataInitializer.java new file mode 100644 index 0000000..82548ad --- /dev/null +++ b/src/main/java/cn/rosercode/finance/service/impl/DefaultDataInitializer.java @@ -0,0 +1,127 @@ +package cn.rosercode.finance.service.impl; + +import cn.rosercode.finance.entity.Category; +import cn.rosercode.finance.entity.Tag; +import cn.rosercode.finance.mapper.CategoryMapper; +import cn.rosercode.finance.mapper.TagMapper; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 默认数据初始化器。 + * + *

为新注册用户创建一套默认分类与标签。相比原先需要手动执行的 SQL 种子脚本， + * 使用 Java 代码插入可同时兼容 MySQL 与 SQLite 两种数据库。

+ * + * @date 2026-09-18 11:02:15 + */ +@Component +public class DefaultDataInitializer { + + /** 默认支出分类（名称、图标、排序） */ + private static final List DEFAULT_EXPENSE_CATEGORIES = List.of( + new CategorySeed("餐饮", "🍜", 10), + new CategorySeed("交通", "🚌", 20), + new CategorySeed("购物", "🛍️", 30), + new CategorySeed("居住", "🏠", 40), + new CategorySeed("通讯", "📱", 50), + new CategorySeed("娱乐", "🎮", 60), + new CategorySeed("医疗", "💊", 70), + new CategorySeed("教育", "📚", 80), + new CategorySeed("美容美发", "💇", 85), + new CategorySeed("人情往来", "🎁", 90), + new CategorySeed("其他支出", "📦", 100)); + + /** 默认收入分类（名称、图标、排序） */ + private static final List DEFAULT_INCOME_CATEGORIES = List.of( + new CategorySeed("工资", "💰", 10), + new CategorySeed("奖金", "🧧", 20), + new CategorySeed("兼职", "💼", 30), + new CategorySeed("投资收益", "📈", 40), + new CategorySeed("退款", "↩️", 50), + new CategorySeed("其他收入", "📦", 60)); + + /** 默认标签（名称、颜色、排序） */ + private static final List DEFAULT_TAGS = List.of( + new TagSeed("报销", "#2080f0", 10), + new TagSeed("待报销", "#f0a020", 20), + new TagSeed("旅行", "#18a058", 30), + new TagSeed("家庭", "#8a2be2", 40), + new TagSeed("工作", "#d03050", 50), + new TagSeed("学习", "#0ea5e9", 60), + new TagSeed("医疗", "#e11d48", 70), + new TagSeed("大额消费", "#f97316", 80), + new TagSeed("订阅", "#7c3aed", 90), + new TagSeed("礼物", "#ec4899", 100), + new TagSeed("投资", "#16a34a", 110), + new TagSeed("宠物", "#a16207", 120), + new TagSeed("电影", "#14b8a6", 130)); + + private final CategoryMapper categoryMapper; + private final TagMapper tagMapper; + + public DefaultDataInitializer(CategoryMapper categoryMapper, TagMapper tagMapper) { + this.categoryMapper = categoryMapper; + this.tagMapper = tagMapper; + } + + /** + * 为指定用户初始化默认分类与标签。 + * + * @param userId 用户ID + */ + public void initializeForUser(Long userId) { + for (CategorySeed seed : DEFAULT_EXPENSE_CATEGORIES) { + insertCategory(userId, seed, "EXPENSE"); + } + for (CategorySeed seed : DEFAULT_INCOME_CATEGORIES) { + insertCategory(userId, seed, "INCOME"); + } + for (TagSeed seed : DEFAULT_TAGS) { + Tag tag = new Tag(); + tag.setUserId(userId); + tag.setName(seed.name()); + tag.setColor(seed.color()); + tag.setSortOrder(seed.sortOrder()); + tagMapper.insert(tag); + } + } + + /** + * 插入一条分类记录。 + * + * @param userId 用户ID + * @param seed 分类种子数据 + * @param type 分类类型 + */ + private void insertCategory(Long userId, CategorySeed seed, String type) { + Category category = new Category(); + category.setUserId(userId); + category.setName(seed.name()); + category.setType(type); + category.setIcon(seed.icon()); + category.setSortOrder(seed.sortOrder()); + categoryMapper.insert(category); + } + + /** + * 分类种子数据。 + * + * @param name 分类名称 + * @param icon 分类图标 + * @param sortOrder 排序序号 + */ + private record CategorySeed(String name, String icon, int sortOrder) { + } + + /** + * 标签种子数据。 + * + * @param name 标签名称 + * @param color 标签颜色 + * @param sortOrder 排序序号 + */ + private record TagSeed(String name, String color, int sortOrder) { + } +} diff --git a/src/main/java/cn/rosercode/finance/service/impl/RegistrationServiceImpl.java b/src/main/java/cn/rosercode/finance/service/impl/RegistrationServiceImpl.java new file mode 100644 index 0000000..bb694f7 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/service/impl/RegistrationServiceImpl.java @@ -0,0 +1,76 @@ +package cn.rosercode.finance.service.impl; + +import cn.rosercode.finance.config.app.AppConfig; +import cn.rosercode.finance.config.app.AppConfigStore; +import cn.rosercode.finance.mapper.UserMapper; +import cn.rosercode.finance.service.RegistrationService; +import cn.rosercode.finance.vo.RegistrationStatusVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +/** + * 注册管理服务实现类。 + * + *

注册是否放行的规则为：注册开关开启，或系统尚无任何用户（允许创建首个用户）。 + * 开关状态持久化在本地文件 {@code config/app.json}。

+ * + * @date 2026-09-18 12:09:28 + */ +@Service +public class RegistrationServiceImpl implements RegistrationService { + + private static final Logger log = LoggerFactory.getLogger(RegistrationServiceImpl.class); + + private final UserMapper userMapper; + private final AppConfigStore appConfigStore; + + public RegistrationServiceImpl(UserMapper userMapper, AppConfigStore appConfigStore) { + this.userMapper = userMapper; + this.appConfigStore = appConfigStore; + } + + /** + * {@inheritDoc} + */ + @Override + public RegistrationStatusVO getStatus() { + boolean enabled = appConfigStore.load().isRegistrationEnabled(); + boolean firstUser = countUsers() == 0; + + RegistrationStatusVO vo = new RegistrationStatusVO(); + vo.setEnabled(enabled); + vo.setFirstUser(firstUser); + vo.setAllowed(enabled || firstUser); + return vo; + } + + /** + * {@inheritDoc} + */ + @Override + public boolean isRegistrationAllowed() { + return appConfigStore.load().isRegistrationEnabled() || countUsers() == 0; + } + + /** + * {@inheritDoc} + */ + @Override + public void setEnabled(boolean enabled) { + AppConfig config = appConfigStore.load(); + config.setRegistrationEnabled(enabled); + appConfigStore.save(config); + log.info("注册功能已{}", enabled ? "开启" : "关闭"); + } + + /** + * 统计系统用户数量。 + * + * @return 用户数量 + */ + private long countUsers() { + Long count = userMapper.selectCount(null); + return count == null ? 0L : count; + } +} diff --git a/src/main/java/cn/rosercode/finance/service/impl/StatisticsServiceImpl.java b/src/main/java/cn/rosercode/finance/service/impl/StatisticsServiceImpl.java index ff1ebdc..f488d05 100644 --- a/src/main/java/cn/rosercode/finance/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/cn/rosercode/finance/service/impl/StatisticsServiceImpl.java @@ -2,6 +2,8 @@ package cn.rosercode.finance.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.rosercode.finance.common.BusinessException; +import cn.rosercode.finance.config.datasource.DataSourceContextHolder; +import cn.rosercode.finance.config.datasource.DataSourceType; import cn.rosercode.finance.dto.StatisticsQuery; import cn.rosercode.finance.dto.StatisticsRangeQuery; import cn.rosercode.finance.entity.Category; @@ -332,12 +334,29 @@ public class StatisticsServiceImpl implements StatisticsService { } /** - * 根据维度返回 SQL 分组表达式 + * 根据维度返回 SQL 分组表达式。 + * + *

MySQL 与 SQLite 的时间函数不同：MySQL 使用 {@code DATE_FORMAT/QUARTER}， + * SQLite 使用 {@code strftime}，因此需按当前数据源类型选择对应表达式。

* * @param dimension 统计维度 * @return 分组表达式 */ private String groupExpression(StatisticsDimension dimension) { + if (DataSourceContextHolder.getType() == DataSourceType.SQLITE) { + return switch (dimension) { + case DAY -> "strftime('%Y-%m-%d', transaction_time)"; + // SQLite 无 ISO 周函数，使用 %W（周一为一周起点）近似 + case WEEK -> "strftime('%Y-W%W', transaction_time)"; + case MONTH -> "strftime('%Y-%m', transaction_time)"; + case QUARTER -> "strftime('%Y', transaction_time) || '-Q' || " + + "((CAST(strftime('%m', transaction_time) AS INTEGER) + 2) / 3)"; + case YEAR -> "strftime('%Y', transaction_time)"; + case PAYMENT_METHOD -> "payment_method"; + case CATEGORY -> "category_id"; + case TYPE -> "type"; + }; + } return switch (dimension) { case DAY -> "DATE_FORMAT(transaction_time, '%Y-%m-%d')"; case WEEK -> "DATE_FORMAT(transaction_time, '%x-W%v')"; diff --git a/src/main/java/cn/rosercode/finance/service/impl/UserServiceImpl.java b/src/main/java/cn/rosercode/finance/service/impl/UserServiceImpl.java index 32fdbe6..de70b76 100644 --- a/src/main/java/cn/rosercode/finance/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/rosercode/finance/service/impl/UserServiceImpl.java @@ -6,6 +6,7 @@ import cn.rosercode.finance.dto.LoginRequest; import cn.rosercode.finance.dto.RegisterRequest; import cn.rosercode.finance.entity.User; import cn.rosercode.finance.mapper.UserMapper; +import cn.rosercode.finance.service.RegistrationService; import cn.rosercode.finance.service.UserService; import cn.rosercode.finance.util.JwtUtil; import cn.rosercode.finance.vo.LoginVO; @@ -22,11 +23,16 @@ public class UserServiceImpl implements UserService { private final UserMapper userMapper; private final JwtUtil jwtUtil; + private final DefaultDataInitializer defaultDataInitializer; + private final RegistrationService registrationService; private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - public UserServiceImpl(UserMapper userMapper, JwtUtil jwtUtil) { + public UserServiceImpl(UserMapper userMapper, JwtUtil jwtUtil, DefaultDataInitializer defaultDataInitializer, + RegistrationService registrationService) { this.userMapper = userMapper; this.jwtUtil = jwtUtil; + this.defaultDataInitializer = defaultDataInitializer; + this.registrationService = registrationService; } /** @@ -66,6 +72,11 @@ public class UserServiceImpl implements UserService { @Override @Transactional public void register(RegisterRequest request) { + // 注册功能关闭且已存在用户时，拒绝注册（保留首个用户创建能力） + if (!registrationService.isRegistrationAllowed()) { + throw new BusinessException(403, "注册功能已关闭"); + } + // 检查用户名是否已被注册 User existing = userMapper.selectOne(new LambdaQueryWrapper() .eq(User::getUsername, request.getUsername())); @@ -81,6 +92,9 @@ public class UserServiceImpl implements UserService { // 如果未提供昵称，则使用用户名作为默认昵称 user.setNickname(request.getNickname() != null ? request.getNickname() : request.getUsername()); userMapper.insert(user); + + // 为新用户初始化默认分类与标签 + defaultDataInitializer.initializeForUser(user.getId()); } /** diff --git a/src/main/java/cn/rosercode/finance/vo/AiNewTagVO.java b/src/main/java/cn/rosercode/finance/vo/AiNewTagVO.java new file mode 100644 index 0000000..9a52974 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/vo/AiNewTagVO.java @@ -0,0 +1,18 @@ +package cn.rosercode.finance.vo; + +import lombok.Data; + +/** + * AI 建议新建标签视图对象，携带标签名称与颜色。 + * + * @date 2026-09-18 10:50:03 + */ +@Data +public class AiNewTagVO { + + /** 建议新建的标签名称 */ + private String name; + + /** 建议新建的标签颜色（十六进制） */ + private String color; +} diff --git a/src/main/java/cn/rosercode/finance/vo/AiSuggestionVO.java b/src/main/java/cn/rosercode/finance/vo/AiSuggestionVO.java index 3681369..439cd9a 100644 --- a/src/main/java/cn/rosercode/finance/vo/AiSuggestionVO.java +++ b/src/main/java/cn/rosercode/finance/vo/AiSuggestionVO.java @@ -33,6 +33,15 @@ public class AiSuggestionVO { /** 建议标签名称列表 */ private List tagNames; + /** 建议新建的分类名称，为 null 表示不新建分类 */ + private String newCategoryName; + + /** 建议新建的分类图标（Emoji） */ + private String newCategoryIcon; + + /** 建议新建的标签列表，为空表示不新建标签 */ + private List newTags; + /** 建议理由 */ private String reason; } diff --git a/src/main/java/cn/rosercode/finance/vo/DatabaseStatusVO.java b/src/main/java/cn/rosercode/finance/vo/DatabaseStatusVO.java new file mode 100644 index 0000000..ab592d7 --- /dev/null +++ b/src/main/java/cn/rosercode/finance/vo/DatabaseStatusVO.java @@ -0,0 +1,43 @@ +package cn.rosercode.finance.vo; + +import cn.rosercode.finance.config.datasource.DataSourceType; +import lombok.Data; + +/** + * 数据库状态视图对象，用于向前端展示当前数据库配置情况。 + * + * @date 2026-09-18 11:01:00 + */ +@Data +public class DatabaseStatusVO { + + /** 是否已完成数据库配置 */ + private boolean configured; + + /** 数据库类型 */ + private DataSourceType type; + + /** 数据库类型显示名称 */ + private String typeName; + + /** 脱敏后的连接摘要 */ + private String summary; + + /** 本地配置文件路径 */ + private String configFile; + + /** MySQL 主机地址（用于回显，仅 MySQL） */ + private String host; + + /** MySQL 端口（用于回显，仅 MySQL） */ + private Integer port; + + /** MySQL 数据库名（用于回显，仅 MySQL） */ + private String database; + + /** MySQL 用户名（用于回显，仅 MySQL） */ + private String username; + + /** SQLite 文件路径（用于回显，仅 SQLite） */ + private String sqlitePath; +} diff --git a/src/main/java/cn/rosercode/finance/vo/RegistrationStatusVO.java b/src/main/java/cn/rosercode/finance/vo/RegistrationStatusVO.java new file mode 100644 index 0000000..505b76d --- /dev/null +++ b/src/main/java/cn/rosercode/finance/vo/RegistrationStatusVO.java @@ -0,0 +1,21 @@ +package cn.rosercode.finance.vo; + +import lombok.Data; + +/** + * 注册状态视图对象，用于向前端展示注册开关与是否允许注册。 + * + * @date 2026-09-18 12:09:24 + */ +@Data +public class RegistrationStatusVO { + + /** 注册开关是否开启 */ + private boolean enabled; + + /** 当前是否为无任何用户的首个用户场景 */ + private boolean firstUser; + + /** 当前是否允许注册（开关开启或首个用户） */ + private boolean allowed; +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9474455..b0ce996 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,16 +1,13 @@ spring: application: - name: my-app + name: finance-app servlet: multipart: max-file-size: 10MB max-request-size: 10MB - datasource: - url: ${DB_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - driver-class-name: com.mysql.cj.jdbc.Driver +# 数据源不再在此固定配置，改由运行时数据库配置（config/database.json）决定， +# 详见 cn.rosercode.finance.config.datasource 包。 mybatis-plus: mapper-locations: classpath:mapper/*.xml type-aliases-package: cn.rosercode.finance.entity diff --git a/src/main/resources/sql/schema-sqlite.sql b/src/main/resources/sql/schema-sqlite.sql new file mode 100644 index 0000000..3f7f67e --- /dev/null +++ b/src/main/resources/sql/schema-sqlite.sql @@ -0,0 +1,125 @@ +-- SQLite 建表脚本 +-- 说明：与 MySQL 版（init.sql）保持相同的表结构与语义，差异如下： +-- 1. 自增主键使用 INTEGER PRIMARY KEY AUTOINCREMENT +-- 2. 不支持列 COMMENT，故移除全部注释 +-- 3. TINYINT(1) 使用 INTEGER，JSON 使用 TEXT，DECIMAL 使用 NUMERIC +-- 4. 索引使用独立的 CREATE INDEX 语句 +-- 5. 时间默认值与触发器使用本地时间（SQLite 的 CURRENT_TIMESTAMP 为 UTC） +-- 语句分隔符为 ;;，以兼容 CREATE TRIGGER 内部的分号 + +CREATE TABLE IF NOT EXISTS t_user ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + username VARCHAR(50) NOT NULL UNIQUE, + password_hash VARCHAR(255) NOT NULL, + nickname VARCHAR(50), + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')), + updated_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; + +CREATE TABLE IF NOT EXISTS t_category ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + name VARCHAR(50) NOT NULL, + type VARCHAR(10) NOT NULL, + icon VARCHAR(50), + sort_order INTEGER NOT NULL DEFAULT 0, + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; +CREATE INDEX IF NOT EXISTS idx_category_user_id ON t_category (user_id);; +CREATE INDEX IF NOT EXISTS idx_category_user_type ON t_category (user_id, type);; + +CREATE TABLE IF NOT EXISTS t_transaction ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + category_id INTEGER, + type VARCHAR(10) NOT NULL, + amount NUMERIC(12, 2) NOT NULL, + payment_method VARCHAR(30), + remark VARCHAR(255), + remark_hidden INTEGER NOT NULL DEFAULT 0, + external_no VARCHAR(64), + transaction_time DATETIME NOT NULL, + include_in_stats INTEGER NOT NULL DEFAULT 1, + raw_data TEXT, + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')), + updated_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; +CREATE INDEX IF NOT EXISTS idx_transaction_user_id ON t_transaction (user_id);; +CREATE INDEX IF NOT EXISTS idx_transaction_category_id ON t_transaction (category_id);; +CREATE INDEX IF NOT EXISTS idx_transaction_time ON t_transaction (transaction_time);; +CREATE INDEX IF NOT EXISTS idx_transaction_user_time ON t_transaction (user_id, transaction_time);; +CREATE UNIQUE INDEX IF NOT EXISTS uk_user_external ON t_transaction (user_id, external_no);; + +CREATE TABLE IF NOT EXISTS t_tag ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + name VARCHAR(50) NOT NULL, + color VARCHAR(20), + sort_order INTEGER NOT NULL DEFAULT 0, + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; +CREATE INDEX IF NOT EXISTS idx_tag_user_id ON t_tag (user_id);; +CREATE UNIQUE INDEX IF NOT EXISTS uk_tag_user_name ON t_tag (user_id, name);; + +CREATE TABLE IF NOT EXISTS t_transaction_tag ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + transaction_id INTEGER NOT NULL, + tag_id INTEGER NOT NULL, + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; +CREATE UNIQUE INDEX IF NOT EXISTS uk_transaction_tag ON t_transaction_tag (transaction_id, tag_id);; +CREATE INDEX IF NOT EXISTS idx_transaction_tag_tag_id ON t_transaction_tag (tag_id);; + +CREATE TABLE IF NOT EXISTS t_ai_config ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + enabled INTEGER NOT NULL DEFAULT 0, + api_key VARCHAR(255), + base_url VARCHAR(255) NOT NULL DEFAULT 'https://api.deepseek.com', + model VARCHAR(50) NOT NULL DEFAULT 'deepseek-chat', + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')), + updated_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; +CREATE UNIQUE INDEX IF NOT EXISTS uk_ai_config_user_id ON t_ai_config (user_id);; + +CREATE TABLE IF NOT EXISTS t_ai_usage ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + type VARCHAR(20) NOT NULL, + model VARCHAR(50), + transaction_count INTEGER NOT NULL DEFAULT 0, + prompt_tokens INTEGER NOT NULL DEFAULT 0, + completion_tokens INTEGER NOT NULL DEFAULT 0, + total_tokens INTEGER NOT NULL DEFAULT 0, + cached_tokens INTEGER NOT NULL DEFAULT 0, + success INTEGER NOT NULL DEFAULT 1, + error_message VARCHAR(500), + duration_ms INTEGER, + created_at DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime')) +);; +CREATE INDEX IF NOT EXISTS idx_ai_usage_user_created ON t_ai_usage (user_id, created_at);; + +-- 兜底触发器：当应用层未显式更新 updated_at 时，自动刷新为本地时间 +CREATE TRIGGER IF NOT EXISTS trg_user_updated_at +AFTER UPDATE ON t_user +FOR EACH ROW +WHEN NEW.updated_at = OLD.updated_at +BEGIN + UPDATE t_user SET updated_at = strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime') WHERE id = OLD.id; +END;; + +CREATE TRIGGER IF NOT EXISTS trg_transaction_updated_at +AFTER UPDATE ON t_transaction +FOR EACH ROW +WHEN NEW.updated_at = OLD.updated_at +BEGIN + UPDATE t_transaction SET updated_at = strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime') WHERE id = OLD.id; +END;; + +CREATE TRIGGER IF NOT EXISTS trg_ai_config_updated_at +AFTER UPDATE ON t_ai_config +FOR EACH ROW +WHEN NEW.updated_at = OLD.updated_at +BEGIN + UPDATE t_ai_config SET updated_at = strftime('%Y-%m-%dT%H:%M:%S', 'now', 'localtime') WHERE id = OLD.id; +END;;