🐛 修复修改主机配置报错.

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java

@@ -93,6 +93,15 @@ public class HostController {
         return hostService.updateHostStatus(request);
     }
 
+    @DemoDisableApi
+    @OperatorLog(HostOperatorType.UPDATE_SPEC)
+    @PutMapping("/update-spec")
+    @Operation(summary = "修改主机规格信息")
+    @PreAuthorize("@ss.hasPermission('asset:host:update')")
+    public Integer updateHostSpec(@Validated @RequestBody HostExtraUpdateRequest request) {
+        return hostService.updateHostSpec(request);
+    }
+
     @IgnoreLog(IgnoreLogMode.RET)
     @GetMapping("/get")
     @Operation(summary = "通过 id 查询主机")

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java

@@ -26,10 +26,13 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.constant.ErrorMessage;
+import org.dromara.visor.common.utils.Valid;
 import org.dromara.visor.framework.log.core.annotation.IgnoreLog;
 import org.dromara.visor.framework.log.core.enums.IgnoreLogMode;
 import org.dromara.visor.framework.web.core.annotation.RestWrapper;
 import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest;
+import org.dromara.visor.module.asset.enums.HostExtraItemEnum;
 import org.dromara.visor.module.asset.service.HostExtraService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -67,6 +70,8 @@ public class HostExtraController {
     @PutMapping("/update")
     @Operation(summary = "修改主机拓展信息")
     public Integer updateHostExtra(@Validated @RequestBody HostExtraUpdateRequest request) {
+        HostExtraItemEnum item = Valid.valid(HostExtraItemEnum::of, request.getItem());
+        Valid.isTrue(item.isUserExtra(), ErrorMessage.PARAM_ERROR);
         return hostExtraService.updateHostExtra(request);
     }
 

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java

@@ -48,6 +48,8 @@ public class HostOperatorType extends InitializingOperatorTypes {
 
     public static final String UPDATE_CONFIG = "host:update-config";
 
+    public static final String UPDATE_SPEC = "host:update-spec";
+
     @Override
     public OperatorType[] types() {
         return new OperatorType[]{
@@ -56,6 +58,7 @@ public class HostOperatorType extends InitializingOperatorTypes {
                 new OperatorType(H, DELETE, "删除主机 <sb>${count}</sb> 条"),
                 new OperatorType(M, UPDATE_STATUS, "修改主机状态 <sb>${name}</sb> - <sb>${status}</sb>"),
                 new OperatorType(M, UPDATE_CONFIG, "修改主机配置 <sb>${name}</sb>"),
+                new OperatorType(M, UPDATE_SPEC, "修改主机规格信息 <sb>${name}</sb>"),
         };
     }
 

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java

@@ -49,7 +49,6 @@ public class HostExtraUpdateRequest {
     @Schema(description = "主机id")
     private Long hostId;
 
-    @NotNull
     @Schema(description = "配置项")
     private String item;
 

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

@@ -122,14 +122,12 @@ public class HostSshConfigStrategy extends AbstractGenericsDataStrategy<HostSshC
      * @param after  after
      */
     private void checkEncryptPassword(HostSshConfigModel before, HostSshConfigModel after) {
-        // 非密码认证则直接赋值
+        // 非密码认证/使用原始密码则直接赋值
-        if (!HostSshAuthTypeEnum.PASSWORD.name().equals(after.getAuthType())) {
+        if (!HostSshAuthTypeEnum.PASSWORD.name().equals(after.getAuthType())
-            after.setPassword(before.getPassword());
+                || !Booleans.isTrue(after.getUseNewPassword())) {
-            return;
+            if (before != null) {
-        }
+                after.setPassword(before.getPassword());
-        // 使用原始密码
+            }
-        if (!Booleans.isTrue(after.getUseNewPassword())) {
-            after.setPassword(before.getPassword());
             return;
         }
         // 检查新密码

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java

@@ -25,10 +25,7 @@ package org.dromara.visor.module.asset.service;
 import cn.orionsec.kit.lang.define.wrapper.DataGrid;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.dromara.visor.module.asset.entity.domain.HostDO;
-import org.dromara.visor.module.asset.entity.request.host.HostCreateRequest;
+import org.dromara.visor.module.asset.entity.request.host.*;
-import org.dromara.visor.module.asset.entity.request.host.HostQueryRequest;
-import org.dromara.visor.module.asset.entity.request.host.HostUpdateRequest;
-import org.dromara.visor.module.asset.entity.request.host.HostUpdateStatusRequest;
 import org.dromara.visor.module.asset.entity.vo.HostVO;
 
 import java.util.List;
@@ -66,6 +63,14 @@ public interface HostService {
      */
     Integer updateHostStatus(HostUpdateStatusRequest request);
 
+    /**
+     * 修改主机规格
+     *
+     * @param request request
+     * @return effect
+     */
+    Integer updateHostSpec(HostExtraUpdateRequest request);
+
     /**
      * 通过 id 查询主机
      *

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java

@@ -44,11 +44,9 @@ import org.dromara.visor.module.asset.dao.HostDAO;
 import org.dromara.visor.module.asset.define.cache.HostCacheKeyDefine;
 import org.dromara.visor.module.asset.entity.domain.HostDO;
 import org.dromara.visor.module.asset.entity.dto.HostCacheDTO;
-import org.dromara.visor.module.asset.entity.request.host.HostCreateRequest;
+import org.dromara.visor.module.asset.entity.request.host.*;
-import org.dromara.visor.module.asset.entity.request.host.HostQueryRequest;
-import org.dromara.visor.module.asset.entity.request.host.HostUpdateRequest;
-import org.dromara.visor.module.asset.entity.request.host.HostUpdateStatusRequest;
 import org.dromara.visor.module.asset.entity.vo.HostVO;
+import org.dromara.visor.module.asset.enums.HostExtraItemEnum;
 import org.dromara.visor.module.asset.enums.HostStatusEnum;
 import org.dromara.visor.module.asset.handler.host.extra.model.HostSpecExtraModel;
 import org.dromara.visor.module.asset.service.ExecJobHostService;
@@ -192,6 +190,19 @@ public class HostServiceImpl implements HostService {
         return effect;
     }
 
+    @Override
+    public Integer updateHostSpec(HostExtraUpdateRequest request) {
+        log.info("HostService-updateHostSpec request: {}", JSON.toJSONString(request));
+        // 查询主机
+        HostDO record = hostDAO.selectById(request.getHostId());
+        Valid.notNull(record, ErrorMessage.HOST_ABSENT);
+        // 设置日志参数
+        OperatorLogs.add(OperatorLogs.NAME, record.getName());
+        // 更新
+        request.setItem(HostExtraItemEnum.SPEC.name());
+        return hostExtraService.updateHostExtra(request);
+    }
+
     @Override
     @SneakyThrows
     public HostVO getHostById(Long id) {

orion-visor-ui/src/api/asset/host.ts

@@ -1,4 +1,4 @@
-import type { HostSpecExtraModel } from './host-extra';
+import type { HostSpecExtraModel, HostExtraUpdateRequest } from './host-extra';
 import type { TableData } from '@arco-design/web-vue';
 import type { DataGrid, OrderDirection, Pagination } from '@/types/global';
 import axios from 'axios';
@@ -121,6 +121,13 @@ export function updateHostStatus(request: HostUpdateStatusRequest) {
   return axios.put('/asset/host/update-status', request);
 }
 
+/**
+ * 修改主机规格信息
+ */
+export function updateHostSpec(request: Partial<HostExtraUpdateRequest>) {
+  return axios.put('/asset/host/update-spec', request);
+}
+
 /**
  * 查询主机
  */

orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue

@@ -252,10 +252,11 @@
 <script lang="ts" setup>
   import type { HostSpecExtraModel } from '@/api/asset/host-extra';
   import { onMounted, ref } from 'vue';
+  import { updateHostSpec } from '@/api/asset/host';
+  import { getHostExtraItem } from '@/api/asset/host-extra';
   import { addSuffix, dateFormat } from '@/utils';
   import { useToggle } from '@vueuse/core';
   import useLoading from '@/hooks/loading';
-  import { getHostExtraItem, updateHostExtra } from '@/api/asset/host-extra';
 
   const props = defineProps<{
     hostId: number;
@@ -297,9 +298,8 @@
   const saveSpec = async () => {
     setLoading(true);
     try {
-      await updateHostExtra({
+      await updateHostSpec({
         hostId: props.hostId,
-        item: 'SPEC',
         extra: JSON.stringify(formModel.value)
       });
       toggleEditing();

orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue

@@ -42,7 +42,7 @@
 <script lang="ts" setup>
   import type { ISshSession, TerminalPanelTabItem } from '../../types/define';
   import { onMounted, onUnmounted, ref } from 'vue';
-  import { useDictStore, useTerminalStore } from '@/store';
+  import { useTerminalStore } from '@/store';
   import SshHeader from './ssh-header.vue';
   import ShellEditorModal from '@/components/view/shell-editor/modal/index.vue';
   import SshContextMenu from './ssh-context-menu.vue';
@@ -53,7 +53,6 @@
     tab: TerminalPanelTabItem;
   }>();
 
-  const { getDictValue } = useDictStore();
   const { preference, sessionManager } = useTerminalStore();
 
   const editorModal = ref();

sql/init-4-data.sql

@@ -349,6 +349,7 @@ INSERT INTO `dict_value` VALUES (443, 21, 'terminalFontFamily', 'Cascadia Mono',
 INSERT INTO `dict_value` VALUES (448, 65, 'hostArchType', 'AMD64', 'amd64', '{}', 10, '2025-03-26 16:33:07', '2025-03-26 16:33:07', 'admin', 'admin', 0);
 INSERT INTO `dict_value` VALUES (449, 65, 'hostArchType', 'ARM64', 'arm64', '{}', 20, '2025-03-26 16:33:23', '2025-03-26 16:33:23', 'admin', 'admin', 0);
 INSERT INTO `dict_value` VALUES (452, 38, 'hostOsType', 'DRAWIN', 'Drawin', '{}', 30, '2024-04-16 22:19:25', '2025-03-26 22:46:23', 'admin', 'admin', 0);
+INSERT INTO `dict_value` VALUES (458, 2, 'operatorLogType', 'host:update-spec', '修改主机规格', '{}', 60, '2025-04-06 12:02:13', '2025-04-06 12:02:13', 'admin', 'admin', 0);
 
 -- 菜单配置
 INSERT INTO `system_menu` VALUES (1, 0, '工作台', NULL, 1, 10, 1, 1, 1, 0, 'IconComputer', NULL, 'workplace', '2023-07-28 10:51:50', '2024-08-11 00:05:44', 'admin', 'admin', 0);