diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index f1b0df23..d60b162c 100644 --- 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.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.3 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.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.3 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.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.3 privileged: true ports: - 6380:6379 diff --git a/docker-compose.yml b/docker-compose.yml index 14f8a5e0..0deb56f9 100644 --- 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.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.3 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.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.3 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.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.3 privileged: true ports: - 6380:6379 @@ -68,7 +68,7 @@ services: retries: 10 start_period: 3s adminer: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.3 ports: - 8081:8080 depends_on: diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index bc1a13ef..f03a0a99 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,5 +1,4 @@ #/bin/bash -version=2.1.2 +version=2.1.3 docker build -t orion-visor-adminer:${version} . docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} -docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 33fe99cc..614c250f 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,7 +1,6 @@ #/bin/bash -version=2.1.2 +version=2.1.3 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} -docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} diff --git a/docker/push.sh b/docker/push.sh new file mode 100644 index 00000000..736746e7 --- /dev/null +++ b/docker/push.sh @@ -0,0 +1,6 @@ +#/bin/bash +version=2.1.3 +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} +docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index d32ba34f..16e44b07 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,4 @@ #/bin/bash -version=2.1.2 +version=2.1.3 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} -docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} diff --git a/docker/service/build.sh b/docker/service/build.sh index bbb08391..52b69d10 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,9 +1,8 @@ #/bin/bash -version=2.1.2 +version=2.1.3 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} . rm -rf ./orion-visor-launch.jar rm -rf ./dist docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} -docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index d52044ff..75eef8cf 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.1.2 + 2.1.3 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java index 197f43d8..1d03be4f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-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.2"; + String VERSION = "2.1.3"; /** * 同 ${spring.application.name} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java index 117d2bc0..08879f71 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java @@ -5,6 +5,7 @@ import com.orion.lang.exception.argument.InvalidArgumentException; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.net.host.SessionHolder; +import com.orion.net.host.SessionLogger; import com.orion.net.host.SessionStore; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.utils.CryptoUtils; @@ -40,6 +41,7 @@ public class SessionStores { CURRENT_ADDRESS.set(address); // 创建会话 SessionHolder sessionHolder = SessionHolder.create(); + sessionHolder.setLogger(SessionLogger.INFO); SessionStore session = createSessionStore(conn, sessionHolder); // 连接 session.connect(); diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index c7772bd4..a7be2a5c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -102,8 +102,8 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy