Merge pull request #56 from dromara/dev

🔖 升级版本.
dromara · Sep 2, 2024 · 2df3f2f · 2df3f2f
2 parents f73fa14 + d6048f7
commit 2df3f2f
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 20 deletions.
diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.6
     privileged: true
     ports:
       - 1081:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.6
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 10
       start_period: 3s
   redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.6
     privileged: true
     ports:
       - 6380:6379

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.6
     privileged: true
     ports:
       - ${SERVICE_PORT:-1081}:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.6
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 15
       start_period: 3s
   redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.6
     privileged: true
     ports:
       - 6380:6379
@@ -68,7 +68,7 @@ services:
       retries: 15
       start_period: 3s
   adminer:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.6
     ports:
       - 8081:8080
     depends_on:

diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.1.5
+version=2.1.6
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.5
+version=2.1.6
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql

diff --git a/docker/push.sh b/docker/push.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.5
+version=2.1.6
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

diff --git a/docker/redis/build.sh b/docker/redis/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.1.5
+version=2.1.6
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.5
+version=2.1.6
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .

diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.1.5</revision>
+        <revision>2.1.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>

diff --git a/...or-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/...or-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.1.5";
+    String VERSION = "2.1.6";
 
     /**
      * 同 ${spring.application.name}

diff --git a/...sset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java b/...sset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java
@@ -259,9 +259,10 @@ public DataGrid<HostVO> getHostPage(HostQueryRequest request) {
         if (wrapper == null) {
             return DataGrid.of(Lists.empty());
         }
+        // 数量条件
+        LambdaQueryWrapper<HostDO> countWrapper = wrapper.clone();
         // 基础条件
-        LambdaQueryWrapper<HostDO> countWrapper = wrapper.clone()
-                .select(HostDAO.BASE_COLUMN)
+        wrapper.select(HostDAO.BASE_COLUMN)
                 .orderByAsc(HostDO::getId);
         // 查询
         DataGrid<HostVO> hosts = hostDAO.of(wrapper)

diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
 VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.5'
+VITE_APP_VERSION= '2.1.6'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= '/orion-visor/api'
 VITE_WS_BASE_URL= '/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.5'
+VITE_APP_VERSION= '2.1.6'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "orion-visor-ui",
   "description": "Orion Visor UI",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "private": true,
   "author": "Jiahang Li",
   "license": "Apache 2.0",

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     </modules>
 
     <properties>
-        <revision>2.1.5</revision>
+        <revision>2.1.6</revision>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>