From 97d88ddea334779d6dfc482c8fb32f0bba7b7514 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 16 May 2024 17:23:57 +0800
Subject: [PATCH] =?UTF-8?q?:pencil:=20=E5=8D=87=E7=BA=A7=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                | 14 +++++------
 docker-upgrade.sh                 |  4 +++
 docs/about/change-log.md          |  5 ++--
 docs/quickstart/docker-install.md |  2 +-
 docs/update/v1.1.0.md             | 41 ++++++++++++++++++++++++++++---
 5 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 docker-upgrade.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 964ab781..73c92e61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,8 +14,8 @@ services:
       - REDIS_PASSWORD=Data@123456
       - SECRET_KEY=uQeacXV8b3isvKLK
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor/logs:/root/orion/logs/orion-visor
-      - /data/orion-visor-space/docker-volumes/orion-visor/app:/root/orion/orion-visor
+      - /data/orion-visor-space/docker-volumes/orion-visor-service/logs:/root/orion/logs/orion-visor
+      - /data/orion-visor-space/docker-volumes/orion-visor-service/app:/root/orion/orion-visor
     depends_on:
       - orion-visor-mysql
       - orion-visor-redis
@@ -30,9 +30,9 @@ services:
       - MYSQL_PASSWORD=Data@123456
       - MYSQL_ROOT_PASSWORD=Data@123456
     volumes:
-      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
-      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
-      - /data/orion-visor-space/docker-volumes/mysql/etc-mysql:/etc/mysql
+      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql:/var/lib/mysql
+      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
+      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
   orion-visor-redis:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:1.1.0
     privileged: true
@@ -41,8 +41,8 @@ services:
     environment:
       - REDIS_PASSWORD=Data@123456
     volumes:
-      - /data/orion-visor-space/docker-volumes/redis/data:/data
-      - /data/orion-visor-space/docker-volumes/redis/usr-local-etc-redis:/usr/local/etc/redis
+      - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+      - /data/orion-visor-space/docker-volumes/orion-visor-redis/usr-local-etc-redis:/usr/local/etc/redis
     command: sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass $${REDIS_PASSWORD}"
   orion-visor-adminer:
     image: adminer
diff --git a/docker-upgrade.sh b/docker-upgrade.sh
new file mode 100644
index 00000000..3b43d4f0
--- /dev/null
+++ b/docker-upgrade.sh
@@ -0,0 +1,4 @@
+#/bin/bash
+docker compose down
+sh ./pull.sh
+docker compose up -d
diff --git a/docs/about/change-log.md b/docs/about/change-log.md
index dd35b816..dfa1356b 100644
--- a/docs/about/change-log.md
+++ b/docs/about/change-log.md
@@ -11,9 +11,8 @@
 
 * 备份 `volumes` (必要时可以回滚)
 * 进入 `adminer` 执行升级的 `sql` 脚本
-* 进入 `docker-compose.yml` 的相对目录 
-* 执行 `docker compose down` 停止容器
-* 执行 `docker compose up -d` 启动容器
+* 执行 升级的 `bash` 脚本
+* 进入 代码目录执行 `sh docker-upgrade.sh` 进行容器升级 `down` > `pull` > `up -d`
 
 ### v1.1.0
 
diff --git a/docs/quickstart/docker-install.md b/docs/quickstart/docker-install.md
index d8153723..7225c806 100644
--- a/docs/quickstart/docker-install.md
+++ b/docs/quickstart/docker-install.md
@@ -51,7 +51,7 @@ docker compose up -d
 
 ```
 访问 adminer: http://localhost:8081
-服务器: orion-visor-db
+服务器: orion-visor-mysql
 用户名: root
 密码: Data@123456
 数据库: orion-visor
diff --git a/docs/update/v1.1.0.md b/docs/update/v1.1.0.md
index bc613339..ed3ed700 100644
--- a/docs/update/v1.1.0.md
+++ b/docs/update/v1.1.0.md
@@ -1,10 +1,19 @@
 ## v1.1.0
 
-### ⚡ **本次升级提示** ⚡
+### ⚡ **本次升级提示 本次更新较大 请仔细查阅** ⚡
+
+##### 本次升级思路:
+
+* 先执行以下 **`7`** 个脚本
+* 容器下线 `docker compose down`
+* 删除原代码目录 `rm -rf orion-ops-pro`
+* 克隆改名后的项目 `git clone https://github.com/lijiahangmax/orion-visor.git` or `gitee`
+* 启动容器 `docker compose up -d`
 
 ```readme
-本次升级包含数据库重命名操作。#1 创建新数据库, #2 进行数据迁移, #3 删除旧数据库。
-如果不想重命名可以修改 docker-compose.yml, 将 MYSQL_DATABASE 改为 orion-ops-pro 并且跳过步骤 #3 #4 #5
+sql 在 adminer/navicat 中执行, bash 脚本直接修改后粘贴执行 不要保存为文件执行否则会出错
+本次升级包含数据库重命名操作。#3 创建新数据库, #4 进行数据迁移, #5 删除旧数据库。
+[不推荐] 如果不想重命名可以修改 docker-compose.yml, 将 MYSQL_DATABASE 改为 orion-ops-pro 并且跳过步骤 #3 #4 #5 
 ```
 
 > #1 sql 脚本 - DDL
@@ -34,7 +43,7 @@ UPDATE exec_job SET status = 0;
 CREATE DATABASE IF NOT EXISTS `orion_visor` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
 ```
 
-> #4 sql 脚本 - 数据迁移
+> #4 bash 脚本 - 数据迁移
 
 ```bash
 # 可以使用 navicat 的数据迁移功能, 下面描述的是 bash 中执行, 注意下面的变量替换
@@ -61,3 +70,27 @@ exit
 DROP DATABASE `orion-ops-pro`;
 ```
 
+> #6 bash 脚本 - 修改 nginx 配置
+
+```bash
+pro_container_id=41dfd6aff736;
+# 进入容器
+docker exec -it $pro_container_id /bin/sh
+# 修改 nginx 配置
+sed -i 's/\/orion\//\/orion-visor\//g' /etc/nginx/conf.d/nginx.conf
+# 重新加载
+nginx -s reload
+# 退出
+exit
+```
+
+> #7 bash 脚本 - 工作空间迁移
+
+```bash
+# 迁移工作空间
+mv /data/orion-ops-pro-space /data/orion-visor-space 
+# 迁移 volumes
+mv /data/orion-visor-space/docker-volumes/orion-ops-pro /data/orion-visor-space/docker-volumes/orion-visor-service
+mv /data/orion-visor-space/docker-volumes/mysql /data/orion-visor-space/docker-volumes/orion-visor-mysql
+mv /data/orion-visor-space/docker-volumes/redis /data/orion-visor-space/docker-volumes/orion-visor-redis
+```