Merge branch 'feature/search' into dev

Author: yangfanplatform

deploy/README.md

@@ -19,9 +19,16 @@
 
 ## shell 脚本一键安装
 ```shell
+# 进入目录
 mkdir -p /home/yangfan && cd /home/yangfan
-bash -c "$(curl -fsSLk http://qiniu.yangfan.gd.cn/install/install.sh)"
+# 执行安装
+bash -c "$(curl -fsSLk http://docs.yangfan.gd.cn/install/install.sh)"
 ```
+> 1. 脚本默认安装在/data/yangfan目录下
+> 2. 如需修改配置请到安装目录下修改`./config/docker.config.yaml`文件
+> 3. `./config/docker.config.yaml`中的`grafana-host`需要手动修改为`http://IP:3000`，否则无法访问grafana
+> 4. `./config/docker.config.yaml`中的`fs`需要手动修改为飞书登录相关配置，否则无法登录
+> 5. 修改配置后重新执行安装脚本即可
 
 ## 本地调试
 ### 后端

deploy/docker-compose/compose.yaml

@@ -27,7 +27,7 @@ services:
 
 
   yangfan-server:
-    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/server:latest
+    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/server:${ENV_TAG}
     depends_on:
       - yangfan-mysql
     container_name: yangfan-server
@@ -42,7 +42,7 @@ services:
       - '7967:7967'
 
   yangfan-web:
-    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/web:latest
+    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/web:${ENV_TAG}
     depends_on:
       - yangfan-server
     container_name: yangfan-web
@@ -109,7 +109,7 @@ services:
         ipv4_address: 177.8.0.7
 
   yangfan-master:
-    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/master:latest
+    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/master:${ENV_TAG}
     depends_on:
       - yangfan-mysql
     container_name: yangfan-master
@@ -125,7 +125,7 @@ services:
         ipv4_address: 177.8.0.8
 
   yangfan-work:
-    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/work:latest
+    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/work:${ENV_TAG}
     depends_on:
       - yangfan-mysql
     container_name: yangfan-work
@@ -137,7 +137,7 @@ services:
         ipv4_address: 177.8.0.9
 
   yangfan-run:
-    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/run:latest
+    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/run:${ENV_TAG}
     depends_on:
       - yangfan-mysql
     container_name: yangfan-run
@@ -149,7 +149,7 @@ services:
         ipv4_address: 177.8.0.10
 
   yangfan-timer:
-    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/timer:latest
+    image: registry.cn-hangzhou.aliyuncs.com/yangfanz/timer:${ENV_TAG}
     depends_on:
       - yangfan-mysql
     container_name: yangfan-timer

deploy/docker-compose/install.sh

