Merge pull request #155 from dromara/dev

Dev

Author: lijiahangmax

.env.example

@@ -6,6 +6,8 @@ SPRING_PROFILES_ACTIVE=prod
 DEMO_MODE=false
 
 API_CORS=true
+API_HOST=0.0.0.0
+# API_URL=http://127.0.0.1:9700/orion-visor/api
 API_IP_HEADERS=X-Forwarded-For,X-Real-IP
 API_EXPOSE_TOKEN=pmqeHOyZaumHm0Wt
 SECRET_KEY=uQeacXV8b3isvKLK

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -17,6 +17,8 @@ body:
           required: true
         - label: 我已搜索 [issue](https://github.com/dromara/orion-visor/issues) 并没有找到相关问题
           required: true
+        - label: 我已 star 了此项目, 否则可能会被自动关闭
+          required: true
   - type: input
     id: version
     attributes:

docker-compose.yaml

@@ -1,6 +1,6 @@
 version: '3.3'
 
-# latest = 2.5.5
+# latest = 2.5.6
 
 # 支持以下源
 # lijiahangmax/*
@@ -50,6 +50,7 @@ services:
       SECRET_KEY: ${SECRET_KEY:-uQeacXV8b3isvKLK}
       API_EXPOSE_TOKEN: ${API_EXPOSE_TOKEN:-pmqeHOyZaumHm0Wt}
       API_IP_HEADERS: ${API_IP_HEADERS:-X-Forwarded-For,X-Real-IP}
+      API_HOST: ${API_HOST:-0.0.0.0}
       API_CORS: ${API_CORS:-true}
       DEMO_MODE: ${DEMO_MODE:-false}
     volumes:

docker/docker-build.sh

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

docker/project-build.sh

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

orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java

@@ -36,7 +36,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.5.5";
+    String VERSION = "2.5.6";
 
     /**
      * 同 ${spring.application.name}

orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java

@@ -55,4 +55,6 @@ public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst,
 
     int BATCH_COUNT = 500;
 
+    String IP_0000 = "0.0.0.0";
+
 }

orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java

@@ -210,6 +210,10 @@ public interface ErrorMessage {
 
     String PLEASE_SELECT_SUFFIX_FILE = "请选择 {} 类型的文件";
 
+    String SPEC_FORMAT_INCORRECT = "规格格式不正确";
+
+    String INFLUXDB_UNSUPPORTED = "InfluxDB 服务未开启";
+
     /**
      * 是否为业务异常
      *

orion-visor-dependencies/pom.xml

@@ -14,7 +14,7 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.5.5</revision>
+        <revision>2.5.6</revision>
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>

orion-visor-framework/orion-visor-spring-boot-starter-influxdb/src/main/java/org/dromara/visor/framework/influxdb/core/utils/InfluxdbUtils.java

@@ -30,7 +30,9 @@
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
 import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.entity.chart.TimeChartSeries;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.influxdb.core.query.FluxQueryBuilder;
 
 import java.time.Instant;
@@ -66,6 +68,7 @@ private InfluxdbUtils() {
      * @param points points
      */
     public static void writePoints(List<Point> points) {
+        Assert.notNull(client, ErrorMessage.INFLUXDB_UNSUPPORTED);
         try (WriteApi api = client.makeWriteApi()) {
             // 写入指标
             api.writePoints(points);
@@ -79,6 +82,7 @@ public static void writePoints(List<Point> points) {
      * @return points
      */
     public static List<FluxTable> queryTable(String query) {
+        Assert.notNull(client, ErrorMessage.INFLUXDB_UNSUPPORTED);
         return client.getQueryApi().query(query);
     }