⚡ 添加系统架构枚举.

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

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.module.asset.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 主机系统架构类型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/16 21:58
+ */
+@Getter
+@AllArgsConstructor
+public enum HostArchTypeEnum {
+
+    /**
+     * X86_64
+     */
+    AMD64,
+
+    /**
+     * arm64
+     */
+    ARM64,
+
+    ;
+
+    public boolean is(String type) {
+        if (type == null) {
+            return false;
+        }
+        return type.equalsIgnoreCase(this.name());
+    }
+
+    public static HostArchTypeEnum of(String type) {
+        if (type == null) {
+            return AMD64;
+        }
+        type = type.toUpperCase();
+        for (HostArchTypeEnum value : values()) {
+            if (value.name().equals(type) || type.contains(value.name())) {
+                return value;
+            }
+        }
+        return AMD64;
+    }
+
+}

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

@@ -46,40 +46,33 @@ public enum HostOsTypeEnum {
      */
     WINDOWS(".cmd"),
 
+    /**
+     * darwin
+     */
+    DARWIN(".sh"),
+
     ;
 
     private final String scriptSuffix;
 
+    public boolean is(String type) {
+        if (type == null) {
+            return false;
+        }
+        return type.equalsIgnoreCase(this.name());
+    }
+
     public static HostOsTypeEnum of(String type) {
         if (type == null) {
             return LINUX;
         }
+        type = type.toUpperCase();
         for (HostOsTypeEnum value : values()) {
-            if (value.name().equals(type)) {
+            if (value.name().equals(type) || type.contains(value.name())) {
                 return value;
             }
         }
         return LINUX;
     }
 
-    /**
-     * 是否为 linux 系统
-     *
-     * @param type type
-     * @return isLinux
-     */
-    public static boolean isLinux(String type) {
-        return LINUX.name().equals(type);
-    }
-
-    /**
-     * 是否为 windows 系统
-     *
-     * @param type type
-     * @return isWindows
-     */
-    public static boolean isWindows(String type) {
-        return WINDOWS.name().equals(type);
-    }
-
 }

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java

@@ -161,7 +161,7 @@ public class FileUploader implements IFileUploader {
         if (containsEnv) {
             // 替换占位符
             String username = connectInfo.getUsername();
-            String home = PathUtils.getHomePath(HostOsTypeEnum.isWindows(connectInfo.getOsType()), username);
+            String home = PathUtils.getHomePath(HostOsTypeEnum.WINDOWS.is(connectInfo.getOsType()), username);
             // 替换环境变量路径
             Map<String, String> env = Maps.newMap(4);
             env.put(ExtraFieldConst.USERNAME, username);