@@ -50,6 +50,8 @@ onexit() {
 
 
 yangfan_path='/data/yangfan'
+ENV_TAG='v1.3.1'
+export ENV_TAG
 
 if [ -z "$BASH" ]; then
     abort "请用 bash 执行本脚本"
@@ -171,7 +173,7 @@ mkdir -p ./data/grafana/provisioning/yangfan-json
 
 
 # 下载 compose.yaml 脚本
-wget "http://qiniu.yangfan.gd.cn/install/compose.yaml" --no-check-certificate -O compose.yaml
+wget "http://docs.yangfan.gd.cn/install/compose.yaml" --no-check-certificate -O compose.yaml
 if [ $? -ne "0" ]; then
     abort "下载 compose.yaml 脚本失败"
 else
@@ -181,7 +183,7 @@ fi
 # 下载 docker.config.yaml 文件
 config_file="./config/docker.config.yaml"
 if [ ! -f "$config_file" ]; then
-    wget "http://qiniu.yangfan.gd.cn/install/docker.config.yaml" --no-check-certificate -O "$config_file"
+    wget "http://docs.yangfan.gd.cn/install/docker.config.yaml" --no-check-certificate -O "$config_file"
 
     if [ $? -ne 0 ]; then
         abort "下载 docker.config.yaml 文件失败"
@@ -197,7 +199,7 @@ fi
 config_file="./config/my.conf"
 
 if [ ! -f "$config_file" ]; then
-    wget "http://qiniu.yangfan.gd.cn/install/my.conf" --no-check-certificate -O "$config_file"
+    wget "http://docs.yangfan.gd.cn/install/my.conf" --no-check-certificate -O "$config_file"
     if [ $? -ne 0 ]; then
         abort "下载 my.conf 文件失败"
     else
@@ -209,55 +211,55 @@ fi
 
 
 # 下载 prometheus.yml 文件
-wget "http://qiniu.yangfan.gd.cn/install/prometheus.yml" --no-check-certificate -O ./config/prometheus.yml
+wget "http://docs.yangfan.gd.cn/install/prometheus.yml" --no-check-certificate -O ./config/prometheus.yml
 if [ $? -ne "0" ]; then
     abort "下载 prometheus.yml 文件失败"
 else
     info "下载 prometheus.yml 文件成功"
 fi
 
 # 下载 yangfan.sql 文件
-wget "http://qiniu.yangfan.gd.cn/install/yangfan.sql" --no-check-certificate -O ./mysql/yangfan.sql
+wget "http://docs.yangfan.gd.cn/install/yangfan.sql" --no-check-certificate -O ./mysql/yangfan.sql
 if [ $? -ne "0" ]; then
     abort "下载 yangfan.sql 文件失败"
 else
     info "下载 yangfan.sql 文件成功"
 fi
 
 # 下载 grafana.ini 文件
-wget "http://qiniu.yangfan.gd.cn/install/grafana.ini" --no-check-certificate -O ./data/grafana/provisioning/grafana.ini
+wget "http://docs.yangfan.gd.cn/install/grafana.ini" --no-check-certificate -O ./data/grafana/provisioning/grafana.ini
 if [ $? -ne "0" ]; then
     abort "下载 grafana.ini 文件失败"
 else
     info "下载 grafana.ini 文件成功"
 fi
 
 # 下载 yangfan.grafana.dashboard.yaml 文件
-wget "http://qiniu.yangfan.gd.cn/install/yangfan.grafana.dashboard.yaml" --no-check-certificate -O ./data/grafana/provisioning/dashboards/yangfan.grafana.dashboard.yaml
+wget "http://docs.yangfan.gd.cn/install/yangfan.grafana.dashboard.yaml" --no-check-certificate -O ./data/grafana/provisioning/dashboards/yangfan.grafana.dashboard.yaml
 if [ $? -ne "0" ]; then
     abort "下载 yangfan.grafana.dashboard.yaml 文件失败"
 else
     info "下载 yangfan.grafana.dashboard.yaml 文件成功"
 fi
 
 # 下载 yangfan.grafana.prometheus.yaml 文件
-wget "http://qiniu.yangfan.gd.cn/install/yangfan.grafana.prometheus.yaml" --no-check-certificate -O ./data/grafana/provisioning/datasources/yangfan.grafana.prometheus.yaml
+wget "http://docs.yangfan.gd.cn/install/yangfan.grafana.prometheus.yaml" --no-check-certificate -O ./data/grafana/provisioning/datasources/yangfan.grafana.prometheus.yaml
 if [ $? -ne "0" ]; then
     abort "下载 yangfan.grafana.prometheus.yaml 文件失败"
 else
     info "下载 yangfan.grafana.prometheus.yaml 文件成功"
 fi
 
 # 下载 yangfan-for-distributed-load-testing.json 文件
-wget "http://qiniu.yangfan.gd.cn/install/yangfan-for-distributed-load-testing.json" --no-check-certificate -O ./data/grafana/provisioning/yangfan-json/yangfan-for-distributed-load-testing.json
+wget "http://docs.yangfan.gd.cn/install/yangfan-for-distributed-load-testing.json" --no-check-certificate -O ./data/grafana/provisioning/yangfan-json/yangfan-for-distributed-load-testing.json
 if [ $? -ne "0" ]; then
     abort "下载 yangfan-for-distributed-load-testing.json 文件失败"
 else
     info "下载 yangfan-for-distributed-load-testing.json 文件成功"
 fi
 
 # 下载 yangfan-for-node-status.json 文件
-wget "http://qiniu.yangfan.gd.cn/install/yangfan-for-node-status.json" --no-check-certificate -O ./data/grafana/provisioning/yangfan-json/yangfan-for-node-status.json
+wget "http://docs.yangfan.gd.cn/install/yangfan-for-node-status.json" --no-check-certificate -O ./data/grafana/provisioning/yangfan-json/yangfan-for-node-status.json
 if [ $? -ne "0" ]; then
     abort "下载 yangfan-for-node-status.json 文件失败"
 else
@@ -271,6 +273,7 @@ fi
 info "创建 .env 脚本成功"
 
 echo "YANGFAN_DIR=$yangfan_path" > "$env_file"
+echo "YANGFAN_TAG=$ENV_TAG" > "$env_file"
 
 
 info "即将开始下载 Docker 镜像"
@@ -286,5 +289,6 @@ if [ $? -ne "0" ]; then
     abort "启动 Docker 容器失败"
 fi
 
+info "当前安装版本：$ENV_TAG"