From 5f4d3ca26c955c08626a9263def15790466dae0e Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 15 Apr 2024 12:44:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=82=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=202.=20=E6=B7=BB=E5=8A=A0refreshMatchToolLib?=
 =?UTF-8?q?raryDelay=E5=88=B7=E6=96=B0=E5=BB=B6=E8=BF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/InterroRobotApplication.java  | 20 +++++++++--
 src/main/resources/application.yml            |  1 -
 部署手册-docker-compose.md                | 35 +++++++++++++++++++
 部署手册.md => 部署手册-docker.md     | 28 ++++++++-------
 4 files changed, 67 insertions(+), 17 deletions(-)
 create mode 100644 部署手册-docker-compose.md
 rename 部署手册.md => 部署手册-docker.md (88%)

diff --git a/src/main/java/com/supervision/InterroRobotApplication.java b/src/main/java/com/supervision/InterroRobotApplication.java
index 367bc02..3cba758 100644
--- a/src/main/java/com/supervision/InterroRobotApplication.java
+++ b/src/main/java/com/supervision/InterroRobotApplication.java
@@ -1,5 +1,6 @@
 package com.supervision;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.supervision.service.MatchToolService;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -15,9 +16,22 @@ public class InterroRobotApplication {
     public static void main(String[] args) {
         ConfigurableApplicationContext applicationContext = SpringApplication.run(InterroRobotApplication.class, args);
 
-        log.info("=============刷新向量匹配库=================");
-        applicationContext.getBean(MatchToolService.class).refreshMatchToolLibrary();
-        log.info("=============刷新向量匹配库完成=================");
+        refreshMatchToolLibraryDelay(applicationContext,5*60*1000);
+
+    }
+
+    public static void refreshMatchToolLibraryDelay(ConfigurableApplicationContext applicationContext,long delay) {
+        ThreadUtil.newThread(() -> {
+            try {
+                log.info("=============等待{}ms刷新向量匹配库=================",delay);
+                Thread.sleep(delay);
+                log.info("=============刷新向量匹配库=================");
+                applicationContext.getBean(MatchToolService.class).refreshMatchToolLibrary();
+                log.info("=============刷新向量匹配库完成=================");
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        },"refreshMatchToolLibrary").start();
     }
 
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a551a75..f2b0cea 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -27,7 +27,6 @@ spring:
       max-request-size: 100MB
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    ip: 192.168.10.137:5432
     druid:
       driver-class-name: org.postgresql.Driver
       url: jdbc:postgresql://${env.datasource.ip}/postgres?useUnicode=true&characterEncoding=utf-8&useSSL=true&nullCatalogMeansCurrent=true&serverTimezone=GMT%2B8
diff --git a/部署手册-docker-compose.md b/部署手册-docker-compose.md
new file mode 100644
index 0000000..85c2765
--- /dev/null
+++ b/部署手册-docker-compose.md
@@ -0,0 +1,35 @@
+# interro_robot
+
+审讯机器人
+
+
+## 部署说明
+
+> 要求有docker-compose环境
+ 
+#### 加载镜像
+```shell
+
+load -i interro-robot-sevice.tar.gz
+
+```
+
+### 配置docker-compose.yml
+> 配置服务端口号和服务器地址信息
+
+### 启动服务
+```shell
+docker-compose up -d
+```
+
+# 访问地址
+> http://{nginx服务ip:port}/#/login
+
+# docker-compose常用命令
+- docker-compose up -d :启动所有服务
+- docker-compose stop : 停止所有服务
+- docker-compose down : 停止并删除所有服务
+- docker-compose start : 启动所有服务
+- docker-compose restart : 重启所有服务
+- docker-compose ps : 查看所有服务状态
+- docker-compose logs -f : 查看所有服务日志
\ No newline at end of file
diff --git a/部署手册.md b/部署手册-docker.md
similarity index 88%
rename from 部署手册.md
rename to 部署手册-docker.md
index 5d7061e..6dfae6c 100644
--- a/部署手册.md
+++ b/部署手册-docker.md
@@ -5,6 +5,8 @@
 
 ## 部署说明
 
+> 要求有docker环境
+
 #### 服务列表
 
 | 服务名称   | 镜像文件名                             | 镜像名                              | 部署顺序 |
@@ -16,12 +18,17 @@
 
 > 注意：部署应用前需要先创建interro_robot模式，并在interro_robot模式下执行数据库初始化脚本。
 
-#### 部署语义匹配服务
-> 进入paddlespeech目录下
+#### 加载镜像
+```shell
+
+load -i interro-robot-sevice.tar.gz
+
+```
+
+
+#### 部署语音转换服务
 
 ```shell
-# 加载镜像
-docker load -i interro-robot-paddlespeech.tar.gz
 
 # 启动容器命令：
 docker run -itd --name interro-robot-paddlespeech -p {映射端口}:8089  interro-robot-paddlespeech:1.0.0
@@ -39,9 +46,6 @@ docker ps | grep interro-robot-paddlespeech
 
 ```shell
 
-#加载镜像
-- 在interro-robot-qa目录下执行命令： 
-docker load -i interro-robot-qa.tar.gz
 
 - 启动容器命令：
 docker run -itd --name interro-robot-qa -p {映射端口}:8000  interro-robot-qa:1.0.0
@@ -56,11 +60,8 @@ docker ps | grep interro-robot-qa
 
 
 #### web端docker构建
-> 把docker文件夹放到服务器目录下，进入目录
 ```shell
 - 进入web目录
-# 加载镜像文件
-docker load -i interro-robot-web.tar.gz
 
 # 启动容器
 #参数说明:
@@ -92,8 +93,6 @@ docker exec -it interro-robot-web sh
 ### nginx docker构建
 
 ```shell
-# 进入nginx目录
-docker load -i interro-robot-nginx.tar.gz
 
 # 启动nginx容器
 # 参数说明:
@@ -107,4 +106,7 @@ docker run --name interro-robot-nginx -p 543:443  -d -e UPSTREAM_WEB_SERVERS=192
 
 # 确认容器启动成功
 docker ps | grep interro-robot-nginx
-```
\ No newline at end of file
+```
+
+# 访问地址
+> http://{nginx服务ip:port}/#/login
\ No newline at end of file