Merge pull request #124 from dromara/dev

Dev

Author: lijiahangmax

docker-compose-testing.yml

@@ -5,7 +5,7 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
     privileged: true
     ports:
-      - 9200:9200
+      - "9200:9200"
     environment:
       SPRING_PROFILES_ACTIVE: prod
       MYSQL_HOST: mysql
@@ -37,7 +37,7 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
     privileged: true
     ports:
-      - 3307:3306
+      - "3307:3306"
     environment:
       MYSQL_DATABASE: orion_visor
       MYSQL_USER: orion
@@ -59,7 +59,7 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
     privileged: true
     ports:
-      - 6380:6379
+      - "6380:6379"
     environment:
       REDIS_PASSWORD: Data@123456
     volumes:

docker-compose.yml

@@ -1,6 +1,6 @@
 version: '3.3'
 
-# latest = 2.4.2
+# latest = 2.4.3
 
 # 支持以下源
 # lijiahangmax/*
@@ -23,7 +23,7 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
     privileged: true
     ports:
-      - 9200:9200
+      - "9200:9200"
     environment:
       SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-prod}
       MYSQL_HOST: ${MYSQL_HOST:-mysql}
@@ -61,7 +61,7 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
     privileged: true
     ports:
-      - 3307:3306
+      - "3307:3306"
     environment:
       MYSQL_DATABASE: ${MYSQL_DATABASE:-orion_visor}
       MYSQL_USER: ${MYSQL_USER:-orion}
@@ -84,7 +84,7 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
     privileged: true
     ports:
-      - 6380:6379
+      - "6380:6379"
     environment:
       REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456}
     volumes:
@@ -103,7 +103,7 @@ services:
   guacd:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:latest
     ports:
-      - 4822:4822
+      - "4822:4822"
     environment:
       GUACD_LOG_LEVEL: info
       GUACD_LOG_FILE: /var/log/guacd.log
@@ -125,7 +125,7 @@ services:
   adminer:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest
     ports:
-      - 8081:8080
+      - "8081:8080"
     environment:
       ADMINER_DEFAULT_SERVER: ${MYSQL_HOST:-mysql}
     depends_on:

docker/docker-build.sh

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

docker/project-build.sh

@@ -4,7 +4,7 @@ set -e
 # DockerContext: orion-visor
 
 # 版本号
-version=2.4.2
+version=2.4.3
 # 是否构建 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.4.2";
+    String VERSION = "2.4.3";
 
     /**
      * 同 ${spring.application.name}

orion-visor-dependencies/pom.xml

@@ -14,7 +14,7 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.4.2</revision>
+        <revision>2.4.3</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-launch/src/main/resources/application-dev.yaml

@@ -13,7 +13,7 @@ spring:
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:Data@123456}
-    database: ${REDIS_DATABASE:10}
+    database: ${REDIS_DATABASE:1}
     data-version: ${REDIS_DATA_VERSION:1}
     mock: false
   redisson:

orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java

@@ -39,9 +39,9 @@
  */
 public class ReplaceVersion {
 
-    private static final String TARGET_VERSION = "2.4.1";
+    private static final String TARGET_VERSION = "2.4.2";
 
-    private static final String REPLACE_VERSION = "2.4.2";
+    private static final String REPLACE_VERSION = "2.4.3";
 
     private static final String PATH = new File("").getAbsolutePath();
 

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java

@@ -62,6 +62,7 @@ public HostVncConfigDTO getDefault() {
                 .authType(HostAuthTypeEnum.PASSWORD.name())
                 .noUsername(false)
                 .noPassword(false)
+                .timezone("Asia/Shanghai")
                 .clipboardEncoding(Const.UTF_8)
                 .build();
     }
@@ -94,7 +95,11 @@ protected void updateFill(HostVncConfigDTO beforeModel, HostVncConfigDTO afterMo
             afterModel.setAuthType(HostAuthTypeEnum.PASSWORD.name());
         }
         // 加密密码
-        this.checkEncryptPassword(afterModel.getAuthType(), beforeModel, afterModel);
+        if (Booleans.isTrue(afterModel.getNoPassword())) {
+            afterModel.setPassword(beforeModel.getPassword());
+        } else {
+            this.checkEncryptPassword(afterModel.getAuthType(), beforeModel, afterModel);
+        }
         afterModel.setHasPassword(null);
         afterModel.setUseNewPassword(null);
     }

orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java

@@ -277,6 +277,9 @@ private <T extends BaseConnectConfig> T getConnectConfig(String connectType,
             } else if (TerminalConnectTypeEnum.RDP.name().equals(connectType)) {
                 // RDP
                 connectConfig = hostConnectApi.getRdpConnectConfig(host, userId);
+            } else if (TerminalConnectTypeEnum.VNC.name().equals(connectType)) {
+                // VNC
+                connectConfig = hostConnectApi.getVncConnectConfig(host, userId);
             } else {
                 throw Exceptions.unsupported();
             }