save

README.md

@@ -14,11 +14,11 @@
 
 阿里云镜像启动（适合中国大陆）
 ```sh
-docker run --name moneywhere -e DB_PASSWORD=78p7gkc1 -e invite_code=111111 -v moneywhere_mysql_data:/var/lib/mysql -p 43740:3306 -p 43741:80 -p 43742:9092 -p 43743:81 -p 43744:82 registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-all:latest
+docker run --name moneynote -e DB_PASSWORD=78p7gkc1 -e invite_code=111111 -v moneynote_mysql_data:/var/lib/mysql -p 43740:3306 -p 43741:80 -p 43742:9092 -p 43743:81 -p 43744:82 registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-all:latest
 ```
 docker hub镜像启动（适合境外用户）
 ```sh
-docker run --name moneywhere -e DB_PASSWORD=78p7gkc1 -e invite_code=111111 -v moneywhere_mysql_data:/var/lib/mysql -p 43740:3306 -p 43741:80 -p 43742:9092 -p 43743:81 -p 43744:82 markliu2018/moneywhere-all:latest
+docker run --name moneynote -e DB_PASSWORD=78p7gkc1 -e invite_code=111111 -v moneynote_mysql_data:/var/lib/mysql -p 43740:3306 -p 43741:80 -p 43742:9092 -p 43743:81 -p 43744:82 markliu2018/moneynote-all:latest
 ```
 
 如果已有mysql服务，可使用不带mysql的镜像启动。
@@ -26,32 +26,32 @@ docker run --name moneywhere -e DB_PASSWORD=78p7gkc1 -e invite_code=111111 -v mo
 阿里云镜像启动（适合中国大陆，此镜像无mysql服务，请将参数修改为自己的mysql服务。）
 
 ```sh
-docker run --name moneywhere -d \
+docker run --name moneynote -d \
 	-e DB_HOST=your_ip \
 	-e DB_PORT=3306 \
-	-e DB_NAME=moneywhere \
+	-e DB_NAME=moneynote \
 	-e DB_USER=root \
     -e DB_PASSWORD=your_password \
 	-e invite_code=111111 \
 	-p 43742:9092 \
 	-p 43743:81 \
 	-p 43744:82 \
-	registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-all-no-mysql:latest
+	registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-all-no-mysql:latest
 ```
 
 docker hub镜像启动（适合境外用户，此镜像无mysql服务，请将参数修改为自己的mysql服务。）
 ```sh
-docker run --name moneywhere -d \
+docker run --name moneynote -d \
 	-e DB_HOST=your_ip \
 	-e DB_PORT=3306 \
-	-e DB_NAME=moneywhere \
+	-e DB_NAME=moneynote \
 	-e DB_USER=root \
     -e DB_PASSWORD=your_password \
 	-e invite_code=111111 \
 	-p 43742:9092 \
 	-p 43743:81 \
 	-p 43744:82 \
-	markliu2018/moneywhere-all-no-mysql:latest
+	markliu2018/moneynote-all-no-mysql:latest
 ```
 
 ### docker compose 启动（推荐）
@@ -59,7 +59,7 @@ docker run --name moneywhere -d \
 1. 请下载本项目源代码，使用git命令或直接下载源代码。
 
 ```sh
-git clone https://github.com/getmoneynote/docker-compose-moneywhere.git && cd docker-compose-moneywhere
+git clone https://github.com/getmoneynote/docker-compose-moneynote.git && cd docker-compose-moneynote
 ```
 
 2. docker compose 启动
@@ -180,7 +180,7 @@ docker compose -f docker-compose-all-no-mysql-ali.yml pull && docker compose --e
 
 
 ## QA
-1. 很多人安装遇到数据库的问题，有可能是之前安装过，有数据文件，且自己修改过root密码。 使用 docker volume ls 命令查看有没有moneywhere_mysql_data文件，如果有，可以自己修改为另外的数据文件，或者删除moneywhere_mysql_data
+1. 很多人安装遇到数据库的问题，有可能是之前安装过，有数据文件，且自己修改过root密码。 使用 docker volume ls 命令查看有没有moneynote_mysql_data文件，如果有，可以自己修改为另外的数据文件，或者删除moneynote_mysql_data
 
 ## 参考资料
 [安装docker](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-centos-7)

README_docker.md

