diff --git a/docs/quickstart/docker-install.md b/docs/quickstart/docker-install.md index 7225c806..685bb333 100644 --- a/docs/quickstart/docker-install.md +++ b/docs/quickstart/docker-install.md @@ -36,7 +36,7 @@ cd orion-visor # MYSQL_PASSWORD mysql 用户密码 # MYSQL_ROOT_PASSWORD mysql root 密码 # REDIS_PASSWORD redis 密码 - # SECRET_KEY 加密秘钥 + # SECRET_KEY 加密密钥 # 构建 docker compose build ``` diff --git a/docs/quickstart/faq.md b/docs/quickstart/faq.md index 0509447b..65c3e0b7 100644 --- a/docs/quickstart/faq.md +++ b/docs/quickstart/faq.md @@ -21,14 +21,14 @@ 修改 `application.yaml` `app.exec-log.append-ansi` 为 `false` -> ##### 6. 为什么使用秘钥认证还是无法连接机器? +> ##### 6. 为什么使用密钥认证还是无法连接机器? ``` # 升级 openssh yum update openssh sshd -v (我的版本: OpenSSH_7.4p1, OpenSSL 1.0.2k-fips 26 Jan 2017) -# 生成秘钥时添加参数 -m PEM +# 生成密钥时添加参数 -m PEM ssh-keygen -t rsa -m PEM chmod 700 ~/.ssh chmod 700 ~/.ssh/authorized_keys diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 403c307f..94b9ba90 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/lijiahangmax/orion-visor - 1.1.0 + 2.0.0 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 3ea3da28..0268ac34 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 = "1.1.0"; + String VERSION = "2.0.0"; String ORION_VISOR = "orion-visor"; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java index 0d68de99..4a341deb 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java @@ -23,7 +23,7 @@ public interface ErrorMessage { String DATA_ABSENT = "数据不存在"; - String KEY_ABSENT = "主机秘钥不存在"; + String KEY_ABSENT = "主机密钥不存在"; String IDENTITY_ABSENT = "主机身份不存在"; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java index 89449456..648b7ac3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java @@ -24,7 +24,7 @@ public abstract class CryptoProcessor implements Va } /** - * 初始化秘钥 + * 初始化密钥 */ protected abstract void initSecretKey(); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java index 891f57bb..d58383f5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java @@ -29,17 +29,17 @@ public class AesCryptoConfig extends CryptoConfig { private PaddingMode paddingMode = PaddingMode.PKCS5_PADDING; /** - * 加密秘钥 + * 加密密钥 */ private String secretKey; /** - * 是否生成秘钥 + * 是否生成密钥 */ private boolean useGeneratorKey = true; /** - * 生成的秘钥长度 128 192 256bytes + * 生成的密钥长度 128 192 256bytes */ private int generatorKeyLength = CryptoConst.AES_KEY_LENGTH; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java index 21d1b5fe..c9e46743 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java @@ -40,7 +40,7 @@ public class AesCryptoProcessor extends CryptoProcessor { this.builder = SymmetricBuilder.aes() .workingMode(config.getWorkingMode()) .paddingMode(config.getPaddingMode()); - // 初始化秘钥 + // 初始化密钥 this.initSecretKey(); // 初始化参数规格 this.initParamSpec(); @@ -52,10 +52,10 @@ public class AesCryptoProcessor extends CryptoProcessor { protected void initSecretKey() { SecretKey secretKey; if (config.isUseGeneratorKey()) { - // 生成秘钥 + // 生成密钥 secretKey = Keys.generatorKey(config.getSecretKey(), config.getGeneratorKeyLength(), CipherAlgorithm.AES); } else { - // 获取秘钥 + // 获取密钥 secretKey = Keys.getSecretKey(config.getSecretKey(), CipherAlgorithm.AES); } builder.secretKey(secretKey); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json index 884bd209..8919c7d4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json @@ -55,18 +55,18 @@ { "name": "orion.crypto.aes.secret-key", "type": "java.lang.String", - "description": "加密秘钥." + "description": "加密密钥." }, { "name": "orion.crypto.aes.use-generator-key", "type": "java.lang.Boolean", - "description": "是否生成秘钥.", + "description": "是否生成密钥.", "defaultValue": "true" }, { "name": "orion.crypto.aes.generator-key-length", "type": "java.lang.Integer", - "description": "生成的秘钥长度 128 192 256bytes.", + "description": "生成的密钥长度 128 192 256bytes.", "defaultValue": "128" }, { diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index 590f243c..f0873c42 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -46,7 +46,7 @@ orion: mode: ROW crypto: aes: - # 加密秘钥 + # 加密密钥 secret-key: ${SECRET_KEY:uQeacXV8b3isvKLK} async: executor: diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 3ddbe676..8d490989 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -263,7 +263,7 @@ orion: enabled: true working-mode: ECB padding-mode: PKCS5_PADDING - # 加密秘钥 + # 加密密钥 secret-key: I66AndrKWrwXjtBL use-generator-key: true generator-key-length: 128 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http index 577956c2..2db74864 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http @@ -2,7 +2,7 @@ GET {{baseUrl}}/asset/authorized-data/current-host Authorization: {{token}} -### 查询当前用户已授权的主机秘钥 +### 查询当前用户已授权的主机密钥 GET {{baseUrl}}/asset/authorized-data/current-host-key Authorization: {{token}} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java index fc1245e4..acf96857 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java @@ -47,7 +47,7 @@ public class AssetAuthorizedDataServiceController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/current-host-key") - @Operation(summary = "查询当前用户已授权的主机秘钥") + @Operation(summary = "查询当前用户已授权的主机密钥") public List getCurrentAuthorizedHostKey() { return assetAuthorizedDataService.getUserAuthorizedHostKey(SecurityUtils.getLoginUserId()); } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http index 08ebeadf..9d105a0e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http @@ -15,7 +15,7 @@ Authorization: {{token}} GET {{baseUrl}}/asset/data-grant/get-host-group?userId=10 Authorization: {{token}} -### 主机秘钥授权 +### 主机密钥授权 PUT {{baseUrl}}/asset/data-grant/grant-host-key Content-Type: application/json Authorization: {{token}} @@ -28,7 +28,7 @@ Authorization: {{token}} ] } -### 获取已授权的主机秘钥 +### 获取已授权的主机密钥 GET {{baseUrl}}/asset/data-grant/get-host-key?userId=10 Authorization: {{token}} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java index 61c3b4d1..f935335a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java @@ -62,7 +62,7 @@ public class AssetDataGrantServiceController { @OperatorLog(HostKeyOperatorType.GRANT) @PutMapping("/grant-host-key") - @Operation(summary = "主机秘钥授权") + @Operation(summary = "主机密钥授权") @PreAuthorize("@ss.hasPermission('asset:host-key:grant')") public Boolean grantHostKey(@RequestBody AssetDataGrantRequest request) { assetDataGrantService.grantHostKey(request); @@ -71,7 +71,7 @@ public class AssetDataGrantServiceController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/get-host-key") - @Operation(summary = "获取已授权的主机秘钥") + @Operation(summary = "获取已授权的主机密钥") @PreAuthorize("@ss.hasPermission('asset:host-key:grant')") public List getAuthorizedHostKey(AssetAuthorizedDataQueryRequest request) { return assetAuthorizedDataService.getAuthorizedDataRelId(DataPermissionTypeEnum.HOST_KEY, request); diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http index c523c5e1..d1be5def 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http @@ -1,4 +1,4 @@ -### 创建主机秘钥 +### 创建主机密钥 POST {{baseUrl}}/asset/host-key/create Content-Type: application/json Authorization: {{token}} @@ -11,7 +11,7 @@ Authorization: {{token}} } -### 通过 id 更新主机秘钥 +### 通过 id 更新主机密钥 PUT {{baseUrl}}/asset/host-key/update Content-Type: application/json Authorization: {{token}} @@ -25,11 +25,11 @@ Authorization: {{token}} } -### 通过 id 查询主机秘钥 +### 通过 id 查询主机密钥 GET {{baseUrl}}/asset/host-key/get?id=1 Authorization: {{token}} -### 查询主机秘钥 +### 查询主机密钥 POST {{baseUrl}}/asset/host-key/list Content-Type: application/json Authorization: {{token}} @@ -43,7 +43,7 @@ Authorization: {{token}} } -### 分页查询主机秘钥 +### 分页查询主机密钥 POST {{baseUrl}}/asset/host-key/query Content-Type: application/json Authorization: {{token}} @@ -59,7 +59,7 @@ Authorization: {{token}} } -### 通过 id 删除主机秘钥 +### 通过 id 删除主机密钥 DELETE {{baseUrl}}/asset/host-key/delete?id=1 Authorization: {{token}} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java index 06cf5add..33751f34 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java @@ -24,13 +24,13 @@ import javax.annotation.Resource; import java.util.List; /** - * 主机秘钥 api + * 主机密钥 api * * @author Jiahang Li * @version 1.0.0 * @since 2023-9-20 11:55 */ -@Tag(name = "asset - 主机秘钥服务") +@Tag(name = "asset - 主机密钥服务") @Slf4j @Validated @RestWrapper @@ -44,7 +44,7 @@ public class HostKeyController { @OperatorLog(HostKeyOperatorType.CREATE) @PostMapping("/create") - @Operation(summary = "创建主机秘钥") + @Operation(summary = "创建主机密钥") @PreAuthorize("@ss.hasPermission('asset:host-key:create')") public Long createHostKey(@Validated @RequestBody HostKeyCreateRequest request) { return hostKeyService.createHostKey(request); @@ -52,7 +52,7 @@ public class HostKeyController { @OperatorLog(HostKeyOperatorType.UPDATE) @PutMapping("/update") - @Operation(summary = "通过 id 更新主机秘钥") + @Operation(summary = "通过 id 更新主机密钥") @PreAuthorize("@ss.hasPermission('asset:host-key:update')") public Integer updateHostKey(@Validated @RequestBody HostKeyUpdateRequest request) { return hostKeyService.updateHostKeyById(request); @@ -60,7 +60,7 @@ public class HostKeyController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/get") - @Operation(summary = "查询主机秘钥详情") + @Operation(summary = "查询主机密钥详情") @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasAnyPermission('asset:host-key:query-detail', 'asset:host-key:update')") public HostKeyVO getHostKey(@RequestParam("id") Long id) { @@ -69,7 +69,7 @@ public class HostKeyController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/list") - @Operation(summary = "查询主机秘钥") + @Operation(summary = "查询主机密钥") @PreAuthorize("@ss.hasPermission('asset:host-key:query')") public List getHostKeyList() { return hostKeyService.getHostKeyList(); @@ -77,7 +77,7 @@ public class HostKeyController { @IgnoreLog(IgnoreLogMode.RET) @PostMapping("/query") - @Operation(summary = "分页查询主机秘钥") + @Operation(summary = "分页查询主机密钥") @PreAuthorize("@ss.hasPermission('asset:host-key:query')") public DataGrid getHostKeyPage(@Validated(Page.class) @RequestBody HostKeyQueryRequest request) { return hostKeyService.getHostKeyPage(request); @@ -85,7 +85,7 @@ public class HostKeyController { @OperatorLog(HostKeyOperatorType.DELETE) @DeleteMapping("/delete") - @Operation(summary = "通过 id 删除主机秘钥") + @Operation(summary = "通过 id 删除主机密钥") @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('asset:host-key:delete')") public Integer deleteHostKey(@RequestParam("id") Long id) { diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java index e340fd0f..d5ebc20a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java @@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 主机秘钥 内部对象转换器 + * 主机密钥 内部对象转换器 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java index 71787c2e..6daa64a7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java @@ -5,7 +5,7 @@ import com.orion.visor.module.asset.entity.domain.HostKeyDO; import org.apache.ibatis.annotations.Mapper; /** - * 主机秘钥 Mapper 接口 + * 主机密钥 Mapper 接口 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java index bacf74bf..17213613 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java @@ -28,7 +28,7 @@ public interface HostCacheKeyDefine { CacheKeyDefine HOST_KEY = new CacheKeyBuilder() .key("host:key:list") - .desc("主机秘钥列表") + .desc("主机密钥列表") .type(HostKeyCacheDTO.class) .struct(RedisCacheStruct.HASH) .timeout(8, TimeUnit.HOURS) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java index 57961488..c05c0131 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java @@ -8,7 +8,7 @@ import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRisk import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.L; /** - * 主机秘钥 操作日志类型 + * 主机密钥 操作日志类型 * * @author Jiahang Li * @version 1.0.0 @@ -28,10 +28,10 @@ public class HostKeyOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建主机秘钥 ${name}"), - new OperatorType(L, UPDATE, "修改主机秘钥 ${name}"), - new OperatorType(H, DELETE, "删除主机秘钥 ${name}"), - new OperatorType(H, GRANT, "将主机秘钥权限授予 ${grantType} ${grantName}"), + new OperatorType(L, CREATE, "创建主机密钥 ${name}"), + new OperatorType(L, UPDATE, "修改主机密钥 ${name}"), + new OperatorType(H, DELETE, "删除主机密钥 ${name}"), + new OperatorType(H, GRANT, "将主机密钥权限授予 ${grantType} ${grantName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java index 9ff32e3c..37b0b678 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java @@ -46,7 +46,7 @@ public class HostIdentityDO extends BaseDO { @TableField("password") private String password; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") @TableField("key_id") private Long keyId; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java index a7739014..d5f88366 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java @@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; /** - * 主机秘钥 实体对象 + * 主机密钥 实体对象 * * @author Jiahang Li * @version 1.0.0 @@ -21,7 +21,7 @@ import lombok.*; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "host_key", autoResultMap = true) -@Schema(name = "HostKeyDO", description = "主机秘钥 实体对象") +@Schema(name = "HostKeyDO", description = "主机密钥 实体对象") public class HostKeyDO extends BaseDO { private static final long serialVersionUID = 1L; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java index 16f9c41b..4a6bd97b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java @@ -35,7 +35,7 @@ public class HostIdentityCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "用户名") private String username; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java index 0ba00a38..b1fb20a4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; /** - * 主机秘钥缓存 + * 主机密钥缓存 * * @author Jiahang Li * @version 1.0.0 @@ -20,7 +20,7 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostKeyCacheDTO", description = "主机秘钥缓存") +@Schema(name = "HostKeyCacheDTO", description = "主机密钥缓存") public class HostKeyCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "id") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostTerminalConnectDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostTerminalConnectDTO.java index 44f1c50c..df261acf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostTerminalConnectDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostTerminalConnectDTO.java @@ -63,7 +63,7 @@ public class HostTerminalConnectDTO { @Schema(description = "密码") private String password; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; @Desensitize(toEmpty = true) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java index 2318837c..10c95a55 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java @@ -43,7 +43,7 @@ public class HostIdentityCreateRequest implements Serializable { @Schema(description = "用户密码") private String password; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java index 126853cd..01aae9db 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java @@ -43,7 +43,7 @@ public class HostIdentityQueryRequest extends PageRequest { @Schema(description = "用户密码") private String password; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java index f0413931..da877fb5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java @@ -48,7 +48,7 @@ public class HostIdentityUpdateRequest implements UpdatePasswordAction { @Schema(description = "用户密码") private String password; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; @Schema(description = "是否使用新密码") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java index ed097699..f547bd39 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java @@ -11,7 +11,7 @@ import javax.validation.constraints.Size; import java.io.Serializable; /** - * 主机秘钥 创建请求对象 + * 主机密钥 创建请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -21,7 +21,7 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostKeyCreateRequest", description = "主机秘钥 创建请求对象") +@Schema(name = "HostKeyCreateRequest", description = "主机密钥 创建请求对象") public class HostKeyCreateRequest implements Serializable { @NotBlank diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java index ce584879..fd87ed54 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java @@ -7,7 +7,7 @@ import lombok.*; import javax.validation.constraints.Size; /** - * 主机秘钥 查询请求对象 + * 主机密钥 查询请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -18,7 +18,7 @@ import javax.validation.constraints.Size; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "HostKeyQueryRequest", description = "主机秘钥 查询请求对象") +@Schema(name = "HostKeyQueryRequest", description = "主机密钥 查询请求对象") public class HostKeyQueryRequest extends PageRequest { @Schema(description = "搜索") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java index 47e58392..00a9b8ba 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; /** - * 主机秘钥 更新请求对象 + * 主机密钥 更新请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -22,7 +22,7 @@ import javax.validation.constraints.Size; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostKeyUpdateRequest", description = "主机秘钥 更新请求对象") +@Schema(name = "HostKeyUpdateRequest", description = "主机密钥 更新请求对象") public class HostKeyUpdateRequest implements UpdatePasswordAction { @NotNull diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java index 04222d5f..6aceb309 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.List; /** - * 主机秘钥 视图响应对象 + * 主机密钥 视图响应对象 * * @author Jiahang Li * @version 1.0.0 @@ -22,7 +22,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostGroupTreeVO", description = "主机秘钥 视图响应对象") +@Schema(name = "HostGroupTreeVO", description = "主机密钥 视图响应对象") public class HostGroupTreeVO implements TreeNode, Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java index c9cd4509..c0fb2c06 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java @@ -37,10 +37,10 @@ public class HostIdentityVO implements Serializable { @Schema(description = "用户名") private String username; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; - @Schema(description = "秘钥名称") + @Schema(description = "密钥名称") private String keyName; @Schema(description = "创建时间") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java index 25610698..a678175b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.Date; /** - * 主机秘钥 视图响应对象 + * 主机密钥 视图响应对象 * * @author Jiahang Li * @version 1.0.0 @@ -20,7 +20,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostKeyVO", description = "主机秘钥 视图响应对象") +@Schema(name = "HostKeyVO", description = "主机密钥 视图响应对象") public class HostKeyVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java index d2e2393f..141b8d53 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java @@ -15,7 +15,7 @@ public enum HostExtraSshAuthTypeEnum { DEFAULT, /** - * 自定义秘钥验证 + * 自定义密钥验证 */ CUSTOM_KEY, diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java index 56f38035..e152c8ed 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java @@ -15,7 +15,7 @@ public enum HostIdentityTypeEnum { PASSWORD, /** - * 秘钥 + * 密钥 */ KEY, diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java index 7602a9b9..ed0c4b89 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java @@ -15,7 +15,7 @@ public enum HostSshAuthTypeEnum { PASSWORD, /** - * 秘钥验证 + * 密钥验证 */ KEY, diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java index 6fc6fdfe..fa7b2c9e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java @@ -52,7 +52,7 @@ public class HostSshConfigModel implements GenericsDataModel, UpdatePasswordActi @Schema(description = "身份id") private Long identityId; - @Schema(description = "秘钥id") + @Schema(description = "密钥id") private Long keyId; @NotNull diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java index 1ab2777e..ceb4ae5f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java @@ -64,7 +64,7 @@ public class HostSshConfigStrategy implements MapDataStrategy } else if (HostExtraSshAuthTypeEnum.CUSTOM_IDENTITY.equals(authType)) { Valid.notNull(identityId); } - // 验证主机秘钥是否存在 + // 验证主机密钥是否存在 if (keyId != null) { Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT); } @@ -65,7 +65,7 @@ public class HostSshExtraStrategy implements MapDataStrategy Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT); } Long userId = SecurityUtils.getLoginUserId(); - // 验证主机秘钥是否有权限 + // 验证主机密钥是否有权限 if (keyId != null) { Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId), ErrorMessage.ANY_NO_PERMISSION, diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java index 5e03b54a..45baa517 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java @@ -54,7 +54,7 @@ public interface AssetAuthorizedDataService { AuthorizedHostWrapperVO getUserAuthorizedHost(Long userId, String type); /** - * 查询用户已授权的主机秘钥 + * 查询用户已授权的主机密钥 * * @param userId userId * @return key diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java index 554b112c..9d0b06a2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java @@ -20,7 +20,7 @@ public interface AssetDataGrantService { void grantHostGroup(AssetDataGrantRequest request); /** - * 主机秘钥授权 + * 主机密钥授权 * * @param request request */ diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java index e219482c..bebb6014 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java @@ -10,7 +10,7 @@ import com.orion.visor.module.asset.entity.vo.HostKeyVO; import java.util.List; /** - * 主机秘钥 服务类 + * 主机密钥 服务类 * * @author Jiahang Li * @version 1.0.0 @@ -19,7 +19,7 @@ import java.util.List; public interface HostKeyService { /** - * 创建主机秘钥 + * 创建主机密钥 * * @param request request * @return id @@ -27,7 +27,7 @@ public interface HostKeyService { Long createHostKey(HostKeyCreateRequest request); /** - * 通过 id 更新主机秘钥 + * 通过 id 更新主机密钥 * * @param request request * @return effect @@ -35,7 +35,7 @@ public interface HostKeyService { Integer updateHostKeyById(HostKeyUpdateRequest request); /** - * 通过 id 查询主机秘钥 + * 通过 id 查询主机密钥 * * @param id id * @return row @@ -43,7 +43,7 @@ public interface HostKeyService { HostKeyVO getHostKeyById(Long id); /** - * 通过 id 查询主机秘钥 + * 通过 id 查询主机密钥 * * @param id id * @return row @@ -51,14 +51,14 @@ public interface HostKeyService { HostKeyDO getHostKey(Long id); /** - * 查询主机秘钥 + * 查询主机密钥 * * @return rows */ List getHostKeyList(); /** - * 分页查询主机秘钥 + * 分页查询主机密钥 * * @param request request * @return rows @@ -66,7 +66,7 @@ public interface HostKeyService { DataGrid getHostKeyPage(HostKeyQueryRequest request); /** - * 通过 id 删除主机秘钥 + * 通过 id 删除主机密钥 * * @param id id * @return effect diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java index 99b13f85..4afc6b4f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -69,7 +69,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { @Override public Long createHostIdentity(HostIdentityCreateRequest request) { log.info("HostIdentityService-createHostIdentity request: {}", JSON.toJSONString(request)); - // 检查秘钥是否存在 + // 检查密钥是否存在 this.checkCreateParams(request); // 转换 HostIdentityDO record = HostIdentityConvert.MAPPER.to(request); @@ -95,7 +95,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); HostIdentityTypeEnum type = Valid.valid(HostIdentityTypeEnum::of, request.getType()); if (HostIdentityTypeEnum.KEY.equals(type)) { - // 秘钥认证 + // 密钥认证 this.checkKeyId(request.getKeyId()); } // 查询主机身份 @@ -162,7 +162,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { if (dataGrid.isEmpty()) { return dataGrid; } - // 设置秘钥名称 + // 设置密钥名称 List keyIdList = dataGrid.stream() .filter(s -> HostIdentityTypeEnum.KEY.name().equals(s.getType())) .map(HostIdentityVO::getKeyId) @@ -170,7 +170,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { .distinct() .collect(Collectors.toList()); if (!keyIdList.isEmpty()) { - // 查询秘钥名称 + // 查询密钥名称 Map keyNameMap = hostKeyDAO.selectBatchIds(keyIdList) .stream() .collect(Collectors.toMap(HostKeyDO::getId, HostKeyDO::getName)); @@ -234,7 +234,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { // 密码认证 Valid.notBlank(request.getPassword(), ErrorMessage.PARAM_MISSING); } else if (HostIdentityTypeEnum.KEY.equals(type)) { - // 秘钥认证 + // 密钥认证 this.checkKeyId(request.getKeyId()); } } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java index abca20d2..611b1e78 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * 主机秘钥 服务实现类 + * 主机密钥 服务实现类 * * @author Jiahang Li * @version 1.0.0 @@ -114,7 +114,7 @@ public class HostKeyServiceImpl implements HostKeyService { // 查询 HostKeyDO record = hostKeyDAO.selectById(id); Valid.notNull(record, ErrorMessage.DATA_ABSENT); - // 解密秘钥 + // 解密密钥 this.decryptKey(record); // 转换 return HostKeyConvert.MAPPER.to(record); @@ -124,7 +124,7 @@ public class HostKeyServiceImpl implements HostKeyService { public HostKeyDO getHostKey(Long id) { HostKeyDO record = hostKeyDAO.selectById(id); Valid.notNull(record, ErrorMessage.DATA_ABSENT); - // 解密秘钥 + // 解密密钥 this.decryptKey(record); // 解密密码 String password = record.getPassword(); @@ -182,7 +182,7 @@ public class HostKeyServiceImpl implements HostKeyService { hostIdentityDAO.setKeyWithNull(id); // 删除主机配置 hostConfigDAO.setKeyIdWithNull(id); - // 删除主机秘钥额外配置 + // 删除主机密钥额外配置 dataExtraApi.deleteHostKeyExtra(id); // 删除数据权限 dataPermissionApi.deleteByRelId(DataPermissionTypeEnum.HOST_KEY, id); diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java index 86b7fa9b..bbc60bd9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java @@ -150,7 +150,7 @@ public class HostTerminalServiceImpl implements HostTerminalService { if (extra != null) { HostExtraSshAuthTypeEnum extraAuthType = HostExtraSshAuthTypeEnum.of(extra.getAuthType()); if (HostExtraSshAuthTypeEnum.CUSTOM_KEY.equals(extraAuthType)) { - // 验证主机秘钥是否有权限 + // 验证主机密钥是否有权限 Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, extra.getKeyId()), ErrorMessage.ANY_NO_PERMISSION, DataPermissionTypeEnum.HOST_KEY.getPermissionName()); @@ -183,9 +183,9 @@ public class HostTerminalServiceImpl implements HostTerminalService { try { SessionHolder sessionHolder = new SessionHolder(); final boolean useKey = conn.getKeyId() != null; - // 使用秘钥认证 + // 使用密钥认证 if (useKey) { - // 加载秘钥 + // 加载密钥 String publicKey = Optional.ofNullable(conn.getPublicKey()) .map(CryptoUtils::decryptAsString) .orElse(null); @@ -254,7 +254,7 @@ public class HostTerminalServiceImpl implements HostTerminalService { .map(HostExtraSshAuthTypeEnum::of) .orElse(null); if (HostExtraSshAuthTypeEnum.CUSTOM_KEY.equals(extraAuthType)) { - // 自定义秘钥 + // 自定义密钥 config.setAuthType(HostSshAuthTypeEnum.KEY.name()); config.setKeyId(extra.getKeyId()); if (extra.getUsername() != null) { @@ -279,7 +279,7 @@ public class HostTerminalServiceImpl implements HostTerminalService { authType = HostSshAuthTypeEnum.PASSWORD; config.setPassword(identity.getPassword()); } else if (HostIdentityTypeEnum.KEY.equals(identityType)) { - // 秘钥类型 + // 密钥类型 authType = HostSshAuthTypeEnum.KEY; config.setKeyId(identity.getKeyId()); } @@ -291,7 +291,7 @@ public class HostTerminalServiceImpl implements HostTerminalService { // 密码认证 conn.setPassword(config.getPassword()); } else if (HostSshAuthTypeEnum.KEY.equals(authType)) { - // 秘钥认证 + // 密钥认证 Long keyId = config.getKeyId(); HostKeyDO key = hostKeyDAO.selectById(keyId); Valid.notNull(key, ErrorMessage.KEY_ABSENT); diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java index b02d1f51..d63428c4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java @@ -139,7 +139,7 @@ public interface DataExtraApi { Integer deleteByRelId(DataExtraTypeEnum type, Long relId); /** - * 删除主机秘钥 + * 删除主机密钥 * * @param keyId keyId * @return effect diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java index 2ec78ddf..87aa1efb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java @@ -20,9 +20,9 @@ public enum DataPermissionTypeEnum { HOST_GROUP(true, "主机分组"), /** - * 主机秘钥 + * 主机密钥 */ - HOST_KEY(true, "主机秘钥"), + HOST_KEY(true, "主机密钥"), /** * 主机身份 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java index 27ed2a7a..62737ccb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java @@ -43,7 +43,7 @@ public interface DataExtraDAO extends IMapper { } /** - * 删除主机秘钥 + * 删除主机密钥 * * @param keyId keyId * @return effect diff --git a/orion-visor-ui/src/api/asset/asset-authorized-data.ts b/orion-visor-ui/src/api/asset/asset-authorized-data.ts index d3f2ba66..237340ad 100644 --- a/orion-visor-ui/src/api/asset/asset-authorized-data.ts +++ b/orion-visor-ui/src/api/asset/asset-authorized-data.ts @@ -22,7 +22,7 @@ export function getCurrentAuthorizedHost(type: string) { } /** - * 查询当前用户已授权的主机秘钥 + * 查询当前用户已授权的主机密钥 */ export function getCurrentAuthorizedHostKey() { return axios.get>('/asset/authorized-data/current-host-key'); diff --git a/orion-visor-ui/src/api/asset/asset-data-grant.ts b/orion-visor-ui/src/api/asset/asset-data-grant.ts index dcb8eb36..9a0fb435 100644 --- a/orion-visor-ui/src/api/asset/asset-data-grant.ts +++ b/orion-visor-ui/src/api/asset/asset-data-grant.ts @@ -32,14 +32,14 @@ export function getAuthorizedHostGroup(params: AssetAuthorizedDataQueryRequest) } /** - * 主机秘钥授权 + * 主机密钥授权 */ export function grantHostKey(request: AssetDataGrantRequest) { return axios.put('/asset/data-grant/grant-host-key', request); } /** - * 获取已授权的主机秘钥 + * 获取已授权的主机密钥 */ export function getAuthorizedHostKey(params: AssetAuthorizedDataQueryRequest) { return axios.get>('/asset/data-grant/get-host-key', { params }); diff --git a/orion-visor-ui/src/api/asset/host-key.ts b/orion-visor-ui/src/api/asset/host-key.ts index 73db51d4..baf2dd41 100644 --- a/orion-visor-ui/src/api/asset/host-key.ts +++ b/orion-visor-ui/src/api/asset/host-key.ts @@ -3,7 +3,7 @@ import type { TableData } from '@arco-design/web-vue/es/table/interface'; import axios from 'axios'; /** - * 主机秘钥创建请求 + * 主机密钥创建请求 */ export interface HostKeyCreateRequest { name?: string; @@ -13,7 +13,7 @@ export interface HostKeyCreateRequest { } /** - * 主机秘钥更新请求 + * 主机密钥更新请求 */ export interface HostKeyUpdateRequest extends HostKeyCreateRequest { id?: number; @@ -21,7 +21,7 @@ export interface HostKeyUpdateRequest extends HostKeyCreateRequest { } /** - * 主机秘钥查询请求 + * 主机密钥查询请求 */ export interface HostKeyQueryRequest extends Pagination { searchValue?: string; @@ -32,7 +32,7 @@ export interface HostKeyQueryRequest extends Pagination { } /** - * 主机秘钥查询响应 + * 主机密钥查询响应 */ export interface HostKeyQueryResponse extends TableData { id: number; @@ -45,42 +45,42 @@ export interface HostKeyQueryResponse extends TableData { } /** - * 创建主机秘钥 + * 创建主机密钥 */ export function createHostKey(request: HostKeyCreateRequest) { return axios.post('/asset/host-key/create', request); } /** - * 通过 id 更新主机秘钥 + * 通过 id 更新主机密钥 */ export function updateHostKey(request: HostKeyUpdateRequest) { return axios.put('/asset/host-key/update', request); } /** - * 通过 id 查询主机秘钥 + * 通过 id 查询主机密钥 */ export function getHostKey(id: number) { return axios.get('/asset/host-key/get', { params: { id } }); } /** - * 查询主机秘钥 + * 查询主机密钥 */ export function getHostKeyList() { return axios.get>('/asset/host-key/list'); } /** - * 分页查询主机秘钥 + * 分页查询主机密钥 */ export function getHostKeyPage(request: HostKeyQueryRequest) { return axios.post>('/asset/host-key/query', request); } /** - * 通过 id 删除主机秘钥 + * 通过 id 删除主机密钥 */ export function deleteHostKey(id: number) { return axios.delete('/asset/host-key/delete', { params: { id } }); diff --git a/orion-visor-ui/src/components/app/setting/index.vue b/orion-visor-ui/src/components/app/setting/index.vue index 521c8b9a..62741061 100644 --- a/orion-visor-ui/src/components/app/setting/index.vue +++ b/orion-visor-ui/src/components/app/setting/index.vue @@ -123,7 +123,7 @@ options: [{ value: 'table', label: '表格' }, { value: 'card', label: '卡片' }] }, { - name: '主机秘钥', + name: '主机密钥', key: 'hostKeyView', type: 'radio-group', margin: '0 0 4px 0', diff --git a/orion-visor-ui/src/components/asset/host-key/selector/index.vue b/orion-visor-ui/src/components/asset/host-key/selector/index.vue index 757523ac..dd1f7e23 100644 --- a/orion-visor-ui/src/components/asset/host-key/selector/index.vue +++ b/orion-visor-ui/src/components/asset/host-key/selector/index.vue @@ -2,7 +2,7 @@ diff --git a/orion-visor-ui/src/store/modules/cache/index.ts b/orion-visor-ui/src/store/modules/cache/index.ts index ec1b8bda..fce9e372 100644 --- a/orion-visor-ui/src/store/modules/cache/index.ts +++ b/orion-visor-ui/src/store/modules/cache/index.ts @@ -86,7 +86,7 @@ export default defineStore('cache', { return await this.load('hosts', getHostList, force); }, - // 获取主机秘钥列表 + // 获取主机密钥列表 async loadHostKeys(force = false) { return await this.load('hostKeys', getHostKeyList, force); }, @@ -106,7 +106,7 @@ export default defineStore('cache', { return await this.load(`${type}_Tags`, () => getTagList(type), force); }, - // 获取已授权的主机秘钥列表 + // 获取已授权的主机密钥列表 async loadAuthorizedHostKeys(force = false) { return await this.load('authorizedHostKeys', getCurrentAuthorizedHostKey, force); }, diff --git a/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue b/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue index 4240bbbe..57e7d093 100644 --- a/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue +++ b/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue @@ -23,15 +23,15 @@ {{ getDictValue(identityTypeKey, record.type) }} - + - + - + diff --git a/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts b/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts index 7068ec84..e9a3c6be 100644 --- a/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts +++ b/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts @@ -19,7 +19,7 @@ const fieldConfig = { slotName: 'username', ellipsis: true, }, { - label: '主机秘钥', + label: '主机密钥', dataIndex: 'keyId', slotName: 'keyId', height: '24px', diff --git a/orion-visor-ui/src/views/asset/host-identity/types/form.rules.ts b/orion-visor-ui/src/views/asset/host-identity/types/form.rules.ts index 7aa28ee0..c454e111 100644 --- a/orion-visor-ui/src/views/asset/host-identity/types/form.rules.ts +++ b/orion-visor-ui/src/views/asset/host-identity/types/form.rules.ts @@ -15,7 +15,7 @@ export const type = [{ export const keyId = [{ required: true, - message: '请选择秘钥' + message: '请选择密钥' }] as FieldRule[]; export const username = [{ diff --git a/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts b/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts index 1a08144e..fe40a282 100644 --- a/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts +++ b/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts @@ -25,7 +25,7 @@ const columns = [ dataIndex: 'username', slotName: 'username', }, { - title: '主机秘钥', + title: '主机密钥', dataIndex: 'keyId', slotName: 'keyId', }, { diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue index 74c44f16..031d293d 100644 --- a/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue +++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue @@ -10,7 +10,7 @@ @cancel="handleClose"> - 请使用 ssh-keygen -m PEM -t rsa 生成秘钥 + 请使用 ssh-keygen -m PEM -t rsa 生成密钥 { - title.value = '添加主机秘钥'; + title.value = '添加主机密钥'; isAddHandle.value = true; isViewHandler.value = false; renderForm({ ...defaultForm() }); @@ -128,7 +128,7 @@ // 打开修改 const openUpdate = async (record: any) => { - title.value = '修改主机秘钥'; + title.value = '修改主机密钥'; isAddHandle.value = false; isViewHandler.value = false; await render(record.id); @@ -136,7 +136,7 @@ // 打开查看 const openView = async (record: any) => { - title.value = '主机秘钥'; + title.value = '主机密钥'; isAddHandle.value = false; isViewHandler.value = true; await render(record.id); diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue index 534aaef0..54fd47e3 100644 --- a/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue +++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue @@ -26,7 +26,7 @@
- 秘钥列表 + 密钥列表
diff --git a/orion-visor-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue b/orion-visor-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue index 2a87d39e..6019f92d 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue @@ -69,10 +69,10 @@ checked-text="使用新密码" unchecked-text="使用原密码" /> - + diff --git a/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/const.ts b/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/const.ts index 39c79db7..588e6a0c 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/const.ts +++ b/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/const.ts @@ -19,7 +19,7 @@ export interface HostSshConfig { export const SshAuthType = { // 密码验证 PASSWORD: 'PASSWORD', - // 秘钥验证 + // 密钥验证 KEY: 'KEY', // 身份验证 IDENTITY: 'IDENTITY' diff --git a/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/form.rules.ts b/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/form.rules.ts index 3577d496..c7d7a215 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/form.rules.ts +++ b/orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/form.rules.ts @@ -22,7 +22,7 @@ export const authType = [{ export const keyId = [{ required: true, - message: '请选择主机秘钥' + message: '请选择主机密钥' }] as FieldRule[]; export const identityId = [{ diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue b/orion-visor-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue index 7a3bcb83..e8ed04f3 100644 --- a/orion-visor-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue +++ b/orion-visor-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue @@ -16,11 +16,11 @@ label="用户名"> - + + label="主机密钥" + :rules="{ required: true, message: '请选择主机密钥' }"> diff --git a/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts b/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts index f924b367..7ac795e6 100644 --- a/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts +++ b/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts @@ -64,7 +64,7 @@ export const ExtraSettingItems = { export const ExtraSshAuthType = { // 使用默认认证方式 DEFAULT: 'DEFAULT', - // 自定义秘钥 + // 自定义密钥 CUSTOM_KEY: 'CUSTOM_KEY', // 自定义身份 CUSTOM_IDENTITY: 'CUSTOM_IDENTITY',