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-04-02 16:22:10 +08:00
parent c90fa80090
commit 812286a2e7
16 changed files with 65 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docs/about/change-log.md
View File

@@ -1,5 +1,16 @@
> 版本号严格遵循 Semver 规范。
## v1.0.4
`2024-04-` `release`
* 🐞 修复 批量执行选择模板后默认参数未自动设置
* 🌈 新增 定时执行模块
* 🔨 修改 redisson 配置
* 🔨 规范 orion-ops-framework 配置
[如何升级](/about/update.md?id=_v103)
## v1.0.3
`2024-03-25` `release`
@@ -10,12 +21,12 @@
* 🐞 修复 工作台页面快捷操作面板会展示隐藏的菜单
* 🐞 修复 主机终端无法粘贴 (浏览器安全策略)
* 🐞 修复 卡片列表组件控制台 warn 提示
* 🐞 修复 关闭终端时控制台提示 handleResize 错误信息
* 🐞 修复 关闭终端时控制台提示 handleResize 错误信息
* 🔨 修改 系统菜单渲染逻辑 (移除 JSX 构建时不会提示 JSX.IntrinsicElements)
[如何升级](/about/update.md?id=_v103)
## v1.0.3
## v1.0.2
`2024-03-22` `release`

11
docs/about/roadmap.md
View File

@@ -1,10 +1,10 @@
## 功能排期 ⏳
* 定时执行
* 文件夹书签
* 文件重复删除/重命名 可配置
* tracker 可配置
* 断开连接后回车重新连接
* 文件夹书签
* tracker 使用配置文件
* 优化文件传输列表进度显示
* 终端断开连接后回车重新连接
* template 配置默认主机
* 批量上传
* 站内消息
@@ -12,6 +12,9 @@
* 资产授权 UI 改版
* RDP 远程桌面
* 接入 config 后端动态配置
* 文档中巡检模板
* 批量执行 模板 定时任务 配置是否使用文件执行
* 使用 vite press 开发文档
## 已知问题 🐞

6
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http
View File

@@ -7,7 +7,7 @@ Authorization: {{token}}
"name": "",
"command": "",
"timeout": "",
"parameter": ""
"parameterSchema": ""
}
@@ -21,7 +21,7 @@ Authorization: {{token}}
"name": "",
"command": "",
"timeout": "",
"parameter": ""
"parameterSchema": ""
}
@@ -48,7 +48,7 @@ Authorization: {{token}}
"name": "",
"command": "",
"timeout": "",
"parameter": ""
"parameterSchema": ""
}

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