@@ -9,5 +9,5 @@ Docker一键运行自己的记账系统
 快速运行：
 
 ```sh
-docker run -p 43741:80 -p 43743:81 -p 43743:82 -e invite_code=111111 markliu2018/moneywhere-all:latest
+docker run -p 43741:80 -p 43743:81 -p 43743:82 -e invite_code=111111 markliu2018/moneynote-all:latest
 ```

api-no-mysql.env

@@ -1,6 +1,6 @@
 DB_HOST=host.docker.internal
 DB_PORT=3306
-DB_NAME=moneywhere
+DB_NAME=moneynote
 DB_USER=root
 DB_PASSWORD=78p7gkc1
 invite_code=111111

docker-compose-ali-no-mysql.yml

@@ -1,40 +1,40 @@
 version: '3'
 
 services:
-  moneywhere-api-user:
+  api:
-    container_name: moneywhere_api
+    container_name: moneynote_api
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-api-user:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-api:latest
     restart: always
     extra_hosts:
       - "host.docker.internal:host-gateway"
     environment:
       - DB_HOST=${DB_HOST:-host.docker.internal}
       - DB_PORT=${DB_PORT:-3306}
-      - DB_NAME=${DB_NAME:-moneywhere}
+      - DB_NAME=${DB_NAME:-moneynote}
       - DB_USER=${DB_USER:-root}
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     ports:
       - "43742:9092"
 
-  moneywhere-fe-user:
+  pc:
-    container_name: moneywhere_fe
+    container_name: moneynote_pc
     links:
-      - moneywhere-api-user
+      - api
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-pc:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43743:80"
 
-  moneywhere-fe-user-mobile:
+  h5:
-    container_name: moneywhere_fe_mobile
+    container_name: moneynote_h5
     links:
-      - moneywhere-api-user
+      - api
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user-mobile:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-h5:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43744:80"

docker-compose-ali.yml

@@ -2,24 +2,24 @@ version: '3'
 
 services:
   mysql:
-    container_name: moneywhere_mysql
+    container_name: moneynote_mysql
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/mysql5-arm:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/mysql5-arm:latest
     restart: always
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:-78p7gkc1}
-      - MYSQL_DATABASE=moneywhere
+      - MYSQL_DATABASE=moneynote
     command: [
       '--character-set-server=utf8mb4',
       '--collation-server=utf8mb4_general_ci',
     ]
     volumes:
-      - moneywhere_mysql_data:/var/lib/mysql
+      - moneynote_mysql_data:/var/lib/mysql
     ports:
       - "43740:3306"
 
   phpmyadmin:
-    container_name: moneywhere_phpmyadmin
+    container_name: moneynote_phpmyadmin
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/phpmyadmin5:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/phpmyadmin5:latest
     links:
       - mysql
     environment:
@@ -28,43 +28,43 @@ services:
     ports:
       - "43741:80"
 
-  moneywhere-api-user:
+  api:
-    container_name: moneywhere_api
+    container_name: moneynote_api
     links:
       - mysql
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-api-user:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-api:latest
     restart: always
     environment:
       - DB_HOST=mysql
       - DB_PORT=3306
-      - DB_NAME=moneywhere
+      - DB_NAME=moneynote
       - DB_USER=root
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     ports:
       - "43742:9092"
 
-  moneywhere-fe-user:
+  pc:
-    container_name: moneywhere_fe
+    container_name: moneynote_pc
     links:
-      - moneywhere-api-user
+      - api
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-pc:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43743:80"
 
-  moneywhere-fe-user-mobile:
+  h5:
-    container_name: moneywhere_fe_mobile
+    container_name: moneynote_h5
     links:
-      - moneywhere-api-user
+      - api
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user-mobile:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-h5:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43744:80"
 
 volumes:
-  moneywhere_mysql_data:
+  moneynote_mysql_data:

docker-compose-all-ali.yml

@@ -1,15 +1,15 @@
 version: '3'
 
 services:
-  moneywhere:
+  moneynote:
-    container_name: moneywhere
+    container_name: moneynote
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-all:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-all:latest
     restart: always
     environment:
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     volumes:
-      - moneywhere_mysql_data:/var/lib/mysql
+      - moneynote_mysql_data:/var/lib/mysql
     ports:
       - "43740:3306"
       - "43741:80"
@@ -18,4 +18,4 @@ services:
       - "43744:82"
 
 volumes:
-  moneywhere_mysql_data:
+  moneynote_mysql_data:

docker-compose-all-hub.yml

@@ -1,15 +1,15 @@
 version: '3'
 
 services:
