diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java index 5f1d3cfc..b92d8838 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java @@ -47,4 +47,11 @@ public interface UpdatePasswordAction extends Serializable { */ String getPassword(); + /** + * 设置密码 + * + * @param password password + */ + void setPassword(String password); + } diff --git a/orion-visor-ui/src/api/asset/host-config.ts b/orion-visor-ui/src/api/asset/host-config.ts index 97f97f32..9cb3b5ef 100644 --- a/orion-visor-ui/src/api/asset/host-config.ts +++ b/orion-visor-ui/src/api/asset/host-config.ts @@ -17,20 +17,23 @@ export interface HostUpdateConfigRequest { config: string; } -// 主机 SSH 配置 -export interface HostSshConfig { +export interface HostBaseConfig { username?: string; port?: number; password?: string; authType?: string; + useNewPassword?: boolean; + hasPassword?: boolean; +} + +// 主机 SSH 配置 +export interface HostSshConfig extends HostBaseConfig { keyId?: number; identityId?: number; connectTimeout?: number; charset?: string; fileNameCharset?: string; fileContentCharset?: string; - useNewPassword?: boolean; - hasPassword?: boolean; } /** @@ -43,6 +46,6 @@ export function updateHostConfig(request: HostUpdateConfigRequest) { /** * 查询主机配置 */ -export function getHostSshConfig(request: HostUpdateQueryRequest) { +export function getHostConfig(request: HostUpdateQueryRequest) { return axios.post('/asset/host-config/get', request); } diff --git a/orion-visor-ui/src/components/asset/host-identity/selector/index.vue b/orion-visor-ui/src/components/asset/host-identity/selector/index.vue index 2b9a85b9..914a885d 100644 --- a/orion-visor-ui/src/components/asset/host-identity/selector/index.vue +++ b/orion-visor-ui/src/components/asset/host-identity/selector/index.vue @@ -36,6 +36,7 @@ const props = withDefaults(defineProps>(), { authorized: false }); @@ -66,13 +67,14 @@ const hostIdentities = props.authorized ? await cacheStore.loadAuthorizedHostIdentities() : await cacheStore.loadHostIdentities(); - optionData.value = hostIdentities.map(s => { - return { - label: s.name, - value: s.id, - username: s.username, - }; - }); + optionData.value = hostIdentities.filter(s => !props.type || s.type === props.type) + .map(s => { + return { + label: s.name, + value: s.id, + username: s.username, + }; + }); } catch (e) { } finally { setLoading(false); diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue index 7def7e4a..5e4431cb 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue @@ -54,18 +54,16 @@