@@ -34,6 +34,10 @@ public class ExecJobDO extends BaseDO {
@TableField("name")
private String name;
@Schema(description = "执行序列")
@TableField("exec_seq")
private Integer execSeq;
@Schema(description = "cron 表达式")
@TableField("expression")
private String expression;

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

@@ -52,6 +52,10 @@ public class ExecLogDO extends BaseDO {
@TableField("description")
private String description;
@Schema(description = "执行序列")
@TableField("exec_seq")
private Integer execSeq;
@Schema(description = "执行命令")
@TableField("command")
private String command;

6
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java
View File

@@ -42,8 +42,8 @@ public class ExecTemplateDO extends BaseDO {
@TableField("timeout")
private Integer timeout;
@Schema(description = "参数")
@TableField("parameter")
private String parameter;
@Schema(description = "参数定义")
@TableField("parameter_schema")
private String parameterSchema;
}

4
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java
View File

@@ -40,7 +40,7 @@ public class ExecTemplateCreateRequest implements Serializable {
@Schema(description = "超时时间秒 0不超时")
private Integer timeout;
@Schema(description = "参数")
private String parameter;
@Schema(description = "参数定义")
private String parameterSchema;
}

4
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java
View File

@@ -44,7 +44,7 @@ public class ExecTemplateUpdateRequest implements Serializable {
@Schema(description = "超时时间秒 0不超时")
private Integer timeout;
@Schema(description = "参数")
private String parameter;
@Schema(description = "参数定义")
private String parameterSchema;
}

3
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java
View File

@@ -31,6 +31,9 @@ public class ExecJobVO implements Serializable {
@Schema(description = "任务名称")
private String name;
@Schema(description = "执行序列")
private Integer execSeq;
@Schema(description = "cron 表达式")
private String expression;

3
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java
View File

@@ -38,6 +38,9 @@ public class ExecLogVO implements Serializable {
@Schema(description = "执行描述")
private String description;
@Schema(description = "执行序列")
private Integer execSeq;
@Schema(description = "执行命令")
private String command;

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

@@ -37,8 +37,8 @@ public class ExecTemplateVO implements Serializable {
@Schema(description = "超时时间秒 0不超时")
private Integer timeout;
@Schema(description = "参数")
private String parameter;
@Schema(description = "参数定义")
private String parameterSchema;
@Schema(description = "创建时间")
private Date createTime;

4
orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml
View File

@@ -8,7 +8,7 @@
<result column="name" property="name"/>
<result column="command" property="command"/>
<result column="timeout" property="timeout"/>
<result column="parameter" property="parameter"/>
<result column="parameter_schema" property="parameterSchema"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
@@ -18,7 +18,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, command, timeout, parameter, create_time, update_time, creator, updater, deleted
id, name, command, timeout, parameter_schema, create_time, update_time, creator, updater, deleted
</sql>
</mapper>

4
orion-ops-ui/src/api/exec/exec-template.ts
View File

@@ -9,7 +9,7 @@ export interface ExecTemplateCreateRequest {
name?: string;
command?: string;
timeout?: number;
parameter?: string;
parameterSchema?: string;
}
/**
@@ -36,7 +36,7 @@ export interface ExecTemplateQueryResponse extends TableData {
name: string;
command: string;
timeout: number;
parameter: string;
parameterSchema: string;
createTime: number;
updateTime: number;
creator: string;

11
orion-ops-ui/src/views/exec/exec-command/components/exec-panel.vue
View File

@@ -144,8 +144,15 @@
description: record.name,
timeout: record.timeout,
};
parameterSchema.value = record.parameter ? JSON.parse(record.parameter) : [];
parameterFormModel.value = {};
parameterSchema.value = record.parameterSchema ? JSON.parse(record.parameterSchema) : [];
if (parameterSchema.value.length) {
parameterFormModel.value = parameterSchema.value.reduce((acc, cur) => ({
...acc,
[cur.name as string]: cur.value
}), {});
} else {
parameterFormModel.value = {};
}
};
// 从执行日志设置

4
orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue
View File

@@ -125,8 +125,8 @@
command: record.command,
hostIdList: []
};
if (record.parameter) {
parameterSchema.value = JSON.parse(record.parameter);
if (record.parameterSchema) {
parameterSchema.value = JSON.parse(record.parameterSchema);
const params = {} as any;
for (let param of parameterSchema.value) {
params[param.name as keyof any] = param.defaultValue;

8
orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
View File

@@ -120,7 +120,7 @@
name: undefined,
command: undefined,
timeout: 0,
parameter: undefined,
parameterSchema: undefined,
};
};
@@ -149,8 +149,8 @@
// 渲染表单
const renderForm = (record: any) => {
formModel.value = Object.assign({}, record);
if (record.parameter) {
parameter.value = JSON.parse(record.parameter);
if (record.parameterSchema) {
parameter.value = JSON.parse(record.parameterSchema);
} else {
parameter.value = [];
}
@@ -184,7 +184,7 @@
return false;
}
}
formModel.value.parameter = JSON.stringify(parameter.value);
formModel.value.parameterSchema = JSON.stringify(parameter.value);
if (isAddHandle.value) {
// 新增
await createExecTemplate(formModel.value);