manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

📝 修改密钥.

Browse Source
This commit is contained in:
lijiahang
2024-05-17 12:26:01 +08:00
parent c85ab97cc5
commit a9dd8f2f36
75 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/quickstart/docker-install.md
View File

@@ -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
```

4
docs/quickstart/faq.md
View File

@@ -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

2
orion-visor-dependencies/pom.xml
View File

@@ -14,7 +14,7 @@
<url>https://github.com/lijiahangmax/orion-visor</url>
<properties>
<revision>1.1.0</revision>
<revision>2.0.0</revision>
<spring.boot.version>2.7.17</spring.boot.version>
<spring.boot.admin.version>2.7.15</spring.boot.admin.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>

2
orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
View File

@@ -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";

2
orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java
View File

@@ -23,7 +23,7 @@ public interface ErrorMessage {
String DATA_ABSENT = "数据不存在";
String KEY_ABSENT = "主机秘钥不存在";
String KEY_ABSENT = "主机密钥不存在";
String IDENTITY_ABSENT = "主机身份不存在";

2
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java
View File

@@ -24,7 +24,7 @@ public abstract class CryptoProcessor<Config extends CryptoConfig> implements Va
}
/**
* 初始化秘钥
* 初始化密钥
*/
protected abstract void initSecretKey();

6
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java
View File

@@ -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;

6
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java
View File

@@ -40,7 +40,7 @@ public class AesCryptoProcessor extends CryptoProcessor<AesCryptoConfig> {
this.builder = SymmetricBuilder.aes()
.workingMode(config.getWorkingMode())
.paddingMode(config.getPaddingMode());
// 初始化秘钥
// 初始化密钥
this.initSecretKey();
// 初始化参数规格
this.initParamSpec();
@@ -52,10 +52,10 @@ public class AesCryptoProcessor extends CryptoProcessor<AesCryptoConfig> {
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);

6
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json
View File

@@ -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"
},
{

2
orion-visor-launch/src/main/resources/application-prod.yaml
View File

@@ -46,7 +46,7 @@ orion:
mode: ROW
crypto:
aes:
# 加密秘钥
# 加密密钥
secret-key: ${SECRET_KEY:uQeacXV8b3isvKLK}
async:
executor:

2
orion-visor-launch/src/main/resources/application.yaml
View File

@@ -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

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http
View File

@@ -2,7 +2,7 @@
GET {{baseUrl}}/asset/authorized-data/current-host
Authorization: {{token}}
### 查询当前用户已授权的主机秘钥
### 查询当前用户已授权的主机密钥
GET {{baseUrl}}/asset/authorized-data/current-host-key
Authorization: {{token}}

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java
View File

@@ -47,7 +47,7 @@ public class AssetAuthorizedDataServiceController {
@IgnoreLog(IgnoreLogMode.RET)
@GetMapping("/current-host-key")
@Operation(summary = "查询当前用户已授权的主机秘钥")
@Operation(summary = "查询当前用户已授权的主机密钥")
public List<HostKeyVO> getCurrentAuthorizedHostKey() {
return assetAuthorizedDataService.getUserAuthorizedHostKey(SecurityUtils.getLoginUserId());
}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http
View File

@@ -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}}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java
View File

@@ -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<Long> getAuthorizedHostKey(AssetAuthorizedDataQueryRequest request) {
return assetAuthorizedDataService.getAuthorizedDataRelId(DataPermissionTypeEnum.HOST_KEY, request);

12
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http
View File

@@ -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}}

16
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java
View File

@@ -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<HostKeyVO> 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<HostKeyVO> 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) {

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java
View File

@@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers;
import java.util.List;
/**
* 主机秘钥 内部对象转换器
* 主机密钥 内部对象转换器
*
* @author Jiahang Li
* @version 1.0.0

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java
View File

@@ -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

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java vendored
View File

@@ -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)

10
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java
View File

@@ -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, "创建主机秘钥 <sb>${name}</sb>"),
new OperatorType(L, UPDATE, "修改主机秘钥 <sb>${name}</sb>"),
new OperatorType(H, DELETE, "删除主机秘钥 <sb>${name}</sb>"),
new OperatorType(H, GRANT, "将主机秘钥权限授予 <sb>${grantType}</sb> <sb>${grantName}</sb>"),
new OperatorType(L, CREATE, "创建主机密钥 <sb>${name}</sb>"),
new OperatorType(L, UPDATE, "修改主机密钥 <sb>${name}</sb>"),
new OperatorType(H, DELETE, "删除主机密钥 <sb>${name}</sb>"),
new OperatorType(H, GRANT, "将主机密钥权限授予 <sb>${grantType}</sb> <sb>${grantName}</sb>"),
};
}

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java
View File

@@ -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;

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java
View File

@@ -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;

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java
View File

@@ -35,7 +35,7 @@ public class HostIdentityCacheDTO implements LongCacheIdModel, Serializable {
@Schema(description = "用户名")
private String username;
@Schema(description = "秘钥id")
@Schema(description = "密钥id")
private Long keyId;
}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java
View File

@@ -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")

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostTerminalConnectDTO.java
View File

@@ -63,7 +63,7 @@ public class HostTerminalConnectDTO {
@Schema(description = "密码")
private String password;
@Schema(description = "秘钥id")
@Schema(description = "密钥id")
private Long keyId;
@Desensitize(toEmpty = true)

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java
View File

@@ -43,7 +43,7 @@ public class HostIdentityCreateRequest implements Serializable {
@Schema(description = "用户密码")
private String password;
@Schema(description = "秘钥id")
@Schema(description = "密钥id")
private Long keyId;
}

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java
View File

@@ -43,7 +43,7 @@ public class HostIdentityQueryRequest extends PageRequest {
@Schema(description = "用户密码")
private String password;
@Schema(description = "秘钥id")
@Schema(description = "密钥id")
private Long keyId;
}

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java
View File

@@ -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 = "是否使用新密码")

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java
View File

@@ -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

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java
View File

@@ -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 = "搜索")

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java
View File

@@ -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

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java
View File

@@ -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<HostGroupTreeVO>, Serializable {
private static final long serialVersionUID = 1L;

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java
View File

@@ -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 = "创建时间")

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java
View File

@@ -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;

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java
View File

@@ -15,7 +15,7 @@ public enum HostExtraSshAuthTypeEnum {
DEFAULT,
/**
* 自定义秘钥验证
* 自定义密钥验证
*/
CUSTOM_KEY,

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java
View File

@@ -15,7 +15,7 @@ public enum HostIdentityTypeEnum {
PASSWORD,
/**
* 秘钥
* 密钥
*/
KEY,

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java
View File

@@ -15,7 +15,7 @@ public enum HostSshAuthTypeEnum {
PASSWORD,
/**
* 秘钥验证
* 密钥验证
*/
KEY,

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java
View File

@@ -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

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java
View File

@@ -64,7 +64,7 @@ public class HostSshConfigStrategy implements MapDataStrategy<HostSshConfigModel
this.validCharset(model.getCharset());
this.validCharset(model.getFileNameCharset());
this.validCharset(model.getFileContentCharset());
// 检查主机秘钥是否存在
// 检查主机密钥是否存在
Long keyId = model.getKeyId();
if (keyId != null) {
Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java
View File

@@ -27,7 +27,7 @@ public class HostSshExtraModel implements GenericsDataModel {
@Schema(description = "认证方式")
private String username;
@Schema(description = "主机秘钥")
@Schema(description = "主机密钥")
private Long keyId;
@Schema(description = "主机身份")

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java
View File

@@ -56,7 +56,7 @@ public class HostSshExtraStrategy implements MapDataStrategy<HostSshExtraModel>
} 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<HostSshExtraModel>
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,

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java
View File

@@ -54,7 +54,7 @@ public interface AssetAuthorizedDataService {
AuthorizedHostWrapperVO getUserAuthorizedHost(Long userId, String type);
/**
* 查询用户已授权的主机秘钥
* 查询用户已授权的主机密钥
*
* @param userId userId
* @return key

2
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java
View File

@@ -20,7 +20,7 @@ public interface AssetDataGrantService {
void grantHostGroup(AssetDataGrantRequest request);
/**
* 主机秘钥授权
* 主机密钥授权
*
* @param request request
*/

16
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java
View File

@@ -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<HostKeyVO> getHostKeyList();
/**
* 分页查询主机秘钥
* 分页查询主机密钥
*
* @param request request
* @return rows
@@ -66,7 +66,7 @@ public interface HostKeyService {
DataGrid<HostKeyVO> getHostKeyPage(HostKeyQueryRequest request);
/**
* 通过 id 删除主机秘钥
* 通过 id 删除主机密钥
*
* @param id id
* @return effect

10
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java
View File

@@ -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<Long> 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<Long, String> 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());
}
}

8
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java
View File

@@ -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);

12
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java
View File

@@ -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);

2
orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java
View File

@@ -139,7 +139,7 @@ public interface DataExtraApi {
Integer deleteByRelId(DataExtraTypeEnum type, Long relId);
/**
* 删除主机秘钥
* 删除主机密钥
*
* @param keyId keyId
* @return effect

4
orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java
View File

@@ -20,9 +20,9 @@ public enum DataPermissionTypeEnum {
HOST_GROUP(true, "主机分组"),
/**
* 主机秘钥
* 主机密钥
*/
HOST_KEY(true, "主机秘钥"),
HOST_KEY(true, "主机密钥"),
/**
* 主机身份

2
orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java
View File

@@ -43,7 +43,7 @@ public interface DataExtraDAO extends IMapper<DataExtraDO> {
}
/**
* 删除主机秘钥
* 删除主机密钥
*
* @param keyId keyId
* @return effect

2
orion-visor-ui/src/api/asset/asset-authorized-data.ts
View File

@@ -22,7 +22,7 @@ export function getCurrentAuthorizedHost(type: string) {
}
/**
* 查询当前用户已授权的主机秘钥
* 查询当前用户已授权的主机密钥
*/
export function getCurrentAuthorizedHostKey() {
return axios.get<Array<HostKeyQueryResponse>>('/asset/authorized-data/current-host-key');

4
orion-visor-ui/src/api/asset/asset-data-grant.ts
View File

@@ -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<Array<number>>('/asset/data-grant/get-host-key', { params });

20
orion-visor-ui/src/api/asset/host-key.ts
View File

@@ -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<HostKeyQueryResponse>('/asset/host-key/get', { params: { id } });
}
/**
* 查询主机秘钥
* 查询主机密钥
*/
export function getHostKeyList() {
return axios.get<Array<HostKeyQueryResponse>>('/asset/host-key/list');
}
/**
* 分页查询主机秘钥
* 分页查询主机密钥
*/
export function getHostKeyPage(request: HostKeyQueryRequest) {
return axios.post<DataGrid<HostKeyQueryResponse>>('/asset/host-key/query', request);
}
/**
* 通过 id 删除主机秘钥
* 通过 id 删除主机密钥
*/
export function deleteHostKey(id: number) {
return axios.delete('/asset/host-key/delete', { params: { id } });

2
orion-visor-ui/src/components/app/setting/index.vue
View File

@@ -123,7 +123,7 @@
options: [{ value: 'table', label: '表格' }, { value: 'card', label: '卡片' }]
},
{
name: '主机秘钥',
name: '主机密钥',
key: 'hostKeyView',
type: 'radio-group',
margin: '0 0 4px 0',

2
orion-visor-ui/src/components/asset/host-key/selector/index.vue
View File

@@ -2,7 +2,7 @@
<a-select v-model:model-value="value"
:options="optionData"
:loading="loading"
placeholder="请选择主机秘钥"
placeholder="请选择主机密钥"
allow-clear />
</template>

4
orion-visor-ui/src/store/modules/cache/index.ts vendored
View File

@@ -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);
},

10
orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue
View File

@@ -23,15 +23,15 @@
{{ getDictValue(identityTypeKey, record.type) }}
</a-tag>
</template>
<!-- 秘钥名称 -->
<!-- 密钥名称 -->
<template #keyId="{ record }">
<!-- 有秘钥 -->
<!-- 有密钥 -->
<template v-if="record.keyId && record.type === 'KEY'">
<a-tag color="arcoblue" v-if="record.keyId">
{{ hostKeys.find(s => s.id === record.keyId)?.name }}
</a-tag>
</template>
<!-- 无秘钥 -->
<!-- 无密钥 -->
<template v-else>
<span>-</span>
</template>
@@ -137,9 +137,9 @@
}
});
// 初始化秘钥数据
// 初始化密钥数据
onMounted(async () => {
// 加载主机秘钥
// 加载主机密钥
hostKeys.value = await cacheStore.loadHostKeys();
});

2
orion-visor-ui/src/views/asset/grant/components/host-key-grant.vue
View File

@@ -5,7 +5,7 @@
@grant="doGrant"
@select-all="selectAll"
@reverse="reverseSelect">
<!-- 主机秘钥表格 -->
<!-- 主机密钥表格 -->
<a-table row-key="id"
class="host-key-main-table"
:columns="hostKeyColumns"

8
orion-visor-ui/src/views/asset/grant/types/const.ts
View File

@@ -11,9 +11,9 @@ export const GrantKey = {
HOST_GROUP_ROLE: 1,
// 主机分组-用户
HOST_GROUP_USER: 2,
// 主机秘钥-角色
// 主机密钥-角色
HOST_KEY_ROLE: 3,
// 主机秘钥-用户
// 主机密钥-用户
HOST_KEY_USER: 4,
// 主机身份-角色
HOST_IDENTITY_ROLE: 5,
@@ -46,14 +46,14 @@ export const GrantTabs = [
}, {
key: GrantKey.HOST_KEY_ROLE,
permission: ['asset:host-key:grant'],
title: '主机秘钥授权 - 角色',
title: '主机密钥授权 - 角色',
icon: 'icon-lock',
type: GrantType.ROLE,
component: HostKeyGrant
}, {
key: GrantKey.HOST_KEY_USER,
permission: ['asset:host-key:grant'],
title: '主机秘钥授权 - 用户',
title: '主机密钥授权 - 用户',
icon: 'icon-lock',
type: GrantType.USER,
component: HostKeyGrant

4
orion-visor-ui/src/views/asset/grant/types/table.columns.ts
View File

@@ -1,7 +1,7 @@
import type { TableColumnData } from '@arco-design/web-vue/es/table/interface';
import { dateFormat } from '@/utils';
// 主机秘钥列
// 主机密钥列
export const hostKeyColumns = [
{
title: 'id',
@@ -64,7 +64,7 @@ export const hostIdentityColumns = [
ellipsis: true,
tooltip: true
}, {
title: '主机秘钥',
title: '主机密钥',
dataIndex: 'keyId',
slotName: 'keyId',
}, {

10
orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
View File

@@ -64,8 +64,8 @@
<a-form-item field="username" label="用户名">
<a-input v-model="formModel.username" placeholder="请输入用户名" allow-clear />
</a-form-item>
<!-- 秘钥 -->
<a-form-item field="keyId" label="秘钥">
<!-- 密钥 -->
<a-form-item field="keyId" label="密钥">
<host-key-selector v-model="formModel.keyId" allow-clear />
</a-form-item>
</a-form>
@@ -86,9 +86,9 @@
{{ record.username }}
</span>
</template>
<!-- 秘钥名称 -->
<!-- 密钥名称 -->
<template #keyId="{ record }">
<!-- 有秘钥 -->
<!-- 有密钥 -->
<template v-if="record.keyId && record.type === IdentityType.KEY">
<!-- 可查看详情 -->
<a-tooltip v-if="hasAnyPermission(['asset:host-key:detail', 'asset:host-key:update'])"
@@ -104,7 +104,7 @@
{{ record.keyName }}
</a-tag>
</template>
<!-- 无秘钥 -->
<!-- 无密钥 -->
<template v-else>
<span>-</span>
</template>

4
orion-visor-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
View File

@@ -49,10 +49,10 @@
checked-text="使用新密码"
unchecked-text="使用原密码" />
</a-form-item>
<!-- 主机秘钥 -->
<!-- 主机密钥 -->
<a-form-item v-if="formModel.type === IdentityType.KEY"
field="keyId"
label="主机秘钥">
label="主机密钥">
<host-key-selector v-model="formModel.keyId" />
</a-form-item>
</a-form>

10
orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
View File

@@ -28,8 +28,8 @@
<a-form-item field="username" label="用户名">
<a-input v-model="formModel.username" placeholder="请输入用户名" allow-clear />
</a-form-item>
<!-- 主机秘钥 -->
<a-form-item field="keyId" label="主机秘钥">
<!-- 主机密钥 -->
<a-form-item field="keyId" label="主机密钥">
<host-key-selector v-model="formModel.keyId" allow-clear />
</a-form-item>
</query-header>
@@ -99,9 +99,9 @@
{{ record.username }}
</span>
</template>
<!-- 秘钥名称 -->
<!-- 密钥名称 -->
<template #keyId="{ record }">
<!-- 有秘钥 -->
<!-- 有密钥 -->
<template v-if="record.keyId && record.type === IdentityType.KEY">
<!-- 可查看详情 -->
<a-tooltip v-if="hasAnyPermission(['asset:host-key:detail', 'asset:host-key:update'])"
@@ -117,7 +117,7 @@
{{ record.keyName }}
</a-tag>
</template>
<!-- 无秘钥 -->
<!-- 无密钥 -->
<template v-else>
<span>-</span>
</template>

2
orion-visor-ui/src/views/asset/host-identity/index.vue
View File

@@ -16,7 +16,7 @@
<host-identity-form-modal ref="modal"
@added="modalAddCallback"
@updated="modalUpdateCallback" />
<!-- 主机秘钥抽屉 -->
<!-- 主机密钥抽屉 -->
<host-key-form-drawer ref="keyDrawer" />
</div>
</template>

2
orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts
View File

@@ -19,7 +19,7 @@ const fieldConfig = {
slotName: 'username',
ellipsis: true,
}, {
label: '主机秘钥',
label: '主机密钥',
dataIndex: 'keyId',
slotName: 'keyId',
height: '24px',

2
orion-visor-ui/src/views/asset/host-identity/types/form.rules.ts
View File

@@ -15,7 +15,7 @@ export const type = [{
export const keyId = [{
required: true,
message: '请选择秘钥'
message: '请选择密钥'
}] as FieldRule[];
export const username = [{

2
orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts
View File

@@ -25,7 +25,7 @@ const columns = [
dataIndex: 'username',
slotName: 'username',
}, {
title: '主机秘钥',
title: '主机密钥',
dataIndex: 'keyId',
slotName: 'keyId',
}, {

8
orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
View File

@@ -10,7 +10,7 @@
@cancel="handleClose">
<a-spin class="full modal-form-small" :loading="loading">
<a-alert class="keygen-alert">
请使用 ssh-keygen -m PEM -t rsa 生成秘钥
请使用 ssh-keygen -m PEM -t rsa 生成密钥
</a-alert>
<a-form :model="formModel"
ref="formRef"
@@ -119,7 +119,7 @@
// 打开新增
const openAdd = () => {
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);

2
orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
View File

@@ -26,7 +26,7 @@
<div class="table-left-bar-handle">
<!-- 标题 -->
<div class="table-title">
秘钥列表
密钥列表
</div>
</div>
<!-- 右侧操作 -->

4
orion-visor-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue
View File

@@ -69,10 +69,10 @@
checked-text="使用新密码"
unchecked-text="使用原密码" />
</a-form-item>
<!-- 主机秘钥 -->
<!-- 主机密钥 -->
<a-form-item v-if="SshAuthType.KEY === formModel.authType"
field="keyId"
label="主机秘钥"
label="主机密钥"
:hide-asterisk="true">
<host-key-selector v-model="formModel.keyId" />
</a-form-item>

2
orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/const.ts
View File

@@ -19,7 +19,7 @@ export interface HostSshConfig {
export const SshAuthType = {
// 密码验证
PASSWORD: 'PASSWORD',
// 秘钥验证
// 密钥验证
KEY: 'KEY',
// 身份验证
IDENTITY: 'IDENTITY'

2
orion-visor-ui/src/views/asset/host-list/components/config/ssh/types/form.rules.ts
View File

@@ -22,7 +22,7 @@ export const authType = [{
export const keyId = [{
required: true,
message: '请选择主机秘钥'
message: '请选择主机密钥'
}] as FieldRule[];
export const identityId = [{

6
orion-visor-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue
View File

@@ -16,11 +16,11 @@
label="用户名">
<a-input v-model="formModel.username" placeholder="请输入用户名" />
</a-form-item>
<!-- 主机秘钥 -->
<!-- 主机密钥 -->
<a-form-item v-if="formModel.authType === ExtraSshAuthType.CUSTOM_KEY"
field="keyId"
label="主机秘钥"
:rules="{ required: true, message: '请选择主机秘钥' }">
label="主机密钥"
:rules="{ required: true, message: '请选择主机密钥' }">
<host-key-selector v-model="formModel.keyId"
:authorized="true" />
</a-form-item>

2
orion-visor-ui/src/views/host/terminal/types/terminal.const.ts
View File

@@ -64,7 +64,7 @@ export const ExtraSettingItems = {
export const ExtraSshAuthType = {
// 使用默认认证方式
DEFAULT: 'DEFAULT',
// 自定义秘钥
// 自定义密钥
CUSTOM_KEY: 'CUSTOM_KEY',
// 自定义身份
CUSTOM_IDENTITY: 'CUSTOM_IDENTITY',