diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm index 1951b820..6ad2e6fa 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm @@ -3,7 +3,7 @@ import { dateFormat } from '@/utils'; const fieldConfig = { rowGap: '10px', - labelSpan: 8, + labelSpan: 6, minHeight: '22px', fields: [ { diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java index ebf25a86..e3783dd1 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java @@ -31,10 +31,10 @@ package org.dromara.visor.module.asset.handler.host.jsch; */ public interface SessionMessage { - String AUTHENTICATION_FAILURE = "authentication failed. please check the configuration. - {}"; + String AUTHENTICATION_FAILURE = "身份认证失败. {}"; - String SERVER_UNREACHABLE = "remote server unreachable. please check the configuration. - {}"; + String SERVER_UNREACHABLE = "无法连接至服务器. {}"; - String CONNECTION_TIMEOUT = "connection timeout. - {}"; + String CONNECTION_TIMEOUT = "连接服务器超时. {}"; } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java index 70c358ec..85e0ad97 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java @@ -48,6 +48,7 @@ import org.dromara.visor.module.asset.enums.HostIdentityTypeEnum; import org.dromara.visor.module.asset.enums.HostSshAuthTypeEnum; import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; import org.dromara.visor.module.asset.handler.host.extra.model.HostSshExtraModel; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; import org.dromara.visor.module.asset.service.HostConfigService; import org.dromara.visor.module.asset.service.HostExtraService; import org.dromara.visor.module.asset.service.TerminalService; @@ -81,7 +82,7 @@ public class TerminalServiceImpl implements TerminalService { private HostExtraService hostExtraService; @Resource - private AssetAuthorizedDataServiceImpl assetAuthorizedDataService; + private AssetAuthorizedDataService assetAuthorizedDataService; @Resource private HostDAO hostDAO; diff --git a/orion-visor-ui/src/components/exec/log/panel/index.vue b/orion-visor-ui/src/components/exec/log/panel/index.vue index c9805140..c6a31209 100644 --- a/orion-visor-ui/src/components/exec/log/panel/index.vue +++ b/orion-visor-ui/src/components/exec/log/panel/index.vue @@ -27,7 +27,7 @@