-  moneywhere:
+  moneynote:
-    container_name: moneywhere
+    container_name: moneynote
-    image: markliu2018/moneywhere-all:latest
+    image: markliu2018/moneynote-all:latest
     restart: always
     environment:
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     volumes:
-      - moneywhere_mysql_data:/var/lib/mysql
+      - moneynote_mysql_data:/var/lib/mysql
     ports:
       - "43740:3306"
       - "43741:80"
@@ -18,4 +18,4 @@ services:
       - "43744:82"
 
 volumes:
-  moneywhere_mysql_data:
+  moneynote_mysql_data:

docker-compose-all-no-mysql-ali.yml

@@ -1,16 +1,16 @@
 version: '3'
 
 services:
-  moneywhere:
+  moneynote:
-    container_name: moneywhere
+    container_name: moneynote
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-all-no-mysql:latest
+    image: registry.cn-hangzhou.aliyuncs.com/moneynote/moneynote-all-no-mysql:latest
     restart: always
     extra_hosts:
       - "host.docker.internal:host-gateway"
     environment:
       - DB_HOST=${DB_HOST:-host.docker.internal}
       - DB_PORT=${DB_PORT:-3306}
-      - DB_NAME=${DB_NAME:-moneywhere}
+      - DB_NAME=${DB_NAME:-moneynote}
       - DB_USER=${DB_USER:-root}
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}

docker-compose-all-no-mysql-hub.yml

@@ -1,16 +1,16 @@
 version: '3'
 
 services:
-  moneywhere:
+  moneynote:
-    container_name: moneywhere
+    container_name: moneynote
-    image: markliu2018/moneywhere-all-no-mysql:latest
+    image: markliu2018/moneynote-all-no-mysql:latest
     restart: always
     extra_hosts:
       - "host.docker.internal:host-gateway"
     environment:
       - DB_HOST=${DB_HOST:-host.docker.internal}
       - DB_PORT=${DB_PORT:-3306}
-      - DB_NAME=${DB_NAME:-moneywhere}
+      - DB_NAME=${DB_NAME:-moneynote}
       - DB_USER=${DB_USER:-root}
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}

docker-compose-hub-no-mysql.yml

@@ -1,40 +1,40 @@
 version: '2.1'
 
 services:
-  moneywhere-api-user:
+  api:
-    container_name: moneywhere_api
+    container_name: moneynote_api
-    image: markliu2018/moneywhere-api-user:latest
+    image: markliu2018/moneynote-api:latest
     restart: always
     extra_hosts:
       - "host.docker.internal:host-gateway"
     environment:
       - DB_HOST=${DB_HOST:-host.docker.internal}
       - DB_PORT=${DB_PORT:-3306}
-      - DB_NAME=${DB_NAME:-moneywhere}
+      - DB_NAME=${DB_NAME:-moneynote}
       - DB_USER=${DB_USER:-root}
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     ports:
       - "43742:9092"
 
-  moneywhere-fe-user:
+  pc:
-    container_name: moneywhere_fe
+    container_name: moneynote_pc
     links:
-      - moneywhere-api-user
+      - api
-    image: markliu2018/moneywhere-fe-user:latest
+    image: markliu2018/moneynote-pc:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43743:80"
 
-  moneywhere-fe-user-mobile:
+  h5:
-    container_name: moneywhere_fe_mobile
+    container_name: moneynote_h5
     links:
-      - moneywhere-api-user
+      - api
-    image: markliu2018/moneywhere-fe-user-mobile:latest
+    image: markliu2018/moneynote-h5:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43744:80"

docker-compose-hub.yml

@@ -2,23 +2,23 @@ version: '3'
 
 services:
   mysql:
-    container_name: moneywhere_mysql
+    container_name: moneynote_mysql
     image: markliu2018/mysql5-arm:latest
     restart: always
     environment:
       - MYSQL_ROOT_PASSWORD= ${DB_PASSWORD:-78p7gkc1}
-      - MYSQL_DATABASE= moneywhere
+      - MYSQL_DATABASE= moneynote
     command: [
         '--character-set-server=utf8mb4',
         '--collation-server=utf8mb4_general_ci',
     ]
     volumes:
-      - moneywhere_mysql_data:/var/lib/mysql
+      - moneynote_mysql_data:/var/lib/mysql
     ports:
       - "43740:3306"
 
   phpmyadmin:
-    container_name: moneywhere_phpmyadmin
+    container_name: moneynote_phpmyadmin
     image: markliu2018/phpmyadmin5:latest
     restart: always
     links:
@@ -28,43 +28,43 @@ services:
     ports:
       - "43741:80"
 
-  moneywhere-api-user:
+  api:
-    container_name: moneywhere_api
+    container_name: moneynote_api
     links:
       - mysql
-    image: markliu2018/moneywhere-api-user:latest
+    image: markliu2018/moneynote-api:latest
     restart: always
     environment:
       - DB_HOST=mysql
       - DB_PORT=3306
-      - DB_NAME=moneywhere
+      - DB_NAME=moneynote
       - DB_USER=root
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     ports:
       - "43742:9092"
 
-  moneywhere-fe-user:
+  pc:
-    container_name: moneywhere_fe
+    container_name: moneynote_pc
     links:
-      - moneywhere-api-user
+      - api
-    image: markliu2018/moneywhere-fe-user:latest
+    image: markliu2018/moneynote-pc:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43743:80"
 
-  moneywhere-fe-user-mobile:
+  h5:
-    container_name: moneywhere_fe_mobile
+    container_name: moneynote_h5
     links:
-      - moneywhere-api-user
+      - api
-    image: markliu2018/moneywhere-fe-user-mobile:latest
+    image: markliu2018/moneynote-h5:latest
     restart: always
     environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
+      USER_API_HOST: http://api:9092
     ports:
       - "43744:80"
 
 volumes:
-  moneywhere_mysql_data:
+  moneynote_mysql_data:

docker-compose-no-mysql.yml

@@ -1,16 +1,16 @@
 version: '3'
 
 services:
-  moneywhere:
+  moneynote:
-    container_name: moneywhere
+    container_name: moneynote
-    image: markliu2018/moneywhere-all-no-mysql:latest
+    image: markliu2018/moneynote-all-no-mysql:latest
     restart: always
     extra_hosts:
       - "host.docker.internal:host-gateway"
     environment:
       - DB_HOST=${DB_HOST:-host.docker.internal}
       - DB_PORT=${DB_PORT:-3306}
-      - DB_NAME=${DB_NAME:-moneywhere}
+      - DB_NAME=${DB_NAME:-moneynote}
       - DB_USER=${DB_USER:-root}
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}

docker-compose.yml

@@ -1,15 +1,15 @@
 version: '3'
 
 services:
-  moneywhere:
+  moneynote:
-    container_name: moneywhere
+    container_name: moneynote
-    image: markliu2018/moneywhere-all:latest
+    image: markliu2018/moneynote-all:latest
     restart: always
     environment:
       - DB_PASSWORD=${DB_PASSWORD:-78p7gkc1}
       - invite_code=${invite_code:-111111}
     volumes:
-      - moneywhere_mysql_data:/var/lib/mysql
+      - moneynote_mysql_data:/var/lib/mysql
     ports:
       - "43740:3306"
       - "43741:80"
@@ -18,4 +18,4 @@ services:
       - "43744:82"
 
 volumes:
-  moneywhere_mysql_data:
+  moneynote_mysql_data:

docker-compose_health_check_bak.yml

@@ -1,56 +0,0 @@
-version: '2.1'
-
-services:
-  mysql:
-    build: ./mysql/
-    command: --init-file /data/1.sql
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: NWPkVrO2
-      MYSQL_DATABASE: moneywhere
-    volumes:
-      - moneywhere_mysql_data:/var/lib/mysql
-    healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -h localhost -uroot -pNWPkVrO2 | grep 'mysqld is alive' || exit 1"]
-      timeout: 20s
-      retries: 10
-
-  phpmyadmin:
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/phpmyadmin:latest
-    links:
-      - mysql
-    environment:
-      PMA_HOST: mysql
-      PMA_PORT: 3306
-      PMA_ARBITRARY: 1
-    restart: always
-    ports:
-      - "8085:80"
-
-  moneywhere-api-user:
-    depends_on:
-      mysql:
-        condition: service_healthy
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-api-user:latest
-    env_file: api.env
-
-  moneywhere-fe-user:
-    links:
-      - moneywhere-api-user
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user:latest
-    environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
-    ports:
-      - "9097:80"
-
-  moneywhere-fe-user-mobile:
-    links:
-      - moneywhere-api-user
-    image: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user-mobile:latest
-    environment:
-      USER_API_HOST: http://moneywhere-api-user:9092
-    ports:
-      - "9098:80"
-
-volumes:
-  moneywhere_mysql_data: