diff --git a/apps/cashbook/1.1.8/.env.sample b/apps/cashbook/1.1.8/.env.sample deleted file mode 100644 index e92af5bc..00000000 --- a/apps/cashbook/1.1.8/.env.sample +++ /dev/null @@ -1,3 +0,0 @@ -CONTAINER_NAME="cashbook" -DATA_PATH="./data" -PANEL_APP_PORT_HTTP="40880" \ No newline at end of file diff --git a/apps/cashbook/1.1.8/data.yml b/apps/cashbook/1.1.8/data.yml deleted file mode 100644 index b29fdb21..00000000 --- a/apps/cashbook/1.1.8/data.yml +++ /dev/null @@ -1,17 +0,0 @@ -additionalProperties: - formFields: - - default: 40088 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: WebUI Port - labelZh: 网页端口 - required: true - rule: paramPort - type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data storage folder - labelZh: 数据存放文件夹 - required: true - type: text \ No newline at end of file diff --git a/apps/cashbook/1.1.8/docker-compose.yml b/apps/cashbook/1.1.8/docker-compose.yml deleted file mode 100644 index b4fca857..00000000 --- a/apps/cashbook/1.1.8/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - cashbook: - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:80" - volumes: - - "${DATA_PATH}:/app/resources/app/data" - image: dingdangdog/cashbook:1.1.8 - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true \ No newline at end of file diff --git a/apps/cashbook/2.0.1/.env.sample b/apps/cashbook/2.0.1/.env.sample new file mode 100644 index 00000000..3314bd1d --- /dev/null +++ b/apps/cashbook/2.0.1/.env.sample @@ -0,0 +1,7 @@ +CONTAINER_NAME="cashbook" +DATA_PATH="./data" +DEFAULT_PASSWORD="cashbook" +ENVIRONMENT="PRO" +PANEL_APP_PORT_HTTP=40291 +SERVER_KEY="08cc0348-061d-4193-af05-b6cc02df28ea" +TOKEN_SALT="spend-money-like-water" diff --git a/apps/cashbook/2.0.1/data.yml b/apps/cashbook/2.0.1/data.yml new file mode 100644 index 00000000..f9f1ee58 --- /dev/null +++ b/apps/cashbook/2.0.1/data.yml @@ -0,0 +1,47 @@ +additionalProperties: + formFields: + - default: "40291" + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: "./data" + edit: true + envKey: DATA_PATH + labelEn: Data storage folder + labelZh: 数据存放文件夹 + required: true + type: text + - default: "spend-money-like-water" + edit: true + envKey: TOKEN_SALT + labelEn: Token Salt + labelZh: Token Salt + required: true + type: text + - default: "PRO" + edit: true + envKey: ENVIRONMENT + labelEn: Environment + labelZh: 环境 + required: true + type: text + - default: "08cc0348-061d-4193-af05-b6cc02df28ea" + edit: true + envKey: SERVER_KEY + labelEn: Server Key + labelZh: 服务密钥 + required: true + type: text + - default: "cashbook" + edit: true + envKey: DEFAULT_PASSWORD + labelEn: Default Password + labelZh: 默认密码 + random: true + required: true + rule: paramComplexity + type: password diff --git a/apps/cashbook/2.0.1/docker-compose.yml b/apps/cashbook/2.0.1/docker-compose.yml new file mode 100644 index 00000000..1ddc8807 --- /dev/null +++ b/apps/cashbook/2.0.1/docker-compose.yml @@ -0,0 +1,22 @@ +services: + cashbook: + image: "dingdangdog/cashbook:2.0.1" + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + ports: + - "${PANEL_APP_PORT_HTTP}:80" + volumes: + - ${DATA_PATH}:/app/resources/data + environment: + - TOKEN_SALT=${TOKEN_SALT} + - ENVIRONMENT=${ENVIRONMENT} + - SERVER_KEY=${SERVER_KEY} + - DEFAULT_PASSWORD=${DEFAULT_PASSWORD} + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/cashbook/README.md b/apps/cashbook/README.md index cae50585..9caa79d6 100644 --- a/apps/cashbook/README.md +++ b/apps/cashbook/README.md @@ -1,127 +1,6 @@ -
-cashbook -

cashbook-desktop

-
+# cashbook-web -

- release - stars - dorks -

-

- issues-open - issues-close - license - Docker Pulls - GitHub Releases Download -

