Merge pull request #137 from dromara/dev

Dev

Author: lijiahangmax

.env.example

@@ -6,8 +6,11 @@ SPRING_PROFILES_ACTIVE=prod
 DEMO_MODE=false
 
 API_CORS=true
-SECRET_KEY=uQeacXV8b3isvKLK
 API_EXPOSE_TOKEN=pmqeHOyZaumHm0Wt
+SECRET_KEY=uQeacXV8b3isvKLK
+
+NGINX_SERVICE_HOST=service
+NGINX_SERVICE_PORT=9200
 
 MYSQL_HOST=mysql
 MYSQL_PORT=3306

.gitignore

@@ -16,7 +16,8 @@ target/
 .sts4-cache
 
 ### IntelliJ IDEA ###
-.idea
+**/.idea/*
+!**/.idea/icon.png
 *.iws
 *.iml
 *.ipr

.idea/icon.png

@@ -113,7 +113,9 @@ docker compose up -d
 #### 主机监控
 
 ![主机监控](docs/assets/screenshot/monitor-list.png?time=20250627 "主机监控")
-![监控详情](docs/assets/screenshot/monitor-detail.png?time=20250627 "监控详情")
+![监控概览](docs/assets/screenshot/monitor-override.png?time=20250627 "监控概览")
+![监控详情](docs/assets/screenshot/monitor-chart.png?time=20250627 "监控表格")
+![告警通知](docs/assets/screenshot/monitor-alarm.png?time=20250627 "告警通知")
 
 #### 批量执行
 

README.md

@@ -1,6 +1,6 @@
 version: '3.3'
 
-# latest = 2.5.0
+# latest = 2.5.1
 
 # 支持以下源
 # lijiahangmax/*
@@ -12,6 +12,9 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest
     ports:
       - ${SERVICE_PORT:-1081}:80
+    environment:
+      NGINX_SERVICE_HOST: ${NGINX_SERVICE_HOST:-service}
+      NGINX_SERVICE_PORT: ${NGINX_SERVICE_PORT:-9200}
     restart: unless-stopped
     depends_on:
       service:

docker-compose.yaml

@@ -7,7 +7,7 @@ set -e
 source ./project-build.sh "$@"
 
 # 版本号
-version=2.5.0
+version=2.5.1
 # 是否推送镜像
 push_image=false
 # 是否构建 latest

docker/docker-build.sh

@@ -4,7 +4,7 @@ set -e
 # DockerContext: orion-visor
 
 # 版本号
-version=2.5.0
+version=2.5.1
 # 是否构建 service
 export build_service=false
 # 是否构建 ui

docker/project-build.sh

@@ -11,13 +11,20 @@ RUN \
   ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
   echo "${TZ}" > /etc/timezone && \
   rm -rf /var/cache/apk/* && \
+  rm -rf /etc/nginx/nginx.conf && \
   rm -rf /etc/nginx/conf.d/*
 
-# 复制包
+# 复制前端静态文件
 COPY ./ui/dist /usr/share/nginx/html
 
 # 复制配置
-COPY ./ui/nginx.conf /etc/nginx/conf.d
+COPY ./ui/nginx.conf /etc/nginx
+COPY ./ui/service.conf /etc/nginx/conf.d
+
+# 复制启动脚本
+COPY ./ui/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
 # 启动
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]

docker/ui/Dockerfile

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# 设置环境变量
+NGINX_SERVICE_HOST="${NGINX_SERVICE_HOST:-service}"
+NGINX_SERVICE_PORT="${NGINX_SERVICE_PORT:-9200}"
+
+# 替换环境变量
+sed -i "s|\${NGINX_SERVICE_HOST}|${NGINX_SERVICE_HOST}|g" /etc/nginx/conf.d/service.conf
+sed -i "s|\${NGINX_SERVICE_PORT}|${NGINX_SERVICE_PORT}|g" /etc/nginx/conf.d/service.conf
+
+exec "$@"

docker/ui/entrypoint.sh

@@ -1,56 +1,30 @@
-server {
-    listen       80;
-    server_name  localhost;
-    client_max_body_size 1024m;
-
-    # 是否启动 gzip 压缩
-    gzip  on;
-    # 需要压缩的常见静态资源
-    gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
-    # 如果文件大于 1k 就启动压缩
-    gzip_min_length 1k;
-    # 缓冲区
-    gzip_buffers 4 16k;
-    # 压缩的等级
-    gzip_comp_level 2;
-    # access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        # web history 模式 404
-        try_files $uri $uri/ /index.html;
-    }
-
-    location /orion-visor/api {
-        proxy_pass    http://service:9200/orion-visor/api;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-     location /orion-visor/keep-alive {
-        proxy_pass    http://service:9200/orion-visor/keep-alive;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_read_timeout 3600s;
-        proxy_send_timeout 3600s;
-    }
-
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
+user  nginx;
+worker_processes  auto;
 
+error_log  /var/log/nginx/error.log notice;
+pid        /run/nginx.pid;
+
+events {
+    worker_connections  1024;
 }
 
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    server_tokens off;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}