Fixed(CICD): 更新了CICD的项目名称,使其和项目保持一致。

This commit is contained in:
GuanYuankai 2025-12-17 15:27:37 +08:00
parent 47f7da7795
commit 7afc4f5e1c
6 changed files with 108 additions and 129 deletions

View File

@ -20,7 +20,7 @@ steps:
from_secret: gitea_username
password:
from_secret: gitea_password
repo: 192.168.0.75:3000/guanyuankai/Vehicle_Road_Counter
repo: 192.168.0.75:3000/guanyuankai/vehicle_road_counter
insecure: true
mirror: "https://docker.m.daocloud.io"
tags:
@ -29,48 +29,3 @@ steps:
dockerfile: docker/Dockerfile.prod
context: .
platforms: linux/arm64
# - name: scp-config-to-edge
# image: appleboy/drone-scp
# settings:
# host:
# from_secret: edge_host_ip
# username:
# from_secret: edge_user
# password:
# from_secret: edge_password
# port: 22
# target: /opt/edge-proxy
# source:
# - docker-compose.prod.yml
# - mediamtx.yml
# - mosquitto/config/mosquitto.conf
# - name: deploy-to-edge
# image: appleboy/drone-ssh
# settings:
# host:
# from_secret: edge_host_ip
# username:
# from_secret: edge_user
# password:
# from_secret: edge_password
# port: 22
# ignore_stderr: true
# script:
# - mkdir -p /opt/edge-proxy
# - cd /opt/edge-proxy
# - echo "$REGISTRY_PASSWORD" | docker login 192.168.0.75:3000 -u "$REGISTRY_USER" --password-stdin
# - docker compose -f docker-compose.prod.yml pull
# - docker compose -f docker-compose.prod.yml up -d --remove-orphans
# - docker image prune -f
# environment:
# REGISTRY_USER:
# from_secret: gitea_username
# REGISTRY_PASSWORD:
# from_secret: gitea_password

View File

@ -96,7 +96,7 @@ target_link_libraries(vehicle_road_lib PUBLIC
add_executable(vehicle_road_counter
src/main.cpp
)
target_link_libraries(edge_proxy PRIVATE
target_link_libraries(vehicle_road_counter PRIVATE
vehicle_road_lib
)

24
ChangeLog.md Normal file
View File

@ -0,0 +1,24 @@
# Changelog
本项目的所有显著更改都将记录在此文件中。
## [Unreleased]
### Added
- 新增了 Docker 部署脚本 (MR-102)。
- 支持了 GPT-4o 模型接口。
## [1.0.1] - 2025-11-04
### Fixed
- 修复了用户登录时 Token 过期导致的 500 错误 (#45)。
- 修复了移动端 CSS 样式错乱问题。
## [1.0.0] - 2025-10-01
### Added
- 初始化项目,完成基础架构搭建。
- 实现标书生成的 MVP 版本。

View File

@ -1,7 +1,7 @@
# docker-compose.yml (最终版 - 使用命名卷)
services:
vehicle-road-counter:
image: 192.168.0.75:3000/guanyuankai/vehicle-road-counter:latest
image: 192.168.0.75:3000/guanyuankai/vehicle_road_counter:latest
container_name: vehicle-road-counter-prod
restart: unless-stopped
platform: linux/arm64

View File

@ -39,7 +39,7 @@ RUN cd /app/external/paho.mqtt.c && \
cmake --build build --target install --parallel $(nproc)
RUN cmake -S /app -B /app/build
RUN cmake --build /app/build --target edge_proxy --parallel $(nproc)
RUN cmake --build /app/build --target vehicle_road_counter --parallel $(nproc)
RUN ls -l /app/build/
@ -92,7 +92,7 @@ RUN groupadd -r developers && \
# 3. (作为 root) 复制所有文件
COPY --from=build_env /usr/local/lib/ /usr/local/lib/
COPY --from=build_env /usr/local/include/ /usr/local/include/
COPY --from=build_env /app/build/edge_proxy /app/edge_proxy
COPY --from=build_env /app/build/vehicle_road_counter /app/vehicle_road_counter
WORKDIR /app
COPY rknn_sdk/librknn_api/include/rknn_api.h /usr/local/include/
@ -128,4 +128,4 @@ RUN pip install --no-cache-dir --user -i https://mirrors.aliyun.com/pypi/simple/
paramiko
# 8. (作为 dev) 设置默认命令
CMD ["/app/edge_proxy"]
CMD ["/app/vehicle_road_counter"]

View File

@ -216,7 +216,7 @@ int main(int argc, char *argv[])
spdlog::info("[Shutdown] D. Disconnecting from MQTT broker...");
mqtt_client.disconnect();
spdlog::info("[Shutdown] G. Stopping main event loop...");
spdlog::info("[Shutdown] E. Stopping main event loop...");
g_io_context.stop();
});