- -- Github:[https://github.com/dingdangdog/cashbook-desktop](https://github.com/dingdangdog/cashbook-desktop) -- Gitee:[https://gitee.com/dddogx/cashbook-desktop](https://gitee.com/dddogx/cashbook-desktop) -- 在线体验:[cashbook.oldmoon.top](https://cashbook.oldmoon.top/) (体验账号:cashbook/cashbook) -- QQ交流群:564081656 - -## 简述(Description) - -本项目的目标是一个终端独立安装的记账本软件。目前的桌面版仅支持 `Windows` 系统。 +Web 记账本。 - 在数据记录上追求简单、易用、自主可控; -- 在统计分析上力求清晰、美观、简洁有效。 - -> **重要提示:当前版本尚不成熟,后续升级可能有较大变动,请谨慎使用!** - -## 开始使用(Get Started) - -### 1. windows下载安装 - -前往【[Releases](https://github.com/dingdangdog/cashbook-desktop/releases/)】页面自行下载安装。 - -### 2. docker部署 - -推荐使用`docker-compose`: - -```yaml -services: - cashbook: - image: dingdangdog/cashbook:latest - restart: always - ports: - - 880:80 - volumes: - - ./data:/app/resources/app/data -``` - -## 主要计划(Plan) - -> 以下是一些比较重要的功能开发计划,不代表本系统全部功能,欢迎下载试用! -> 在目前没什么用户的情况下,不出意外的话,每月更新一次。 - -- [x] Windows桌面应用(目前是简单的Electron套壳,以后可能还会重构); -- [x] Docker部署,重构后的系统从`v1.1.6`之后开始同步发布Docker; -- [x] 使用JSON格式存储数据,拒绝一切三方数据库; -- [x] 阿里支付宝CSV个人账单文件导入; -- [x] 微信CSV个人账单文件导入; -- [x] 生成分析报表,如月报/年报功能,暂定 `v1.1.8` 支持月报; -- [ ] 数据云同步,暂定 `v1.2.0` 重新支持云同步; -- [ ] 浏览器插件?`姑且想想` -- [ ] 小程序版本?`姑且想想` -- [ ] Android版本?`姑且想想` -- [ ] Mac版本?`纯属想想` -- [ ] iphone版本?`纯属想想` - -## 重要说明 - -`1.1.0-BETA` 版本前后有非常大的差异,从页面到后端整体全部重构了一次,推荐使用最新版! - -- 1.1.0-BETA版本前的一些说明:[NOTICE](./doc/NOTICE.md) - -### 类型映射 - -从 [v1.1.7](https://github.com/dingdangdog/cashbook-desktop/releases/tag/v1.1.7) 版本开始,在系统设置中可以进行交易类型的映射关系维护了,下面列出项目默认的映射关系,用户安装后可自行修改。 - -> 支付宝、微信、京东金融对应的数据导入后,会根据其字段值映射为本软件类型对应的字段值。 - -| 本软件类型(`支出/收入类型`) | 支付宝(`交易分类`) | 微信(`交易类型`) | 京东金融(`交易分类`) | 类型说明 | -| -------- | ---- | -------- | ---- | ---- | -| 数码电器 | 数码电器 | | 数码电器/手机通讯/电脑办公 | 电子产品、家电等 | -| 充值缴费 | 充值缴费 | | 充值缴费 | 水电、话费等 | -| 美容美发 | 美容美发 | | 美妆个护 | 理发、护肤等 | -| 转账红包 | 转账红包 | 微信红包/转账 | | 转账、红包等 | -| 日用百货 | 日用百货 | | 清洁纸品/鞋服箱包 | 垃圾袋、卫生纸等 | -| 服饰装扮 | 服饰装扮 | | 服饰内衣/钟表眼镜 | 鞋服等 | -| 文化休闲 | 文化休闲/运动户外 | | 图书文娱/文体玩具 | 书籍、游戏、视频软件VIP等 | -| 餐饮美食 | 餐饮美食 | | 食品酒饮 | 吃好喝好 | -| 医疗健康 | 医疗健康 | | 医疗保健 | 药品、保养品等 | -| 亲友代付 | 亲友代付 | 亲属卡交易 | | 如题 | -| 家居家装 | 家居家装 | | | 家具、装修用品等 | -| 爱车养车 | 爱车养车 | | 汽车用品 | 保养、油气、过路费等 | -| 投资理财 | 收入/投资理财 | 转入零钱通-来自零钱 | 小金库 | 理财收益、签到红包等 | -| 教育培训 | 教育培训 | | 教育培训 | 网课、培训等 | -| 退款 | 退款 | 退款 | | | -| 微信交易 | | 扫二维码付款/二维码收款/商户消费 | | 这部分交易需要人工分类 | -| 其他 | 其他/商业服务/生活服务/借用借还 | | 其他网购/其他/网购/收发快递/白条 | 一些少见或未知类型,通常需要人工分类 | - -> PS:如果你不会账单导出,这里有一个图文教程:[微信/支付宝/京东金融导出账单文件](https://oldmoon.top/post/211) - -## 开发 - -- 请阅读 【[dev.md](./dev.md)】 - -## 鸣谢(Acknowledgments) - -- 感谢以下优秀的开发工具 - -
-   -   -   - -
\ No newline at end of file +- 在统计分析上力求清晰、美观、简洁有效。 \ No newline at end of file diff --git a/apps/cashbook/data.yml b/apps/cashbook/data.yml index cda07e8b..eb973c12 100644 --- a/apps/cashbook/data.yml +++ b/apps/cashbook/data.yml @@ -1,20 +1,19 @@ -name: cashbook +name: Cashbook tags: - - 工具 -title: Cashbook 个人记账本 -type: 工具 -description: 个人记账本,支持微信、支付、京东账单导入 + - 实用工具 +title: 个人记账工具 +description: 个人记账工具 additionalProperties: key: cashbook - name: Cashbook 个人记账本 + name: Cashbook tags: - Tool - shortDescZh: 个人记账本,支持微信、支付、京东账单导入 - shortDescEn: Personal ledger, supporting import of WeChat, AliPay and more + shortDescZh: 个人记账工具 + shortDescEn: Personal finance management tool type: tool crossVersionUpdate: true limit: 0 recommend: 0 - website: https://github.com/dingdangdog/cashbook-desktop - github: https://github.com/dingdangdog/cashbook-desktop - document: https://github.com/dingdangdog/cashbook-desktop + website: https://cashbook.oldmoon.top + github: https://github.com/dingdangdog/cashbook-web + document: https://github.com/dingdangdog/cashbook-web diff --git a/apps/cashbook/latest/.env.sample b/apps/cashbook/latest/.env.sample index e92af5bc..3314bd1d 100644 --- a/apps/cashbook/latest/.env.sample +++ b/apps/cashbook/latest/.env.sample @@ -1,3 +1,7 @@ CONTAINER_NAME="cashbook" DATA_PATH="./data" -PANEL_APP_PORT_HTTP="40880" \ No newline at end of file +DEFAULT_PASSWORD="cashbook" +ENVIRONMENT="PRO" +PANEL_APP_PORT_HTTP=40291 +SERVER_KEY="08cc0348-061d-4193-af05-b6cc02df28ea" +TOKEN_SALT="spend-money-like-water" diff --git a/apps/cashbook/latest/data.yml b/apps/cashbook/latest/data.yml index b29fdb21..f9f1ee58 100644 --- a/apps/cashbook/latest/data.yml +++ b/apps/cashbook/latest/data.yml @@ -1,17 +1,47 @@ additionalProperties: - formFields: - - default: 40088 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: WebUI Port - labelZh: 网页端口 - required: true - rule: paramPort - type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data storage folder - labelZh: 数据存放文件夹 - required: true - type: text \ No newline at end of file + formFields: + - default: "40291" + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: "./data" + edit: true + envKey: DATA_PATH + labelEn: Data storage folder + labelZh: 数据存放文件夹 + required: true + type: text + - default: "spend-money-like-water" + edit: true + envKey: TOKEN_SALT + labelEn: Token Salt + labelZh: Token Salt + required: true + type: text + - default: "PRO" + edit: true + envKey: ENVIRONMENT + labelEn: Environment + labelZh: 环境 + required: true + type: text + - default: "08cc0348-061d-4193-af05-b6cc02df28ea" + edit: true + envKey: SERVER_KEY + labelEn: Server Key + labelZh: 服务密钥 + required: true + type: text + - default: "cashbook" + edit: true + envKey: DEFAULT_PASSWORD + labelEn: Default Password + labelZh: 默认密码 + random: true + required: true + rule: paramComplexity + type: password diff --git a/apps/cashbook/latest/docker-compose.yml b/apps/cashbook/latest/docker-compose.yml index 8ed9926f..c7fb8c67 100644 --- a/apps/cashbook/latest/docker-compose.yml +++ b/apps/cashbook/latest/docker-compose.yml @@ -1,5 +1,6 @@ services: cashbook: + image: "dingdangdog/cashbook:latest" container_name: ${CONTAINER_NAME} restart: always networks: @@ -7,11 +8,15 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:80" volumes: - - "${DATA_PATH}:/app/resources/app/data" - image: dingdangdog/cashbook:latest + - ${DATA_PATH}:/app/resources/data + environment: + - TOKEN_SALT=${TOKEN_SALT} + - ENVIRONMENT=${ENVIRONMENT} + - SERVER_KEY=${SERVER_KEY} + - DEFAULT_PASSWORD=${DEFAULT_PASSWORD} labels: createdBy: "Apps" networks: 1panel-network: - external: true \ No newline at end of file + external: true diff --git a/apps/cashbook/logo.png b/apps/cashbook/logo.png index e7fa6673..06cf97b4 100644 Binary files a/apps/cashbook/logo.png and b/apps/cashbook/logo.png differ