From 5f2eb163224a022bd98d4f8206642b8a1bd0c4bf Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 6 Nov 2024 13:39:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 29 ++++++++++++++++++++++++ docker/docker-compose/.env | 1 + docker/docker-compose/README.md | 29 ++++++++++++++---------- docker/docker-compose/docker-compose.yml | 3 ++- src/main/resources/application-prod.yml | 16 ++++++++++++- src/main/resources/application.yml | 4 ++-- 6 files changed, 66 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 7a0603d..4bfb638 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,35 @@ # Release Notes +# 发布时间 2024-11-06 + +# 变更 +- 修复笔录提取进度反复横跳的问题 +- 原子指标添加结构化推理功能 +- 变更指标配置规则(得分计算规则) +- 案件指标（原子指标）结果添加证据详情 +- 案件得分详情添加证据指引功能 + +# 新特性 +- 新增提示词配置功能（大模型提取属性、知识图谱展示、新增提示词、列表展示提示词） +- 新增案件证据目录分类功能 + +# 更新步骤 +1. 加载镜像（如果docker可以访问外网直接下载，否则需要先上传到服务器） + - docker load -i xxl-job-admin:2.4.1.tar.gz +2. 修改.env中的xxl-job中对应的配置 + - XXl_JOB_PASSWORD=sT7SSTiX8&&s + - XXL_JOB_PORT_HTTP=8081 + - SPRING_DATASOURCE_URL=jdbc:mysql://fu-hsi-mysql:3306/xxl-job?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai +3. 替换docker-compose-base.yml、docker-compose.yml配置文件 +4. 备份mysql数据库！！！！ +5. 执行数据初始化脚本（在文档末尾处） +6. 更新后端包（fu-hsi-service-1.0.0.jar）、前端包（dist） 文件 +7. 执行服务启动命令：docker-compose up -d +8. 调用案件证据归档刷新接口完成历史案件证据归档整理(get ip:port/caseEvidence/fresh)、初始化指标计算规则数据 +9. 验证更新内容 + + # 发布时间 2024-09-20 # 变更 diff --git a/docker/docker-compose/.env b/docker/docker-compose/.env index eadce6a..e3b5a01 100644 --- a/docker/docker-compose/.env +++ b/docker/docker-compose/.env @@ -23,6 +23,7 @@ OLLAMA_MODEL=llama3-chinese:8b LANGCHAIN_CHAT_URL=http://113.128.242.110:7861 THREAD_POOL_TRIPLE_CORE=1 THREAD_POOL_TYPE_CORE=1 +XXl_JOB_PASSWORD=sT7SSTiX8&&s OCR_PORT_HTTP=8866 OCR_MINIO_ENDPOINT_URL=http://fu-hsi-minio:9000 diff --git a/docker/docker-compose/README.md b/docker/docker-compose/README.md index 8b89c8d..dfeca5f 100644 --- a/docker/docker-compose/README.md +++ b/docker/docker-compose/README.md @@ -47,12 +47,15 @@ $ vi .env ``` 等待程序启动完成即可，如果没有启动成功，可重试上面的命令。 启动完成后会打印出下面的日志信息： - [+] Running 5/5 - ✔ Container fu-hsi-mysql Healthy 0.0s - ✔ Container fu-hsi-minio Running 0.0s - ✔ Container fu-hsi-neo4j Running 0.0s - ✔ Container fu-hsi-web Healthy 0.4s - ✔ Container fu-hsi-nginx Started +[+] Running 8/8 +✔ Network docker-compose_fu-hsi Created 0.2s +✔ Container fu-hsi-neo4j Started 0.1s +✔ Container fu-hsi-ocr Started 0.1s +✔ Container fu-hsi-mysql Started 0.1s +✔ Container fu-hsi-minio Started 0.1s +✔ Container fu-hsi-web-docker-compose Started 0.0s +✔ Container fu-hsi-xxl-job-admin Started 0.0s +✔ Container fu-hsi-nginx-docker-compose Started 4. 查看启动情况 @@ -61,12 +64,14 @@ $ docker-compose ps > docker-compose ps -NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS -fu-hsi-minio quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z "/usr/bin/docker-ent…" minio 20 minutes ago Up 20 minutes 0.0.0.0:9000-9001->9000-9001/tcp -fu-hsi-mysql mysql:5.7 "docker-entrypoint.s…" mysql 20 minutes ago Up 20 minutes (healthy) 33060/tcp, 0.0.0.0:5415->3306/tcp -fu-hsi-neo4j neo4j:4.4 "tini -g -- /startup…" neo4j 20 minutes ago Up 20 minutes 0.0.0.0:7474->7474/tcp, 7473/tcp, 0.0.0.0:7687->7687/tcp -fu-hsi-nginx fu-hsi-nginx:1.0.0 "/docker-entrypoint.…" fu-hsi-nginx 20 minutes ago Up 17 minutes 0.0.0.0:80->80/tcp, 443/tcp -fu-hsi-web fu-hsi-web:1.0.0 "java -Xms256m -Xmx1…" fu-hsi-web 20 minutes ago Up 18 minutes (unhealthy) 0.0.0.0:9380->8097/tcp +NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS +fu-hsi-minio quay.io/minio/minio:RELEASE.2023-10-25T06-33-25Z "/usr/bin/docker-ent…" minio 56 seconds ago Up 54 seconds 0.0.0.0:42417->9000/tcp, :::42417->9000/tcp, 0.0.0.0:42416->9001/tcp, :::42416->9001/tcp +fu-hsi-mysql mysql:5.7 "docker-entrypoint.s…" mysql 56 seconds ago Up 55 seconds (healthy) 33060/tcp, 0.0.0.0:42415->3306/tcp, :::42415->3306/tcp +fu-hsi-neo4j neo4j:4.4 "tini -g -- /startup…" neo4j 56 seconds ago Up 54 seconds 7473/tcp, 0.0.0.0:42418->7474/tcp, :::42418->7474/tcp, 0.0.0.0:42419->7687/tcp, :::42419->7687/tcp +fu-hsi-nginx-docker-compose fu-hsi-nginx:1.0.0 "/docker-entrypoint.…" fu-hsi-nginx 56 seconds ago Up 54 seconds 443/tcp, 0.0.0.0:19978->80/tcp, :::19978->80/tcp +fu-hsi-ocr paddleocr:v2.1 "/bin/bash -c 'sourc…" paddleocr 56 seconds ago Restarting (1) 20 seconds ago +fu-hsi-web-docker-compose fu-hsi-web:1.0.0 "java -Xms256m -Xmx1…" fu-hsi-web 56 seconds ago Restarting (1) 4 seconds ago +fu-hsi-xxl-job-admin xuxueli/xxl-job-admin:2.4.1 "sh -c 'java -jar $J…" xxl-job-admin 56 seconds ago Up 54 seconds 0.0.0.0:8081->8080/tcp, :::8081->8080/tcp ``` ## 🚀 访问服务 diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml index 8416795..5309938 100644 --- a/docker/docker-compose/docker-compose.yml +++ b/docker/docker-compose/docker-compose.yml @@ -22,13 +22,14 @@ services: --ollama.url=${OLLAMA_URL} --ollama.model=${OLLAMA_MODEL} --langChain-chat.url=${LANGCHAIN_CHAT_URL} - --datasource.username=${MYSQL_PASSWORD} + --datasource.password=${MYSQL_PASSWORD} --neo4j.username=${NEO4J_USERNAME} --neo4j.password=${NEO4J_PASSWORD} --minio.username=${MINIO_USER} --minio.password=${MINIO_PASSWORD} --fu-hsi-config.thread-pool.triple.core=${THREAD_POOL_TRIPLE_CORE} --fu-hsi-config.thread-pool.type.core=${THREAD_POOL_TYPE_CORE} + --xxl.job.admin.password=${XXl_JOB_PASSWORD} environment: - TZ=${TIMEZONE} networks: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index af150ae..e8351d8 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -78,4 +78,18 @@ ocr: springdoc: swagger-ui: - enabled: false \ No newline at end of file + enabled: false +xxl: + job: + admin: + username: admin + password: + addresses: http://fu-hsi-xxl-job-admin:8080/xxl-job-admin + accessToken: default_token + executor: + address: + appname: nx-llm-xxljob + ip: + port: 9999 + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 30 \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 065751d..f8606ab 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: test main: allow-bean-definition-overriding: true allow-circular-references: true @@ -16,7 +16,7 @@ mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl call-setters-on-nulls: true server: port: 8097